From 6649361db70647ea3ea707345d37a540da1a2f7e Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Wed, 19 Feb 2020 12:52:15 -0300
Subject: [PATCH 001/223] [FIX] Admin height if the blue banner is opened
 (#16629)

* fix admin height

* fix review
---
 client/components/basic/Page.js | 2 +-
 client/routes.js                | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/components/basic/Page.js b/client/components/basic/Page.js
index ddf01872c402..67034e0caec7 100644
--- a/client/components/basic/Page.js
+++ b/client/components/basic/Page.js
@@ -5,7 +5,7 @@ import { BurgerMenuButton } from './BurgerMenuButton';
 
 export function Page(props) {
 	return <Flex.Container direction='column'>
-		<Box is='section' style={useMemo(() => ({ height: '100vh' }), [])} {...props} />
+		<Box is='section' style={useMemo(() => ({ height: '100%' }), [])} {...props} />
 	</Flex.Container>;
 }
 
diff --git a/client/routes.js b/client/routes.js
index 515a6b2a6daf..ce613e76b182 100644
--- a/client/routes.js
+++ b/client/routes.js
@@ -233,19 +233,20 @@ FlowRouter.route('/setup-wizard/:step?', {
 	},
 });
 
+const style = 'overflow: hidden; flex: 1 1 auto; height: 1%;';
 FlowRouter.route('/admin/:group?', {
 	name: 'admin',
 	action: async ({ group = 'info' } = {}) => {
 		switch (group) {
 			case 'info': {
 				const { InformationRoute } = await import('./components/admin/info/InformationRoute');
-				BlazeLayout.render('main', { center: await createTemplateForComponent(InformationRoute) });
+				BlazeLayout.render('main', { center: await createTemplateForComponent(InformationRoute, { }, () => HTML.DIV({ style })) }); // eslint-disable-line
 				break;
 			}
 
 			default: {
 				const { SettingsRoute } = await import('./components/admin/settings/SettingsRoute');
-				BlazeLayout.render('main', { center: await createTemplateForComponent(SettingsRoute, { group }) });
+				BlazeLayout.render('main', { center: await createTemplateForComponent(SettingsRoute, { group }, () => HTML.DIV({ style })) }); // eslint-disable-line
 				// BlazeLayout.render('main', { center: 'admin' });
 			}
 		}

From 997dcae9d27b65118093461257aee115c0801628 Mon Sep 17 00:00:00 2001
From: Douglas Gubert <d-gubert@users.noreply.github.com>
Date: Tue, 18 Feb 2020 21:39:07 -0300
Subject: [PATCH 002/223] [FIX] Data converters overriding fields added by apps
 (#16639)

---
 app/apps/lib/misc/transformMappedData.js | 6 ++++--
 app/lib/server/functions/sendMessage.js  | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/apps/lib/misc/transformMappedData.js b/app/apps/lib/misc/transformMappedData.js
index 0bba2c646081..61e57b0a53ca 100644
--- a/app/apps/lib/misc/transformMappedData.js
+++ b/app/apps/lib/misc/transformMappedData.js
@@ -73,8 +73,10 @@ export const transformMappedData = (data, map) => {
 			if (typeof result !== 'undefined') {
 				transformedData[to] = result;
 			}
-		} else if (typeof from === 'string' && typeof originalData[from] !== 'undefined') {
-			transformedData[to] = originalData[from];
+		} else if (typeof from === 'string') {
+			if (typeof originalData[from] !== 'undefined') {
+				transformedData[to] = originalData[from];
+			}
 			delete originalData[from];
 		}
 	});
diff --git a/app/lib/server/functions/sendMessage.js b/app/lib/server/functions/sendMessage.js
index ea5ce3088d51..5b7d3c281c10 100644
--- a/app/lib/server/functions/sendMessage.js
+++ b/app/lib/server/functions/sendMessage.js
@@ -136,6 +136,7 @@ const validateMessage = (message) => {
 		emoji: String,
 		avatar: ValidPartialURLParam,
 		attachments: [Match.Any],
+		blocks: [Match.Any],
 	}));
 
 	if (Array.isArray(message.attachments) && message.attachments.length) {

From df5b9105b6c29209579c819705751df87f546bf2 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Tue, 18 Feb 2020 21:38:47 -0300
Subject: [PATCH 003/223] [FIX] Block user option inside admin view (#16626)

---
 app/ui-flextab/client/tabs/userActions.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/ui-flextab/client/tabs/userActions.js b/app/ui-flextab/client/tabs/userActions.js
index 93d49bb92047..d1947e1e8661 100644
--- a/app/ui-flextab/client/tabs/userActions.js
+++ b/app/ui-flextab/client/tabs/userActions.js
@@ -26,11 +26,11 @@ const canBlockUser = () =>
 	ChatSubscription.findOne({ rid: Session.get('openedRoom'), 'u._id': Meteor.userId() }, { fields: { blocker: 1 } })
 		.blocker;
 
-const canDirectMessageTo = (username) => {
+const canDirectMessageTo = (username, directActions) => {
 	const subscription = Subscriptions.findOne({ rid: Session.get('openedRoom') });
 	const canOpenDm = hasAllPermission('create-d') || Subscriptions.findOne({ name: username });
 	const dmIsNotAlreadyOpen = subscription && subscription.name !== username;
-	return canOpenDm && dmIsNotAlreadyOpen;
+	return canOpenDm && (!directActions || dmIsNotAlreadyOpen);
 };
 
 export const getActions = ({ user, directActions, hideAdminControls }) => {
@@ -107,7 +107,7 @@ export const getActions = ({ user, directActions, hideAdminControls }) => {
 				Meteor.call('createDirectMessage', username, success((result) => result.rid && FlowRouter.go('direct', { username }, FlowRouter.current().queryParams))),
 			),
 			condition() {
-				return canDirectMessageTo(this.username);
+				return canDirectMessageTo(this.username, directActions);
 			},
 		},
 
@@ -188,7 +188,7 @@ export const getActions = ({ user, directActions, hideAdminControls }) => {
 				},
 			};
 		}, function() {
-			if (!isInDirectMessageRoom() || isSelf(this.username)) {
+			if (!directActions || !isInDirectMessageRoom() || isSelf(this.username)) {
 				return;
 			}
 			if (canBlockUser()) {

From ffbad5888247854798ef89489daff03c37df9d26 Mon Sep 17 00:00:00 2001
From: Douglas Gubert <d-gubert@users.noreply.github.com>
Date: Tue, 18 Feb 2020 18:03:07 -0300
Subject: [PATCH 004/223] [FIX] Regression: New 'app' role with no permissions
 when updating to 3.0.0 (#16637)

---
 server/startup/migrations/index.js |  1 +
 server/startup/migrations/v174.js  | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 server/startup/migrations/v174.js

diff --git a/server/startup/migrations/index.js b/server/startup/migrations/index.js
index 85bc4b3ba7ca..6c9b0f4d36d7 100644
--- a/server/startup/migrations/index.js
+++ b/server/startup/migrations/index.js
@@ -171,4 +171,5 @@ import './v170';
 import './v171';
 import './v172';
 import './v173';
+import './v174';
 import './xrun';
diff --git a/server/startup/migrations/v174.js b/server/startup/migrations/v174.js
new file mode 100644
index 000000000000..0ca59f1e69cd
--- /dev/null
+++ b/server/startup/migrations/v174.js
@@ -0,0 +1,26 @@
+import { Migrations } from '../../../app/migrations/server';
+import { Permissions } from '../../../app/models/server';
+
+const appRolePermissions = [
+	'api-bypass-rate-limit',
+	'create-c',
+	'create-d',
+	'create-p',
+	'join-without-join-code',
+	'leave-c',
+	'leave-p',
+	'send-many-messages',
+	'view-c-room',
+	'view-d-room',
+	'view-joined-room',
+];
+
+Migrations.add({
+	version: 174,
+	up() {
+		Permissions.update({ _id: { $in: appRolePermissions } }, { $addToSet: { roles: 'app' } }, { multi: true });
+	},
+	down() {
+		Permissions.update({ _id: { $in: appRolePermissions } }, { $pull: { roles: 'app' } }, { multi: true });
+	},
+});

From 95e89f687becfb2a7c11fcebd77748a0f0b06770 Mon Sep 17 00:00:00 2001
From: Marcos Spessatto Defendi <marcos.defendi@ulbra.inf.br>
Date: Mon, 17 Feb 2020 21:14:31 -0300
Subject: [PATCH 005/223] [FIX] livechat/rooms endpoint not working with big
 amount of livechats (#16623)

* Remove aggregate to improve performance

* Use a cursor to run query only once

* Do not use toArray in model

Co-authored-by: Diego Sampaio <chinello@gmail.com>
---
 app/livechat/server/api/lib/rooms.js        | 33 +++++++-----
 app/models/server/raw/LivechatDepartment.js |  6 ++-
 app/models/server/raw/LivechatRooms.js      | 58 ++++++---------------
 3 files changed, 39 insertions(+), 58 deletions(-)

diff --git a/app/livechat/server/api/lib/rooms.js b/app/livechat/server/api/lib/rooms.js
index 54a421d8e6c2..72d84803de15 100644
--- a/app/livechat/server/api/lib/rooms.js
+++ b/app/livechat/server/api/lib/rooms.js
@@ -1,4 +1,4 @@
-import { LivechatRooms } from '../../../../models/server/raw';
+import { LivechatRooms, LivechatDepartment } from '../../../../models/server/raw';
 
 export async function findRooms({
 	agents,
@@ -16,18 +16,7 @@ export async function findRooms({
 		sort,
 	},
 }) {
-	const total = (await LivechatRooms.findRoomsWithCriteria({
-		agents,
-		roomName,
-		departmentId,
-		open,
-		createdAt,
-		closedAt,
-		tags,
-		customFields,
-	})).length;
-
-	const rooms = await LivechatRooms.findRoomsWithCriteria({
+	const cursor = LivechatRooms.findRoomsWithCriteria({
 		agents,
 		roomName,
 		departmentId,
@@ -44,6 +33,24 @@ export async function findRooms({
 		},
 	});
 
+	const total = await cursor.count();
+
+	const rooms = await cursor.toArray();
+
+	const departmentsIds = [...new Set(rooms.map((room) => room.departmentId).filter(Boolean))];
+	if (departmentsIds.length) {
+		const departments = await LivechatDepartment.findInIds(departmentsIds, { fields: { name: 1 } }).toArray();
+
+		rooms.forEach((room) => {
+			if (!room.departmentId) {
+				return;
+			}
+			const department = departments.find((dept) => dept._id === room.departmentId);
+			if (department) {
+				room.department = department;
+			}
+		});
+	}
 	return {
 		rooms,
 		count: rooms.length,
diff --git a/app/models/server/raw/LivechatDepartment.js b/app/models/server/raw/LivechatDepartment.js
index 040e156b16df..1b103c034442 100644
--- a/app/models/server/raw/LivechatDepartment.js
+++ b/app/models/server/raw/LivechatDepartment.js
@@ -1,6 +1,8 @@
 import { BaseRaw } from './BaseRaw';
 
 export class LivechatDepartmentRaw extends BaseRaw {
-
-
+	findInIds(departmentsIds, options) {
+		const query = { _id: { $in: departmentsIds } };
+		return this.find(query, options);
+	}
 }
diff --git a/app/models/server/raw/LivechatRooms.js b/app/models/server/raw/LivechatRooms.js
index 7f9286d86d05..da9ec4282e41 100644
--- a/app/models/server/raw/LivechatRooms.js
+++ b/app/models/server/raw/LivechatRooms.js
@@ -1099,73 +1099,45 @@ export class LivechatRoomsRaw extends BaseRaw {
 	}
 
 	findRoomsWithCriteria({ agents, roomName, departmentId, open, createdAt, closedAt, tags, customFields, options = {} }) {
-		const match = {
-			$match: {
-				t: 'l',
-			},
+		const query = {
+			t: 'l',
 		};
 		if (agents) {
-			match.$match.$or = [{ 'servedBy._id': { $in: agents } }, { 'servedBy.username': { $in: agents } }];
+			query.$or = [{ 'servedBy._id': { $in: agents } }, { 'servedBy.username': { $in: agents } }];
 		}
 		if (roomName) {
-			match.$match.fname = new RegExp(roomName, 'i');
+			query.fname = new RegExp(roomName, 'i');
 		}
 		if (departmentId) {
-			match.$match.departmentId = departmentId;
+			query.departmentId = departmentId;
 		}
 		if (open !== undefined) {
-			match.$match.open = { $exists: open };
+			query.open = { $exists: open };
 		}
 		if (createdAt) {
-			match.$match.ts = {};
+			query.ts = {};
 			if (createdAt.start) {
-				match.$match.ts.$gte = new Date(createdAt.start);
+				query.ts.$gte = new Date(createdAt.start);
 			}
 			if (createdAt.end) {
-				match.$match.ts.$lte = new Date(createdAt.end);
+				query.ts.$lte = new Date(createdAt.end);
 			}
 		}
 		if (closedAt) {
-			match.$match.closedAt = {};
+			query.closedAt = {};
 			if (closedAt.start) {
-				match.$match.closedAt.$gte = new Date(closedAt.start);
+				query.closedAt.$gte = new Date(closedAt.start);
 			}
 			if (closedAt.end) {
-				match.$match.closedAt.$lte = new Date(closedAt.end);
+				query.closedAt.$lte = new Date(closedAt.end);
 			}
 		}
 		if (tags) {
-			match.$match.tags = { $in: tags };
+			query.tags = { $in: tags };
 		}
 		if (customFields) {
-			match.$match.$and = Object.keys(customFields).map((key) => ({ [`livechatData.${ key }`]: new RegExp(customFields[key], 'i') }));
-		}
-		const sort = { $sort: options.sort || { name: 1 } };
-		const firstParams = [match, sort];
-		if (options.offset) {
-			firstParams.push({ $skip: options.offset });
+			query.$and = Object.keys(customFields).map((key) => ({ [`livechatData.${ key }`]: new RegExp(customFields[key], 'i') }));
 		}
-		if (options.count) {
-			firstParams.push({ $limit: options.count });
-		}
-		const lookup = {
-			$lookup: {
-				from: 'rocketchat_livechat_department',
-				localField: 'departmentId',
-				foreignField: '_id',
-				as: 'department',
-			},
-		};
-		const unwind = {
-			$unwind: {
-				path: '$department',
-				preserveNullAndEmptyArrays: true,
-			},
-		};
-		const params = [...firstParams, lookup, unwind];
-		if (options.fields) {
-			params.push({ $project: options.fields });
-		}
-		return this.col.aggregate(params).toArray();
+		return this.find(query, { sort: options.sort || { name: 1 }, skip: options.offset, limit: options.count });
 	}
 }

From 57f28211a5b1e605b6fa801cfac61aa22b969a1b Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Mon, 17 Feb 2020 21:10:19 -0300
Subject: [PATCH 006/223] [FIX] Regression: Jitsi on external window infinite
 loop (#16625)

---
 app/videobridge/client/views/videoFlexTab.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/videobridge/client/views/videoFlexTab.js b/app/videobridge/client/views/videoFlexTab.js
index 1b55095af759..ebc32f1bace2 100644
--- a/app/videobridge/client/views/videoFlexTab.js
+++ b/app/videobridge/client/views/videoFlexTab.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
 import { TimeSync } from 'meteor/mizzao:timesync';
@@ -58,9 +59,9 @@ Template.videoFlexTab.onRendered(function() {
 
 	const start = () => {
 		const update = () => {
-			const { jitsiTimeout } = Rooms.findOne({ _id: rid }, { fields: { jitsiTimeout: 1 }, reactive: false });
+			const { jitsiTimeout } = Rooms.findOne({ _id: rid }, { fields: { jitsiTimeout: 1 } });
 
-			if (jitsiTimeout && (TimeSync.serverTime(), - new Date(jitsiTimeout) + CONSTANTS.TIMEOUT < CONSTANTS.DEBOUNCE)) {
+			if (jitsiTimeout && (TimeSync.serverTime() - new Date(jitsiTimeout) + CONSTANTS.TIMEOUT < CONSTANTS.DEBOUNCE)) {
 				return;
 			}
 			if (Meteor.status().connected) {
@@ -70,7 +71,7 @@ Template.videoFlexTab.onRendered(function() {
 			return this.stop();
 		};
 		update();
-		this.intervalHandler = Meteor.setInterval(update, CONSTANTS.HEARTBEAT);
+		this.intervalHandler = setInterval(update, CONSTANTS.HEARTBEAT);
 		TabBar.updateButton('video', { class: 'red' });
 	};
 
@@ -125,7 +126,7 @@ Template.videoFlexTab.onRendered(function() {
 			jitsiRoomActive = jitsiRoom;
 
 			if (settings.get('Jitsi_Open_New_Window')) {
-				start();
+				Tracker.nonreactive(() => start());
 				let queryString = '';
 				if (accessToken) {
 					queryString = `?jwt=${ accessToken }`;
@@ -157,7 +158,7 @@ Template.videoFlexTab.onRendered(function() {
 					* For some reason those aren't working right.
 					*/
 					Meteor.setTimeout(() => this.api.executeCommand('displayName', [name]), 5000);
-					return start();
+					return Tracker.nonreactive(() => start());
 				}
 
 				// Execute any commands that might be reactive.  Like name changing.

From c4621c42a966d7cb2758e5e34f5043c535db8deb Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Mon, 17 Feb 2020 20:51:06 -0300
Subject: [PATCH 007/223] [FIX] UiKit not updating new actionIds received as
 responses from actions (#16624)

---
 app/ui-message/client/blocks/ModalBlock.js |  6 +--
 package-lock.json                          | 47 ++++++++++++----------
 package.json                               | 10 ++---
 3 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/app/ui-message/client/blocks/ModalBlock.js b/app/ui-message/client/blocks/ModalBlock.js
index 36c5c7ab5806..bb6a1e48deac 100644
--- a/app/ui-message/client/blocks/ModalBlock.js
+++ b/app/ui-message/client/blocks/ModalBlock.js
@@ -79,7 +79,7 @@ Template.ModalBlock.onRendered(async function() {
 						appId,
 						viewId,
 						view: {
-							...this.data.view,
+							...state.get().view,
 							id: viewId,
 							state: groupStateByBlockId(this.state.all()),
 						},
@@ -91,7 +91,7 @@ Template.ModalBlock.onRendered(async function() {
 						appId,
 						viewId,
 						view: {
-							...this.data.view,
+							...state.get().view,
 							id: viewId,
 							state: groupStateByBlockId(this.state.all()),
 						},
@@ -105,7 +105,7 @@ Template.ModalBlock.onRendered(async function() {
 						appId,
 						payload: {
 							view: {
-								...this.data.view,
+								...state.get().view,
 								id: viewId,
 								state: groupStateByBlockId(this.state.all()),
 							},
diff --git a/package-lock.json b/package-lock.json
index c7c9edd9db8c..dee9cb46302a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2716,36 +2716,41 @@
 			}
 		},
 		"@rocket.chat/fuselage": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.2.0.tgz",
-			"integrity": "sha512-APEd9eF9DXVcIrddGov+4yCK18RkOmkGFrNUpCHWqeuAjEy0oApaUWp4e9ISIviIEIijtZ6Q9T2jaLjSKdkzLA==",
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.3.0.tgz",
+			"integrity": "sha512-nZdtJtEjZO2ZKQafo0ijANRAlr+wSQ9PzsjpRcan4XVaOdnS7Yri7ZlqtA2jdmHyr5/bbQzReM0WudujS5JMyg==",
 			"requires": {
-				"@rocket.chat/fuselage-tokens": "^0.2.0",
-				"@rocket.chat/icons": "^0.2.0"
+				"@rocket.chat/fuselage-tokens": "^0.3.0",
+				"@rocket.chat/icons": "^0.3.0"
 			}
 		},
 		"@rocket.chat/fuselage-hooks": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-hooks/-/fuselage-hooks-0.2.0.tgz",
-			"integrity": "sha512-OKQWhsbm3eHU1IDshwEqZhpzMW+loGPdpr1W2mZHbazkcRQYVp7V76Hl3Hh/HHGn8+EPY4fluoPVHgoOm42NiA=="
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-hooks/-/fuselage-hooks-0.3.0.tgz",
+			"integrity": "sha512-VpRyEhntgJ1HLYtaRmOzdHTpfGxkyyD9ElxBwEENMcu4/Ke6brIttznevndjaZWznfF/VV+15vcFovimRt/giQ=="
 		},
 		"@rocket.chat/fuselage-tokens": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-tokens/-/fuselage-tokens-0.2.0.tgz",
-			"integrity": "sha512-mHAoZ4mAXXYJ+Sz6DYwe/StO7HyMUNdYw+2U+9uzyO5Zyy5e88+lxD2+HI0UQ7AC6cM/Y77s1kNhTwDpP70oHw=="
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-tokens/-/fuselage-tokens-0.3.0.tgz",
+			"integrity": "sha512-PEFww6Q4gRmBo97nA6JHICSYHqQuCDHS4KFS070ofdaRParEaBhrQ8CBF21RpIXZpofk9d4nR96JdI0uf6rWOw=="
 		},
 		"@rocket.chat/fuselage-ui-kit": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-ui-kit/-/fuselage-ui-kit-0.2.0.tgz",
-			"integrity": "sha512-slgtaz0gFWaU70XyMFI74L6tIUsrKdSae74/8BLq/w4dm3q1Faoc9jDvsgcvqta+/n0GguxjMNrEi6iOI4L96w==",
+			"version": "0.3.0",
 			"requires": {
-				"@rocket.chat/ui-kit": "^0.2.0"
+				"@rocket.chat/ui-kit": "^0.3.0"
+			},
+			"dependencies": {
+				"@rocket.chat/ui-kit": {
+					"version": "0.2.0",
+					"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.2.0.tgz",
+					"integrity": "sha512-O6QNicDDRRbiULWXdkVmgUl1Pf3CoVVA8L7JEfiegQcTdPEsHlWGYBxcpbt23gY4hoNmbknlJHfCPNWd7oLcmQ=="
+				}
 			}
 		},
 		"@rocket.chat/icons": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/icons/-/icons-0.2.0.tgz",
-			"integrity": "sha512-EUXi/TGe2YBVASoWPHm+FeRyq6gxNJjByNtc6wb1s0wyPxESD3rPpRkxR1PKjQtSTzNSFW8woEVT1UNPly7v1g=="
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/icons/-/icons-0.3.0.tgz",
+			"integrity": "sha512-cE8tq4MzfqJq3AiSKMQS6RWj5gYKDhnQZNP63q0ljtvcZDzGX/LL3zmACmrCwwjT4Y0XNp2CpPW9mNFtG20iNQ=="
 		},
 		"@rocket.chat/livechat": {
 			"version": "1.3.1",
@@ -2835,9 +2840,9 @@
 			}
 		},
 		"@rocket.chat/ui-kit": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.2.0.tgz",
-			"integrity": "sha512-O6QNicDDRRbiULWXdkVmgUl1Pf3CoVVA8L7JEfiegQcTdPEsHlWGYBxcpbt23gY4hoNmbknlJHfCPNWd7oLcmQ=="
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.3.0.tgz",
+			"integrity": "sha512-YAV5l6iVIWuileg5DOU/0NQ/23/AULEr8UblIUSF3OShPN8nWanGMdG0E6xFLyXT+KHvmvzhiQe0/ju3Tk7x8A=="
 		},
 		"@settlin/spacebars-loader": {
 			"version": "1.0.7",
diff --git a/package.json b/package.json
index 0d0f66e6678c..e238acab7194 100644
--- a/package.json
+++ b/package.json
@@ -123,11 +123,11 @@
 		"@google-cloud/storage": "^2.3.1",
 		"@google-cloud/vision": "^1.8.0",
 		"@rocket.chat/apps-engine": "^1.12.0",
-		"@rocket.chat/fuselage": "^0.2.0",
-		"@rocket.chat/fuselage-hooks": "^0.2.0",
-		"@rocket.chat/fuselage-ui-kit": "^0.2.0",
-		"@rocket.chat/icons": "^0.2.0",
-		"@rocket.chat/ui-kit": "^0.2.0",
+		"@rocket.chat/fuselage": "^0.3.0",
+		"@rocket.chat/fuselage-hooks": "^0.3.0",
+		"@rocket.chat/fuselage-ui-kit": "^0.3.0",
+		"@rocket.chat/icons": "^0.3.0",
+		"@rocket.chat/ui-kit": "^0.3.0",
 		"@slack/client": "^4.8.0",
 		"adm-zip": "RocketChat/adm-zip",
 		"archiver": "^3.0.0",

From b87ffbbd4d82aadd2da97f81f032c9725b8b400d Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Wed, 19 Feb 2020 13:04:19 -0300
Subject: [PATCH 008/223] Bump version to 3.0.1

---
 .docker/Dockerfile.rhel   |  2 +-
 .github/history.json      | 77 +++++++++++++++++++++++++++++++++++++++
 HISTORY.md                | 25 +++++++++++++
 app/utils/rocketchat.info |  2 +-
 package.json              |  2 +-
 5 files changed, 105 insertions(+), 3 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 0a700be61b46..c3d663fc2ba4 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.0.0
+ENV RC_VERSION 3.0.1
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index afd5cd31de04..56e30e9a729a 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -39745,6 +39745,83 @@
         "4.0"
       ],
       "pull_requests": []
+    },
+    "3.0.1": {
+      "node_version": "12.14.0",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "16624",
+          "title": "[FIX] UiKit not updating new actionIds received as responses from actions",
+          "userLogin": "ggazzo",
+          "milestone": "3.0.1",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "16625",
+          "title": "[FIX] Regression: Jitsi on external window infinite loop",
+          "userLogin": "ggazzo",
+          "milestone": "3.0.1",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "16623",
+          "title": "[FIX] livechat/rooms endpoint not working with big amount of livechats",
+          "userLogin": "MarcosSpessatto",
+          "milestone": "3.0.1",
+          "contributors": [
+            "MarcosSpessatto",
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "16637",
+          "title": "[FIX] Regression: New 'app' role with no permissions when updating to 3.0.0",
+          "userLogin": "d-gubert",
+          "milestone": "3.0.1",
+          "contributors": [
+            "d-gubert"
+          ]
+        },
+        {
+          "pr": "16626",
+          "title": "[FIX] Block user option inside admin view",
+          "userLogin": "ggazzo",
+          "milestone": "3.0.1",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "16639",
+          "title": "[FIX] Data converters overriding fields added by apps",
+          "userLogin": "d-gubert",
+          "milestone": "3.0.1",
+          "contributors": [
+            "ggazzo",
+            "d-gubert",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16629",
+          "title": "[FIX] Admin height if the blue banner is opened",
+          "userLogin": "ggazzo",
+          "milestone": "3.0.1",
+          "contributors": [
+            "ggazzo"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/HISTORY.md b/HISTORY.md
index 4abcc90030c1..e86db17e8261 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,29 @@
 
+# 3.0.1
+`2020-02-19  ·  7 🐛  ·  4 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `12.14.0`
+- NPM: `6.13.4`
+- MongoDB: `3.4, 3.6, 4.0`
+
+### 🐛 Bug fixes
+
+- UiKit not updating new actionIds received as responses from actions ([#16624](https://github.com/RocketChat/Rocket.Chat/pull/16624))
+- Regression: Jitsi on external window infinite loop ([#16625](https://github.com/RocketChat/Rocket.Chat/pull/16625))
+- livechat/rooms endpoint not working with big amount of livechats ([#16623](https://github.com/RocketChat/Rocket.Chat/pull/16623))
+- Regression: New 'app' role with no permissions when updating to 3.0.0 ([#16637](https://github.com/RocketChat/Rocket.Chat/pull/16637))
+- Block user option inside admin view ([#16626](https://github.com/RocketChat/Rocket.Chat/pull/16626))
+- Data converters overriding fields added by apps ([#16639](https://github.com/RocketChat/Rocket.Chat/pull/16639))
+- Admin height if the blue banner is opened ([#16629](https://github.com/RocketChat/Rocket.Chat/pull/16629))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+- [@d-gubert](https://github.com/d-gubert)
+- [@ggazzo](https://github.com/ggazzo)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 3.0.0
 `2020-02-14  ·  7 ️️️⚠️  ·  10 🎉  ·  11 🚀  ·  32 🐛  ·  43 🔍  ·  21 👩‍💻👨‍💻`
 
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index 3d617ac0916f..9bc526777aae 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.0.0"
+	"version": "3.0.1"
 }
diff --git a/package.json b/package.json
index e238acab7194..d6970a605cb0 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.0.0",
+	"version": "3.0.1",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

From 6164f7630f603a78067d0dad058870e993fd13f6 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Thu, 20 Feb 2020 14:39:03 -0300
Subject: [PATCH 009/223] [FIX] Clear unread red line when the ESC key is
 pressed (#16668)

---
 app/ui-utils/client/lib/readMessages.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/ui-utils/client/lib/readMessages.js b/app/ui-utils/client/lib/readMessages.js
index 8754af583863..1afcd5d979d6 100644
--- a/app/ui-utils/client/lib/readMessages.js
+++ b/app/ui-utils/client/lib/readMessages.js
@@ -174,7 +174,12 @@ Meteor.startup(function() {
 		.on('keyup', (e) => {
 			const key = e.which;
 			if (key === 27) { // ESCAPE KEY
-				readMessage.readNow();
+				const rid = Session.get('openedRoom');
+				if (!rid) {
+					return;
+				}
+				readMessage.readNow(rid);
+				readMessage.refreshUnreadMark(rid);
 			}
 		});
 });

From 00f65d74210a833da8f647f9533ba8f28c1bc5ce Mon Sep 17 00:00:00 2001
From: Marcos Spessatto Defendi <marcos.defendi@ulbra.inf.br>
Date: Thu, 20 Feb 2020 13:22:15 -0300
Subject: [PATCH 010/223] [FIX] users.info endpoint not handling the error if
 the user does not exist (#16495)

* Prevent user to be undefined

* Move findById to Base model

Co-authored-by: Diego Sampaio <chinello@gmail.com>
---
 app/api/server/v1/users.js                  |  2 +-
 app/lib/server/functions/getFullUserData.js |  3 +++
 app/models/server/models/Users.js           |  6 ------
 app/models/server/models/_Base.js           |  8 ++++++++
 app/models/server/models/_BaseDb.js         |  4 ++++
 tests/end-to-end/api/01-users.js            | 15 +++++++++++++++
 6 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/app/api/server/v1/users.js b/app/api/server/v1/users.js
index d0115d51fb0c..fa40c867f0de 100644
--- a/app/api/server/v1/users.js
+++ b/app/api/server/v1/users.js
@@ -166,7 +166,7 @@ API.v1.addRoute('users.info', { authRequired: true }, {
 			: getFullUserData(params);
 
 		if (!result || result.count() !== 1) {
-			return API.v1.failure(`Failed to get the user data for the userId of "${ this.userId }".`);
+			return API.v1.failure('User not found.');
 		}
 		const [user] = result.fetch();
 		const myself = user._id === this.userId;
diff --git a/app/lib/server/functions/getFullUserData.js b/app/lib/server/functions/getFullUserData.js
index 317b181ab512..b79cc953adb9 100644
--- a/app/lib/server/functions/getFullUserData.js
+++ b/app/lib/server/functions/getFullUserData.js
@@ -78,6 +78,9 @@ export function getFullUserDataById({ userId, filterId }) {
 export const getFullUserData = function({ userId, filter, limit: l }) {
 	const username = s.trim(filter);
 	const userToRetrieveFullUserData = username && Users.findOneByUsername(username, { fields: { username: 1 } });
+	if (!userToRetrieveFullUserData) {
+		return;
+	}
 
 	const isMyOwnInfo = userToRetrieveFullUserData && userToRetrieveFullUserData._id === userId;
 	const viewFullOtherUserInfo = hasPermission(userId, 'view-full-other-user-info');
diff --git a/app/models/server/models/Users.js b/app/models/server/models/Users.js
index 42222ec37388..9d594a9f32b1 100644
--- a/app/models/server/models/Users.js
+++ b/app/models/server/models/Users.js
@@ -493,12 +493,6 @@ export class Users extends Base {
 	}
 
 	// FIND
-	findById(userId) {
-		const query = { _id: userId };
-
-		return this.find(query);
-	}
-
 	findByIds(users, options) {
 		const query = { _id: { $in: users } };
 		return this.find(query, options);
diff --git a/app/models/server/models/_Base.js b/app/models/server/models/_Base.js
index 97315044e369..d5ba676bd7e2 100644
--- a/app/models/server/models/_Base.js
+++ b/app/models/server/models/_Base.js
@@ -119,6 +119,14 @@ export class Base {
 		}
 	}
 
+	findById(...args) {
+		try {
+			return this[this.origin].findById(...args);
+		} catch (e) {
+			console.error('Exception on find', e, ...args);
+		}
+	}
+
 	findOne(...args) {
 		try {
 			return this[this.origin].findOne(...args);
diff --git a/app/models/server/models/_BaseDb.js b/app/models/server/models/_BaseDb.js
index d7df328844ca..d248544a918a 100644
--- a/app/models/server/models/_BaseDb.js
+++ b/app/models/server/models/_BaseDb.js
@@ -130,6 +130,10 @@ export class BaseDb extends EventEmitter {
 		return this.model.find(...args);
 	}
 
+	findById(_id, options) {
+		return this.find({ _id }, options);
+	}
+
 	findOne(...args) {
 		this._doNotMixInclusionAndExclusionFields(args[1]);
 		return this.model.findOne(...args);
diff --git a/tests/end-to-end/api/01-users.js b/tests/end-to-end/api/01-users.js
index 3eb83c9106df..3ab97cdb5c9c 100644
--- a/tests/end-to-end/api/01-users.js
+++ b/tests/end-to-end/api/01-users.js
@@ -198,6 +198,21 @@ describe('[Users]', function() {
 	describe('[/users.info]', () => {
 		after(() => updatePermission('view-other-user-channels', ['admin']));
 
+		it('should return an error when the user does not exist', (done) => {
+			request.get(api('users.info'))
+				.set(credentials)
+				.query({
+					username: 'invalid-username',
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error').and.to.be.equal('User not found.');
+				})
+				.end(done);
+		});
+
 		it('should query information about a user by userId', (done) => {
 			request.get(api('users.info'))
 				.set(credentials)

From 0068bdb80d913f0b63ec44d8d81e7fd321e6b5c2 Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Tue, 18 Feb 2020 09:41:02 -0300
Subject: [PATCH 011/223] [FIX] Omnichannel Inquiry queues when removing chats
 (#16603)

* Fix Inquiry stream when removing omnichannel rooms.

* Remove unnecessary blank line.

* Remove unnecessary import files.
---
 app/livechat/client/lib/stream/queueManager.js    |  6 +++---
 app/livechat/client/views/app/livechatReadOnly.js |  4 +---
 app/livechat/server/lib/Livechat.js               | 15 +++++++++++++++
 .../server/methods/removeAllClosedRooms.js        |  8 +++-----
 app/livechat/server/methods/removeRoom.js         |  7 +++----
 app/models/server/models/LivechatInquiry.js       |  8 ++++++++
 6 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/app/livechat/client/lib/stream/queueManager.js b/app/livechat/client/lib/stream/queueManager.js
index 32eef969cfc8..5f58fdc56376 100644
--- a/app/livechat/client/lib/stream/queueManager.js
+++ b/app/livechat/client/lib/stream/queueManager.js
@@ -15,12 +15,12 @@ const events = {
 	},
 	changed: (inquiry, collection) => {
 		if (inquiry.status !== 'queued' || (inquiry.department && !agentDepartments.includes(inquiry.department))) {
-			return collection.remove({ rid: inquiry.rid });
+			return collection.remove(inquiry._id);
 		}
 		delete inquiry.type;
-		collection.upsert({ rid: inquiry.rid }, inquiry);
+		collection.upsert({ _id: inquiry._id }, inquiry);
 	},
-	removed: (inquiry, collection) => collection.remove({ rid: inquiry.rid }),
+	removed: (inquiry, collection) => collection.remove(inquiry._id),
 };
 
 const appendListenerToDepartment = (departmentId, collection) => livechatQueueStreamer.on(`${ LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER }/${ departmentId }`, (inquiry) => events[inquiry.type](inquiry, collection));
diff --git a/app/livechat/client/views/app/livechatReadOnly.js b/app/livechat/client/views/app/livechatReadOnly.js
index dc928e19fe5e..da599cb65cb0 100644
--- a/app/livechat/client/views/app/livechatReadOnly.js
+++ b/app/livechat/client/views/app/livechatReadOnly.js
@@ -50,9 +50,7 @@ Template.livechatReadOnly.onCreated(function() {
 	this.preparing = new ReactiveVar(true);
 
 	this.updateInquiry = (inquiry) => {
-		if (inquiry && inquiry.rid === this.rid) {
-			this.inquiry.set(inquiry);
-		}
+		this.inquiry.set(inquiry);
 	};
 
 	Meteor.call('livechat:getRoutingConfig', (err, config) => {
diff --git a/app/livechat/server/lib/Livechat.js b/app/livechat/server/lib/Livechat.js
index f2f43691ce72..9853dcb5a28f 100644
--- a/app/livechat/server/lib/Livechat.js
+++ b/app/livechat/server/lib/Livechat.js
@@ -370,6 +370,20 @@ export const Livechat = {
 		return true;
 	},
 
+	removeRoom(rid) {
+		check(rid, String);
+		const room = LivechatRooms.findOneById(rid);
+		if (!room) {
+			throw new Meteor.Error('error-invalid-room', 'Invalid room', { method: 'livechat:removeRoom' });
+		}
+
+		Messages.removeByRoomId(rid);
+		Subscriptions.removeByRoomId(rid);
+		LivechatInquiry.removeByRoomId(rid);
+		return LivechatRooms.removeById(rid);
+	},
+
+
 	setCustomFields({ token, key, value, overwrite } = {}) {
 		check(token, String);
 		check(key, String);
@@ -757,6 +771,7 @@ export const Livechat = {
 
 		Subscriptions.removeByVisitorToken(token);
 		LivechatRooms.removeByVisitorToken(token);
+		LivechatInquiry.removeByVisitorToken(token);
 	},
 
 	saveDepartmentAgents(_id, departmentAgents) {
diff --git a/app/livechat/server/methods/removeAllClosedRooms.js b/app/livechat/server/methods/removeAllClosedRooms.js
index 6849d2b40e6b..ae29e85a030f 100644
--- a/app/livechat/server/methods/removeAllClosedRooms.js
+++ b/app/livechat/server/methods/removeAllClosedRooms.js
@@ -1,7 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 
 import { hasPermission } from '../../../authorization';
-import { LivechatRooms, Messages, Subscriptions } from '../../../models';
+import { LivechatRooms } from '../../../models';
+import { Livechat } from '../lib/Livechat';
 
 Meteor.methods({
 	'livechat:removeAllClosedRooms'(departmentIds) {
@@ -11,10 +12,7 @@ Meteor.methods({
 
 		let count = 0;
 		LivechatRooms.findClosedRooms(departmentIds).forEach(({ _id }) => {
-			Messages.removeByRoomId(_id);
-			Subscriptions.removeByRoomId(_id);
-			LivechatRooms.removeById(_id);
-
+			Livechat.removeRoom(_id);
 			count++;
 		});
 
diff --git a/app/livechat/server/methods/removeRoom.js b/app/livechat/server/methods/removeRoom.js
index ef0329ae0b4f..f8c251e28a36 100644
--- a/app/livechat/server/methods/removeRoom.js
+++ b/app/livechat/server/methods/removeRoom.js
@@ -1,7 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 
 import { hasPermission } from '../../../authorization';
-import { LivechatRooms, Messages, Subscriptions } from '../../../models';
+import { LivechatRooms } from '../../../models';
+import { Livechat } from '../lib/Livechat';
 
 Meteor.methods({
 	'livechat:removeRoom'(rid) {
@@ -29,8 +30,6 @@ Meteor.methods({
 			});
 		}
 
-		Messages.removeByRoomId(rid);
-		Subscriptions.removeByRoomId(rid);
-		return LivechatRooms.removeById(rid);
+		return Livechat.removeRoom(rid);
 	},
 });
diff --git a/app/models/server/models/LivechatInquiry.js b/app/models/server/models/LivechatInquiry.js
index f7a78064d8a1..ccf54c445231 100644
--- a/app/models/server/models/LivechatInquiry.js
+++ b/app/models/server/models/LivechatInquiry.js
@@ -172,6 +172,14 @@ export class LivechatInquiry extends Base {
 	removeByRoomId(rid) {
 		return this.remove({ rid });
 	}
+
+	removeByVisitorToken(token) {
+		const query = {
+			'v.token': token,
+		};
+
+		this.remove(query);
+	}
 }
 
 export default new LivechatInquiry();

From be97a51e49d251e727beeca56626248936820d72 Mon Sep 17 00:00:00 2001
From: gabriellsh <40830821+gabriellsh@users.noreply.github.com>
Date: Fri, 21 Feb 2020 15:05:23 -0300
Subject: [PATCH 012/223] [FIX] ie11 support (#16682)

---
 app/ui-sidenav/client/userPresence.js | 22 +++++++++++++++++-----
 imports/client/query-string           |  1 +
 imports/client/scheduler              |  1 +
 imports/client/split-on-first         |  1 +
 imports/client/strict-uri-encode      |  1 +
 5 files changed, 21 insertions(+), 5 deletions(-)
 create mode 120000 imports/client/query-string
 create mode 120000 imports/client/scheduler
 create mode 120000 imports/client/split-on-first
 create mode 120000 imports/client/strict-uri-encode

diff --git a/app/ui-sidenav/client/userPresence.js b/app/ui-sidenav/client/userPresence.js
index 32501e8d9253..f6ae3e82171a 100644
--- a/app/ui-sidenav/client/userPresence.js
+++ b/app/ui-sidenav/client/userPresence.js
@@ -67,7 +67,9 @@ const handleEntries = function(entries) {
 	getAll();
 };
 
-const observer = new IntersectionObserver(handleEntries, options);
+const featureExists = !!window.IntersectionObserver;
+
+const observer = featureExists && new IntersectionObserver(handleEntries, options);
 
 Tracker.autorun(() => {
 	if (!Meteor.userId() || !Meteor.status().connected) {
@@ -75,13 +77,23 @@ Tracker.autorun(() => {
 	}
 	mem.clear(get);
 
-	for (const node of data.keys()) {
-		observer.unobserve(node);
-		observer.observe(node);
+	if (featureExists) {
+		for (const node of data.keys()) {
+			observer.unobserve(node);
+			observer.observe(node);
+		}
 	}
+
+	get(this.data.uid);
+	getAll();
 });
 
 Template.userPresence.onRendered(function() {
 	data.set(this.firstNode, this.data);
-	observer.observe(this.firstNode);
+	if (featureExists) {
+		return observer.observe(this.firstNode);
+	}
+
+	get(this.data.uid);
+	getAll();
 });
diff --git a/imports/client/query-string b/imports/client/query-string
new file mode 120000
index 000000000000..3d5529bafa0b
--- /dev/null
+++ b/imports/client/query-string
@@ -0,0 +1 @@
+../../node_modules/query-string/
\ No newline at end of file
diff --git a/imports/client/scheduler b/imports/client/scheduler
new file mode 120000
index 000000000000..d6ef6285d8c0
--- /dev/null
+++ b/imports/client/scheduler
@@ -0,0 +1 @@
+../../node_modules/scheduler/
\ No newline at end of file
diff --git a/imports/client/split-on-first b/imports/client/split-on-first
new file mode 120000
index 000000000000..ac3c77694047
--- /dev/null
+++ b/imports/client/split-on-first
@@ -0,0 +1 @@
+../../node_modules/split-on-first/
\ No newline at end of file
diff --git a/imports/client/strict-uri-encode b/imports/client/strict-uri-encode
new file mode 120000
index 000000000000..77c01a2aedbb
--- /dev/null
+++ b/imports/client/strict-uri-encode
@@ -0,0 +1 @@
+../../node_modules/strict-uri-encode/
\ No newline at end of file

From 031fd615b50728e34c983e243cc4bfc5db4e0a7b Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Fri, 21 Feb 2020 15:23:41 -0300
Subject: [PATCH 013/223] Bump version to 3.0.2

---
 .docker/Dockerfile.rhel   |  2 +-
 .github/history.json      | 48 +++++++++++++++++++++++++++++++++++++++
 HISTORY.md                | 23 +++++++++++++++++++
 app/utils/rocketchat.info |  2 +-
 package.json              |  2 +-
 5 files changed, 74 insertions(+), 3 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index c3d663fc2ba4..26f7053acf2b 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.0.1
+ENV RC_VERSION 3.0.2
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index 56e30e9a729a..0ec310d4b388 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -39822,6 +39822,54 @@
           ]
         }
       ]
+    },
+    "3.0.2": {
+      "node_version": "12.14.0",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "16682",
+          "title": "[FIX] ie11 support",
+          "userLogin": "gabriellsh",
+          "milestone": "3.0.2",
+          "contributors": [
+            "gabriellsh"
+          ]
+        },
+        {
+          "pr": "16603",
+          "title": "[FIX] Omnichannel Inquiry queues when removing chats",
+          "userLogin": "renatobecker",
+          "milestone": "3.0.2",
+          "contributors": [
+            "renatobecker"
+          ]
+        },
+        {
+          "pr": "16495",
+          "title": "[FIX] users.info endpoint not handling the error if the user does not exist",
+          "userLogin": "MarcosSpessatto",
+          "milestone": "3.0.2",
+          "contributors": [
+            "MarcosSpessatto",
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "16668",
+          "title": "[FIX] Clear unread red line when the ESC key is pressed ",
+          "userLogin": "ggazzo",
+          "milestone": "3.0.2",
+          "contributors": [
+            "ggazzo"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/HISTORY.md b/HISTORY.md
index e86db17e8261..62686946b4cc 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,27 @@
 
+# 3.0.2
+`2020-02-21  ·  4 🐛  ·  5 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `12.14.0`
+- NPM: `6.13.4`
+- MongoDB: `3.4, 3.6, 4.0`
+
+### 🐛 Bug fixes
+
+- ie11 support ([#16682](https://github.com/RocketChat/Rocket.Chat/pull/16682))
+- Omnichannel Inquiry queues when removing chats ([#16603](https://github.com/RocketChat/Rocket.Chat/pull/16603))
+- users.info endpoint not handling the error if the user does not exist ([#16495](https://github.com/RocketChat/Rocket.Chat/pull/16495))
+- Clear unread red line when the ESC key is pressed  ([#16668](https://github.com/RocketChat/Rocket.Chat/pull/16668))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+- [@gabriellsh](https://github.com/gabriellsh)
+- [@ggazzo](https://github.com/ggazzo)
+- [@renatobecker](https://github.com/renatobecker)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 3.0.1
 `2020-02-19  ·  7 🐛  ·  4 👩‍💻👨‍💻`
 
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index 9bc526777aae..5298a3fef982 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.0.1"
+	"version": "3.0.2"
 }
diff --git a/package.json b/package.json
index d6970a605cb0..b796a24f3c5c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.0.1",
+	"version": "3.0.2",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

From 9d7150b574e0016c7155a2db95c80ef305bc94b7 Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Thu, 20 Feb 2020 16:22:11 -0300
Subject: [PATCH 014/223] [IMPROVE] Check agent status when starting a new
 conversation with an agent assigned (#16618)

---
 app/livechat/server/lib/Helper.js       | 10 ++++++++++
 app/livechat/server/lib/QueueManager.js |  5 ++---
 app/models/server/models/Users.js       |  4 ++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/livechat/server/lib/Helper.js b/app/livechat/server/lib/Helper.js
index 2c02722ff960..b8cf56a241e7 100644
--- a/app/livechat/server/lib/Helper.js
+++ b/app/livechat/server/lib/Helper.js
@@ -275,3 +275,13 @@ export const normalizeTransferredByData = (transferredBy, room) => {
 		type,
 	};
 };
+
+export const checkServiceStatus = ({ guest, agent }) => {
+	if (agent) {
+		const { agentId } = agent;
+		const users = Users.findOnlineAgents(agentId);
+		return users && users.count() > 0;
+	}
+
+	return Livechat.online(guest.department);
+};
diff --git a/app/livechat/server/lib/QueueManager.js b/app/livechat/server/lib/QueueManager.js
index cdd4aa1c6012..aa1632390e20 100644
--- a/app/livechat/server/lib/QueueManager.js
+++ b/app/livechat/server/lib/QueueManager.js
@@ -2,10 +2,9 @@ import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 
 import { LivechatRooms, LivechatInquiry } from '../../../models/server';
-import { createLivechatRoom, createLivechatInquiry } from './Helper';
+import { checkServiceStatus, createLivechatRoom, createLivechatInquiry } from './Helper';
 import { callbacks } from '../../../callbacks/server';
 import { RoutingManager } from './RoutingManager';
-import { Livechat } from './Livechat';
 
 export const QueueManager = {
 	async requestRoom({ guest, message, roomInfo, agent }) {
@@ -19,7 +18,7 @@ export const QueueManager = {
 			department: Match.Maybe(String),
 		}));
 
-		if (!Livechat.online(guest.department)) {
+		if (!checkServiceStatus({ guest, agent })) {
 			throw new Meteor.Error('no-agent-online', 'Sorry, no online agents');
 		}
 
diff --git a/app/models/server/models/Users.js b/app/models/server/models/Users.js
index 9d594a9f32b1..2e0fd8dc82c3 100644
--- a/app/models/server/models/Users.js
+++ b/app/models/server/models/Users.js
@@ -91,8 +91,8 @@ export class Users extends Base {
 		return this.update(_id, update);
 	}
 
-	findOnlineAgents() {
-		const query = queryStatusAgentOnline();
+	findOnlineAgents(agentId) {
+		const query = queryStatusAgentOnline(agentId && { _id: agentId });
 
 		return this.find(query);
 	}

From 661ad361bd4438eb7ce607c7720a00969a0d7328 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 20 Feb 2020 17:44:20 -0300
Subject: [PATCH 015/223] [FIX] LDAP sync admin action was not syncing exisent
 users (#16671)

---
 app/ldap/server/ldap.js                       |  7 ++-
 app/ldap/server/sync.js                       |  9 ++--
 app/ldap/server/syncUsers.js                  |  4 +-
 .../server/functions/setUserActiveStatus.js   | 46 +++++++++++++++++++
 server/methods/setUserActiveStatus.js         | 42 +----------------
 5 files changed, 61 insertions(+), 47 deletions(-)
 create mode 100644 app/lib/server/functions/setUserActiveStatus.js

diff --git a/app/ldap/server/ldap.js b/app/ldap/server/ldap.js
index c18370b09ce1..0739e6880270 100644
--- a/app/ldap/server/ldap.js
+++ b/app/ldap/server/ldap.js
@@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import ldapjs from 'ldapjs';
 import Bunyan from 'bunyan';
 
+import { callbacks } from '../../callbacks/server';
 import { settings } from '../../settings';
 import { Logger } from '../../logger';
 
@@ -376,6 +377,8 @@ export default class LDAP {
 	searchAllPaged(BaseDN, options, page) {
 		this.bindIfNecessary();
 
+		({ BaseDN, options } = callbacks.run('ldap.beforeSearchAll', { BaseDN, options }));
+
 		const processPage = ({ entries, title, end, next }) => {
 			logger.search.info(title);
 			// Force LDAP idle to wait the record processing
@@ -425,8 +428,8 @@ export default class LDAP {
 						title: 'Final Page',
 						end: true,
 					});
+					entries = [];
 				} else if (entries.length) {
-					logger.search.info('Page');
 					processPage({
 						entries,
 						title: 'Page',
@@ -453,6 +456,8 @@ export default class LDAP {
 	searchAllAsync(BaseDN, options, callback) {
 		this.bindIfNecessary();
 
+		({ BaseDN, options } = callbacks.run('ldap.beforeSearchAll', { BaseDN, options }));
+
 		this.client.search(BaseDN, options, (error, res) => {
 			if (error) {
 				logger.search.error(error);
diff --git a/app/ldap/server/sync.js b/app/ldap/server/sync.js
index e9ff3a30a45b..5a17a64f9e87 100644
--- a/app/ldap/server/sync.js
+++ b/app/ldap/server/sync.js
@@ -5,6 +5,7 @@ import { SyncedCron } from 'meteor/littledata:synced-cron';
 import _ from 'underscore';
 
 import LDAP from './ldap';
+import { callbacks } from '../../callbacks/server';
 import { RocketChatFile } from '../../file';
 import { settings } from '../../settings';
 import { Notifications } from '../../notifications';
@@ -16,7 +17,7 @@ import { FileUpload } from '../../file-upload';
 import { addUserToRoom, removeUserFromRoom, createRoom } from '../../lib/server/functions';
 
 
-const logger = new Logger('LDAPSync', {});
+export const logger = new Logger('LDAPSync', {});
 
 export function isUserInLDAPGroup(ldap, ldapUser, user, ldapGroup) {
 	const syncUserRolesFilter = settings.get('LDAP_Sync_User_Data_Groups_Filter').trim();
@@ -531,7 +532,7 @@ export function importNewUsers(ldap) {
 	}));
 }
 
-function sync() {
+export function sync() {
 	if (settings.get('LDAP_Enable') !== true) {
 		return;
 	}
@@ -562,9 +563,9 @@ function sync() {
 
 				if (ldapUser) {
 					syncUserData(user, ldapUser, ldap);
-				} else {
-					logger.info('Can\'t sync user', user.username);
 				}
+
+				callbacks.run('ldap.afterSyncExistentUser', { ldapUser, user });
 			});
 		}
 	} catch (error) {
diff --git a/app/ldap/server/syncUsers.js b/app/ldap/server/syncUsers.js
index 8713c8973e5c..d1f873af86d3 100644
--- a/app/ldap/server/syncUsers.js
+++ b/app/ldap/server/syncUsers.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 
-import { importNewUsers } from './sync';
+import { sync } from './sync';
 import { hasRole } from '../../authorization';
 import { settings } from '../../settings';
 
@@ -21,7 +21,7 @@ Meteor.methods({
 
 		this.unblock();
 
-		importNewUsers();
+		sync();
 
 		return {
 			message: 'Sync_in_progress',
diff --git a/app/lib/server/functions/setUserActiveStatus.js b/app/lib/server/functions/setUserActiveStatus.js
new file mode 100644
index 000000000000..5a432d8cb769
--- /dev/null
+++ b/app/lib/server/functions/setUserActiveStatus.js
@@ -0,0 +1,46 @@
+import { check } from 'meteor/check';
+import { Accounts } from 'meteor/accounts-base';
+
+import * as Mailer from '../../../mailer';
+import { Users, Subscriptions } from '../../../models';
+import { settings } from '../../../settings';
+
+export function setUserActiveStatus(userId, active) {
+	check(userId, String);
+	check(active, Boolean);
+
+	const user = Users.findOneById(userId);
+
+	if (!user) {
+		return false;
+	}
+
+	Users.setUserActive(userId, active);
+
+	if (user.username) {
+		Subscriptions.setArchivedByUsername(user.username, !active);
+	}
+
+	if (active === false) {
+		Users.unsetLoginTokens(userId);
+	} else {
+		Users.unsetReason(userId);
+	}
+	if (active && !settings.get('Accounts_Send_Email_When_Activating')) {
+		return true;
+	}
+	if (!active && !settings.get('Accounts_Send_Email_When_Deactivating')) {
+		return true;
+	}
+
+	const destinations = Array.isArray(user.emails) && user.emails.map((email) => `${ user.name || user.username }<${ email.address }>`);
+
+	const email = {
+		to: destinations,
+		from: settings.get('From_Email'),
+		subject: Accounts.emailTemplates.userActivated.subject({ active }),
+		html: Accounts.emailTemplates.userActivated.html({ active, name: user.name, username: user.username }),
+	};
+
+	Mailer.sendNoWrap(email);
+}
diff --git a/server/methods/setUserActiveStatus.js b/server/methods/setUserActiveStatus.js
index 2328d79d54ca..d06e2aea0f3a 100644
--- a/server/methods/setUserActiveStatus.js
+++ b/server/methods/setUserActiveStatus.js
@@ -1,11 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
-import { Accounts } from 'meteor/accounts-base';
 
-import * as Mailer from '../../app/mailer';
 import { hasPermission } from '../../app/authorization';
-import { Users, Subscriptions } from '../../app/models';
-import { settings } from '../../app/settings';
+import { setUserActiveStatus } from '../../app/lib/server/functions/setUserActiveStatus';
 
 Meteor.methods({
 	setUserActiveStatus(userId, active) {
@@ -24,42 +21,7 @@ Meteor.methods({
 			});
 		}
 
-		const user = Users.findOneById(userId);
-
-		if (!user) {
-			return false;
-		}
-
-		Users.setUserActive(userId, active);
-
-		if (user.username) {
-			Subscriptions.setArchivedByUsername(user.username, !active);
-		}
-
-		if (active === false) {
-			Users.unsetLoginTokens(userId);
-		} else {
-			Users.unsetReason(userId);
-		}
-		if (active && !settings.get('Accounts_Send_Email_When_Activating')) {
-			return true;
-		}
-		if (!active && !settings.get('Accounts_Send_Email_When_Deactivating')) {
-			return true;
-		}
-
-		const destinations = Array.isArray(user.emails) && user.emails.map((email) => `${ user.name || user.username }<${ email.address }>`);
-
-
-		const email = {
-			to: destinations,
-			from: settings.get('From_Email'),
-			subject: Accounts.emailTemplates.userActivated.subject({ active }),
-			html: Accounts.emailTemplates.userActivated.html({ active, name: user.name, username: user.username }),
-		};
-
-		Mailer.sendNoWrap(email);
-
+		setUserActiveStatus(userId, active);
 
 		return true;
 	},

From 1b333f942dae5c97676cfa37702d4a4770a4a12c Mon Sep 17 00:00:00 2001
From: pierre-lehnen-rc <55164754+pierre-lehnen-rc@users.noreply.github.com>
Date: Thu, 27 Feb 2020 15:24:21 -0300
Subject: [PATCH 016/223] [FIX] Rocket.Chat takes too long to set the username
 when it fails to send enrollment email (#16723)

---
 app/lib/server/functions/setUsername.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/lib/server/functions/setUsername.js b/app/lib/server/functions/setUsername.js
index d705d436c084..7656e7dbe4af 100644
--- a/app/lib/server/functions/setUsername.js
+++ b/app/lib/server/functions/setUsername.js
@@ -41,7 +41,9 @@ export const _setUsername = function(userId, u) {
 	// If first time setting username, send Enrollment Email
 	try {
 		if (!previousUsername && user.emails && user.emails.length > 0 && settings.get('Accounts_Enrollment_Email')) {
-			Accounts.sendEnrollmentEmail(user._id);
+			Meteor.defer(() => {
+				Accounts.sendEnrollmentEmail(user._id);
+			});
 		}
 	} catch (e) {
 		console.error(e);

From 8a650e50ab9792b54454f5f321e03b5b6ec69b50 Mon Sep 17 00:00:00 2001
From: Aaron Ogle <geekgonecrazy@users.noreply.github.com>
Date: Thu, 27 Feb 2020 12:25:25 -0600
Subject: [PATCH 017/223] [FIX] Manual Register use correct state for
 determining registered (#16726)

* Fix: Manual Register api call

* show button using correct condition

* Removed '-->' from modal

Co-authored-by: Douglas Gubert <d-gubert@users.noreply.github.com>
---
 app/api/server/v1/cloud.js         | 2 +-
 app/cloud/client/admin/cloud.html  | 2 +-
 app/ui-utils/client/lib/modal.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/api/server/v1/cloud.js b/app/api/server/v1/cloud.js
index 1aa430151c41..7b1b3e729121 100644
--- a/app/api/server/v1/cloud.js
+++ b/app/api/server/v1/cloud.js
@@ -17,7 +17,7 @@ API.v1.addRoute('cloud.manualRegister', { authRequired: true }, {
 
 		const registrationInfo = retrieveRegistrationStatus();
 
-		if (registrationInfo.connectToCloud) {
+		if (registrationInfo.workspaceRegistered) {
 			return API.v1.failure('Workspace is already registered');
 		}
 
diff --git a/app/cloud/client/admin/cloud.html b/app/cloud/client/admin/cloud.html
index 41b24ec93d7f..78c1e053390d 100644
--- a/app/cloud/client/admin/cloud.html
+++ b/app/cloud/client/admin/cloud.html
@@ -3,7 +3,7 @@
 		<section class="page-container page-home page-static page-settings">
 			{{#header sectionName="Connectivity_Services" hideHelp=true fixedHeight=true fullpage=true}}
 				<div class="rc-header__section-button">
-					{{#unless info.connectToCloud}}
+					{{#unless info.workspaceRegistered}}
 						<button class="rc-button rc-button--small rc-button--primary rc-button--outline js-register">
 							{{_ "Cloud_Register_manually"}}
 						</button>
diff --git a/app/ui-utils/client/lib/modal.html b/app/ui-utils/client/lib/modal.html
index 69cbe1da8bf8..19ad6fe23d55 100644
--- a/app/ui-utils/client/lib/modal.html
+++ b/app/ui-utils/client/lib/modal.html
@@ -6,7 +6,7 @@
 		<dialog class="rc-modal rc-modal--{{modifier}}" data-modal="modal">
 
 			{{# if template}}
-				{{> Template.dynamic template=template data=data}} -->
+				{{> Template.dynamic template=template data=data}}
 			{{else}}
 				<header class="rc-modal__header">
 					<h1 class="rc-modal__title">

From 0e9d6ea8ff839a3567efb773750de50ed8689f28 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 2 Mar 2020 10:36:48 -0300
Subject: [PATCH 018/223] [FIX] Language country has been ignored on
 translation load (#16757)

* [FIX] Language country has been ignored on translation load

* Enforce uppercase country on filterLanguage method and change the language list to list with uppercase countries
---
 app/ui-account/client/accountPreferences.js | 4 ++--
 client/startup/i18n.js                      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/ui-account/client/accountPreferences.js b/app/ui-account/client/accountPreferences.js
index 7c6c38b8a5f4..d17cd1c80943 100644
--- a/app/ui-account/client/accountPreferences.js
+++ b/app/ui-account/client/accountPreferences.js
@@ -49,7 +49,7 @@ Template.accountPreferences.helpers({
 		const languages = TAPi18n.getLanguages();
 
 		const result = Object.entries(languages)
-			.map(([key, language]) => ({ ...language, key: key.toLowerCase() }))
+			.map(([key, language]) => ({ ...language, key }))
 			.sort((a, b) => a.key - b.key);
 
 		result.unshift({
@@ -62,7 +62,7 @@ Template.accountPreferences.helpers({
 	},
 	isUserLanguage(key) {
 		const languageKey = Meteor.user().language;
-		return typeof languageKey === 'string' && languageKey.toLowerCase() === key;
+		return typeof languageKey === 'string' && languageKey.toLowerCase() === key.toLowerCase();
 	},
 	ifThenElse(condition, val, not = '') {
 		return condition ? val : not;
diff --git a/client/startup/i18n.js b/client/startup/i18n.js
index 4f9d0a996d2d..c0e35e78815e 100644
--- a/client/startup/i18n.js
+++ b/client/startup/i18n.js
@@ -21,7 +21,7 @@ Meteor.startup(() => {
 		const regex = /([a-z]{2,3})-([a-z]{2,4})/;
 		const matches = regex.exec(language);
 		if (matches) {
-			return `${ matches[1] }-${ matches[2].toLowerCase() }`;
+			return `${ matches[1] }-${ matches[2].toUpperCase() }`;
 		}
 
 		return language;

From 8cc8a603a5315b0b2bcb5bd9119d987bc988ea5c Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Mon, 2 Mar 2020 16:00:13 -0300
Subject: [PATCH 019/223] Bump version to 3.0.3

---
 .docker/Dockerfile.rhel   |  2 +-
 .github/history.json      | 91 ++++++++++++++++++++++++++++++++++++++-
 HISTORY.md                | 43 +++++++++++++++++-
 app/utils/rocketchat.info |  2 +-
 package.json              |  2 +-
 5 files changed, 135 insertions(+), 5 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 26f7053acf2b..3edc448beeaa 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.0.2
+ENV RC_VERSION 3.0.3
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index 0ec310d4b388..44a7272e4ba8 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -39823,6 +39823,27 @@
         }
       ]
     },
+    "2.4.10": {
+      "node_version": "8.17.0",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "16495",
+          "title": "[FIX] users.info endpoint not handling the error if the user does not exist",
+          "userLogin": "MarcosSpessatto",
+          "milestone": "3.0.2",
+          "contributors": [
+            "MarcosSpessatto",
+            "sampaiodiego"
+          ]
+        }
+      ]
+    },
     "3.0.2": {
       "node_version": "12.14.0",
       "npm_version": "6.13.4",
@@ -39870,6 +39891,74 @@
           ]
         }
       ]
+    },
+    "2.4.11": {
+      "node_version": "8.17.0",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": []
+    },
+    "3.0.3": {
+      "node_version": "12.14.0",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "16757",
+          "title": "[FIX] Language country has been ignored on translation load",
+          "userLogin": "rodrigok",
+          "milestone": "3.0.3",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "16726",
+          "title": "[FIX] Manual Register use correct state for determining registered",
+          "userLogin": "geekgonecrazy",
+          "milestone": "3.0.3",
+          "contributors": [
+            "geekgonecrazy",
+            "web-flow",
+            "d-gubert"
+          ]
+        },
+        {
+          "pr": "16723",
+          "title": "[FIX] Rocket.Chat takes too long to set the username when it fails to send enrollment email",
+          "userLogin": "pierre-lehnen-rc",
+          "milestone": "3.0.3",
+          "contributors": [
+            "pierre-lehnen-rc"
+          ]
+        },
+        {
+          "pr": "16671",
+          "title": "[FIX] LDAP sync admin action was not syncing existent users",
+          "userLogin": "rodrigok",
+          "milestone": "3.0.3",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "16618",
+          "title": "[FIX] Check agent status when starting a new conversation with an agent assigned",
+          "userLogin": "renatobecker",
+          "milestone": "3.0.3",
+          "contributors": [
+            "renatobecker"
+          ]
+        }
+      ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/HISTORY.md b/HISTORY.md
index 62686946b4cc..40f27d6c39d5 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,28 @@
 
+# 3.0.3
+`2020-03-02  ·  5 🐛  ·  5 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `12.14.0`
+- NPM: `6.13.4`
+- MongoDB: `3.4, 3.6, 4.0`
+
+### 🐛 Bug fixes
+
+- Language country has been ignored on translation load ([#16757](https://github.com/RocketChat/Rocket.Chat/pull/16757))
+- Manual Register use correct state for determining registered ([#16726](https://github.com/RocketChat/Rocket.Chat/pull/16726))
+- Rocket.Chat takes too long to set the username when it fails to send enrollment email ([#16723](https://github.com/RocketChat/Rocket.Chat/pull/16723))
+- LDAP sync admin action was not syncing existent users ([#16671](https://github.com/RocketChat/Rocket.Chat/pull/16671))
+- Check agent status when starting a new conversation with an agent assigned ([#16618](https://github.com/RocketChat/Rocket.Chat/pull/16618))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@d-gubert](https://github.com/d-gubert)
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@pierre-lehnen-rc](https://github.com/pierre-lehnen-rc)
+- [@renatobecker](https://github.com/renatobecker)
+- [@rodrigok](https://github.com/rodrigok)
+
 # 3.0.2
 `2020-02-21  ·  4 🐛  ·  5 👩‍💻👨‍💻`
 
@@ -203,6 +227,23 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 - [@tassoevan](https://github.com/tassoevan)
 
+# 2.4.10
+`2020-02-20  ·  1 🐛  ·  2 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `8.17.0`
+- NPM: `6.13.4`
+- MongoDB: `3.4, 3.6, 4.0`
+
+### 🐛 Bug fixes
+
+- users.info endpoint not handling the error if the user does not exist ([#16495](https://github.com/RocketChat/Rocket.Chat/pull/16495))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 2.4.9
 `2020-02-10  ·  1 🐛  ·  1 🔍  ·  1 👩‍💻👨‍💻`
 
@@ -6632,4 +6673,4 @@
 - [@graywolf336](https://github.com/graywolf336)
 - [@marceloschmidt](https://github.com/marceloschmidt)
 - [@rodrigok](https://github.com/rodrigok)
-- [@sampaiodiego](https://github.com/sampaiodiego)
\ No newline at end of file
+- [@sampaiodiego](https://github.com/sampaiodiego)
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index 5298a3fef982..ad3aeee82e4b 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.0.2"
+	"version": "3.0.3"
 }
diff --git a/package.json b/package.json
index b796a24f3c5c..b63dbf35dc2f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.0.2",
+	"version": "3.0.3",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

From c371875cf559257613cd1d6fa581b99fec0c225c Mon Sep 17 00:00:00 2001
From: pierre-lehnen-rc <55164754+pierre-lehnen-rc@users.noreply.github.com>
Date: Wed, 26 Feb 2020 16:49:42 -0300
Subject: [PATCH 020/223] [FIX] TypeError when trying to load avatar of an
 invalid room. (#16699)

---
 server/routes/avatar/room.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/server/routes/avatar/room.js b/server/routes/avatar/room.js
index 450e211e54c0..7c97106bfbc0 100644
--- a/server/routes/avatar/room.js
+++ b/server/routes/avatar/room.js
@@ -14,7 +14,7 @@ const getRoom = (roomId) => {
 	const room = Rooms.findOneById(roomId, { fields: { t: 1, prid: 1, name: 1, fname: 1 } });
 
 	// if it is a discussion, returns the parent room
-	if (room.prid) {
+	if (room && room.prid) {
 		return Rooms.findOneById(room.prid, { fields: { t: 1, name: 1, fname: 1 } });
 	}
 	return room;
@@ -24,6 +24,12 @@ export const roomAvatar = Meteor.bindEnvironment(function(req, res/* , next*/) {
 	const roomId = req.url.substr(1);
 	const room = getRoom(roomId);
 
+	if (!room) {
+		res.writeHead(404);
+		res.end();
+		return;
+	}
+
 	const roomName = roomTypes.getConfig(room.t).roomName(room);
 
 	setCacheAndDispositionHeaders(req, res);

From 98da220c695d127b9836c260af60a55cee63794f Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Thu, 12 Mar 2020 18:00:10 -0300
Subject: [PATCH 021/223] [FIX] Integrations page pagination (#16838)

---
 app/integrations/client/views/integrations.js | 2 +-
 app/models/server/models/Integrations.js      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/integrations/client/views/integrations.js b/app/integrations/client/views/integrations.js
index c568fa9293a5..0506b21e1697 100644
--- a/app/integrations/client/views/integrations.js
+++ b/app/integrations/client/views/integrations.js
@@ -46,7 +46,7 @@ Template.integrations.onCreated(async function() {
 
 	this.autorun(async () => {
 		const offset = this.offset.get();
-		const { integrations, total } = await APIClient.v1.get(`integrations.list?count=${ ITEMS_COUNT }&offset=${ offset }`);
+		const { integrations, total } = await APIClient.v1.get(`integrations.list?sort={"type":1}&count=${ ITEMS_COUNT }&offset=${ offset }`);
 		this.total.set(total);
 		this.integrations.set(this.integrations.get().concat(integrations));
 	});
diff --git a/app/models/server/models/Integrations.js b/app/models/server/models/Integrations.js
index 0db8901b9594..ffbf40c1dcce 100644
--- a/app/models/server/models/Integrations.js
+++ b/app/models/server/models/Integrations.js
@@ -5,6 +5,8 @@ import { Base } from './_Base';
 export class Integrations extends Base {
 	constructor() {
 		super('integrations');
+
+		this.tryEnsureIndex({ type: 1 });
 	}
 
 	findByType(type, options) {

From fe798d977821ea1b20532cda3e203c9adab01b46 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Thu, 20 Feb 2020 23:20:51 -0300
Subject: [PATCH 022/223] [IMPROVE] Send files over rest api (#16617)

---
 app/api/server/v1/rooms.js               | 66 +++++++++---------
 app/apps/client/admin/appInstall.js      |  4 +-
 app/file-upload/server/lib/FileUpload.js |  2 +
 app/ui/client/lib/fileUpload.js          | 87 +++++++++++++-----------
 app/utils/client/lib/RestApiClient.js    | 28 ++++++--
 5 files changed, 110 insertions(+), 77 deletions(-)

diff --git a/app/api/server/v1/rooms.js b/app/api/server/v1/rooms.js
index 85924d77d27f..2f8a7df23e02 100644
--- a/app/api/server/v1/rooms.js
+++ b/app/api/server/v1/rooms.js
@@ -59,38 +59,45 @@ API.v1.addRoute('rooms.get', { authRequired: true }, {
 	},
 });
 
-API.v1.addRoute('rooms.upload/:rid', { authRequired: true }, {
-	post() {
-		const room = Meteor.call('canAccessRoom', this.urlParams.rid, this.userId);
+const getFiles = Meteor.wrapAsync(({ request }, callback) => {
+	const busboy = new Busboy({ headers: request.headers });
+	const files = [];
 
-		if (!room) {
-			return API.v1.unauthorized();
+	const fields = {};
+
+
+	busboy.on('file', (fieldname, file, filename, encoding, mimetype) => {
+		if (fieldname !== 'file') {
+			return callback(new Meteor.Error('invalid-field'));
 		}
 
-		const busboy = new Busboy({ headers: this.request.headers });
-		const files = [];
-		const fields = {};
+		const fileDate = [];
+		file.on('data', (data) => fileDate.push(data));
 
-		Meteor.wrapAsync((callback) => {
-			busboy.on('file', (fieldname, file, filename, encoding, mimetype) => {
-				if (fieldname !== 'file') {
-					return callback(new Meteor.Error('invalid-field'));
-				}
+		file.on('end', () => {
+			files.push({ fieldname, file, filename, encoding, mimetype, fileBuffer: Buffer.concat(fileDate) });
+		});
+	});
 
-				const fileDate = [];
-				file.on('data', (data) => fileDate.push(data));
+	busboy.on('field', (fieldname, value) => { fields[fieldname] = value; });
 
-				file.on('end', () => {
-					files.push({ fieldname, file, filename, encoding, mimetype, fileBuffer: Buffer.concat(fileDate) });
-				});
-			});
+	busboy.on('finish', Meteor.bindEnvironment(() => callback(null, { files, fields })));
 
-			busboy.on('field', (fieldname, value) => { fields[fieldname] = value; });
+	request.pipe(busboy);
+});
 
-			busboy.on('finish', Meteor.bindEnvironment(() => callback()));
+API.v1.addRoute('rooms.upload/:rid', { authRequired: true }, {
+	post() {
+		const room = Meteor.call('canAccessRoom', this.urlParams.rid, this.userId);
+
+		if (!room) {
+			return API.v1.unauthorized();
+		}
 
-			this.request.pipe(busboy);
-		})();
+
+		const { files, fields } = getFiles({
+			request: this.request,
+		});
 
 		if (files.length === 0) {
 			return API.v1.failure('File required');
@@ -102,8 +109,6 @@ API.v1.addRoute('rooms.upload/:rid', { authRequired: true }, {
 
 		const file = files[0];
 
-		const fileStore = FileUpload.getStore('Uploads');
-
 		const details = {
 			name: file.filename,
 			size: file.fileBuffer.length,
@@ -112,18 +117,17 @@ API.v1.addRoute('rooms.upload/:rid', { authRequired: true }, {
 			userId: this.userId,
 		};
 
-		let fileData = {};
-
-		Meteor.runAsUser(this.userId, () => {
-			const uploadedFile = Meteor.wrapAsync(fileStore.insert.bind(fileStore))(details, file.fileBuffer);
+		const fileData = Meteor.runAsUser(this.userId, () => {
+			const fileStore = FileUpload.getStore('Uploads');
+			const uploadedFile = fileStore.insertSync(details, file.fileBuffer);
 
 			uploadedFile.description = fields.description;
 
 			delete fields.description;
 
-			API.v1.success(Meteor.call('sendFileMessage', this.urlParams.rid, null, uploadedFile, fields));
+			Meteor.call('sendFileMessage', this.urlParams.rid, null, uploadedFile, fields);
 
-			fileData = uploadedFile;
+			return uploadedFile;
 		});
 
 		return API.v1.success({ message: Messages.getMessageByFileIdAndUsername(fileData._id, this.userId) });
diff --git a/app/apps/client/admin/appInstall.js b/app/apps/client/admin/appInstall.js
index 1db80c13b11e..031042ff2f04 100644
--- a/app/apps/client/admin/appInstall.js
+++ b/app/apps/client/admin/appInstall.js
@@ -148,9 +148,9 @@ Template.appInstall.events({
 			let result;
 
 			if (isUpdating) {
-				result = await APIClient.upload(`apps/${ t.isUpdatingId.get() }`, data);
+				result = await APIClient.upload(`apps/${ t.isUpdatingId.get() }`, data).promise;
 			} else {
-				result = await APIClient.upload('apps', data);
+				result = await APIClient.upload('apps', data).promise;
 			}
 
 			FlowRouter.go(`/admin/apps/${ result.app.id }?version=${ result.app.version }`);
diff --git a/app/file-upload/server/lib/FileUpload.js b/app/file-upload/server/lib/FileUpload.js
index b5a9c9d36c46..c66fe0276c73 100644
--- a/app/file-upload/server/lib/FileUpload.js
+++ b/app/file-upload/server/lib/FileUpload.js
@@ -435,6 +435,8 @@ export class FileUploadClass {
 		}
 
 		FileUpload.handlers[name] = this;
+
+		this.insertSync = Meteor.wrapAsync(this.insert, this);
 	}
 
 	getStore() {
diff --git a/app/ui/client/lib/fileUpload.js b/app/ui/client/lib/fileUpload.js
index 42253997a60b..e41ea15116d9 100644
--- a/app/ui/client/lib/fileUpload.js
+++ b/app/ui/client/lib/fileUpload.js
@@ -1,12 +1,11 @@
-import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import { Session } from 'meteor/session';
 import s from 'underscore.string';
 import { Handlebars } from 'meteor/ui';
+import { Random } from 'meteor/random';
 
-import { fileUploadHandler } from '../../../file-upload';
 import { settings } from '../../../settings/client';
-import { t, fileUploadIsValidContentType } from '../../../utils';
+import { t, fileUploadIsValidContentType, APIClient } from '../../../utils';
 import { modal, prependReplies } from '../../../ui-utils';
 
 
@@ -193,7 +192,7 @@ export const fileUpload = async (files, input, { rid, tmid }) => {
 			cancelButtonText: t('Cancel'),
 			html: true,
 			onRendered: () => $('#file-name').focus(),
-		}, (isConfirm) => {
+		}, async (isConfirm) => {
 			if (!isConfirm) {
 				return;
 			}
@@ -206,52 +205,48 @@ export const fileUpload = async (files, input, { rid, tmid }) => {
 				description: document.getElementById('file-description').value,
 			};
 
-			const upload = fileUploadHandler('Uploads', record, file.file);
+			const fileName = document.getElementById('file-name').value || file.name || file.file.name;
+
+			const data = new FormData();
+			record.description && data.append('description', record.description);
+			msg && data.append('msg', msg);
+			tmid && data.append('tmid', tmid);
+			data.append('file', file.file, fileName);
 
-			uploadNextFile();
 
 			const uploads = Session.get('uploading') || [];
-			uploads.push({
-				id: upload.id,
-				name: upload.getFileName(),
+
+			const upload = {
+				id: Random.id(),
+				name: fileName,
 				percentage: 0,
-			});
+			};
+
+			uploads.push(upload);
 			Session.set('uploading', uploads);
 
-			upload.onProgress = (progress) => {
-				const uploads = Session.get('uploading') || [];
-				uploads.filter((u) => u.id === upload.id).forEach((u) => {
-					u.percentage = Math.round(progress * 100) || 0;
-				});
-				Session.set('uploading', uploads);
-			};
+			uploadNextFile();
 
-			upload.start((error, file, storage) => {
-				if (error) {
+			const { xhr, promise } = APIClient.upload(`v1/rooms.upload/${ rid }`, {}, data, {
+				progress(progress) {
+					const uploads = Session.get('uploading') || [];
+
+					if (progress === 100) {
+						return;
+					}
+					uploads.filter((u) => u.id === upload.id).forEach((u) => {
+						u.percentage = Math.round(progress) || 0;
+					});
+					Session.set('uploading', uploads);
+				},
+				error(error) {
 					const uploads = Session.get('uploading') || [];
 					uploads.filter((u) => u.id === upload.id).forEach((u) => {
 						u.error = error.message;
 						u.percentage = 0;
 					});
 					Session.set('uploading', uploads);
-
-					return;
-				}
-
-				if (!file) {
-					return;
-				}
-
-				Meteor.call('sendFileMessage', rid, storage, file, { msg, tmid }, () => {
-					$(input)
-						.removeData('reply')
-						.trigger('dataChange');
-
-					setTimeout(() => {
-						const uploads = Session.get('uploading') || [];
-						Session.set('uploading', uploads.filter((u) => u.id !== upload.id));
-					}, 2000);
-				});
+				},
 			});
 
 			Tracker.autorun((computation) => {
@@ -259,13 +254,27 @@ export const fileUpload = async (files, input, { rid, tmid }) => {
 				if (!isCanceling) {
 					return;
 				}
-
 				computation.stop();
-				upload.stop();
+				Session.delete(`uploading-cancel-${ upload.id }`);
+
+				xhr.abort();
 
 				const uploads = Session.get('uploading') || {};
 				Session.set('uploading', uploads.filter((u) => u.id !== upload.id));
 			});
+
+			try {
+				await promise;
+				const uploads = Session.get('uploading') || [];
+				return Session.set('uploading', uploads.filter((u) => u.id !== upload.id));
+			} catch (error) {
+				const uploads = Session.get('uploading') || [];
+				uploads.filter((u) => u.id === upload.id).forEach((u) => {
+					u.error = error.message;
+					u.percentage = 0;
+				});
+				Session.set('uploading', uploads);
+			}
 		}));
 	};
 
diff --git a/app/utils/client/lib/RestApiClient.js b/app/utils/client/lib/RestApiClient.js
index 594927ebca19..6b927743cac4 100644
--- a/app/utils/client/lib/RestApiClient.js
+++ b/app/utils/client/lib/RestApiClient.js
@@ -21,13 +21,13 @@ export const APIClient = {
 		return APIClient._jqueryCall('POST', endpoint, params, body);
 	},
 
-	upload(endpoint, params, formData) {
+	upload(endpoint, params, formData, xhrOptions) {
 		if (!formData) {
 			formData = params;
 			params = {};
 		}
 
-		return APIClient._jqueryFormDataCall(endpoint, params, formData);
+		return APIClient._jqueryFormDataCall(endpoint, params, formData, xhrOptions);
 	},
 
 	_generateQueryFromParams(params) {
@@ -68,15 +68,31 @@ export const APIClient = {
 		});
 	},
 
-	_jqueryFormDataCall(endpoint, params, formData) {
+	_jqueryFormDataCall(endpoint, params, formData, { progress = () => {}, error = () => {} } = {}) {
+		const ret = { };
+
 		const query = APIClient._generateQueryFromParams(params);
 
 		if (!(formData instanceof FormData)) {
 			throw new Error('The formData parameter MUST be an instance of the FormData class.');
 		}
 
-		return new Promise(function _jqueryFormDataPromise(resolve, reject) {
-			jQuery.ajax({
+		ret.promise = new Promise(function _jqueryFormDataPromise(resolve, reject) {
+			ret.xhr = jQuery.ajax({
+				xhr() {
+					const xhr = new window.XMLHttpRequest();
+
+					xhr.upload.addEventListener('progress', function(evt) {
+						if (evt.lengthComputable) {
+							const percentComplete = evt.loaded / evt.total;
+							progress(percentComplete * 100);
+						}
+					}, false);
+
+					xhr.upload.addEventListener('error', error, false);
+
+					return xhr;
+				},
 				url: `${ baseURI }api/${ endpoint }${ query }`,
 				headers: {
 					'X-User-Id': Meteor._localStorage.getItem(Accounts.USER_ID_KEY),
@@ -96,6 +112,8 @@ export const APIClient = {
 				},
 			});
 		});
+
+		return ret;
 	},
 
 	v1: {

From 2ecf7f395a264dfa0513791a0d8683682f48a00b Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Mon, 16 Mar 2020 16:04:03 -0300
Subject: [PATCH 023/223] Bump version to 3.0.4

---
 .docker/Dockerfile.rhel   |  2 +-
 .github/history.json      | 41 ++++++++++++++++++++++++++++++++++++++-
 HISTORY.md                | 30 +++++++++++++++++++++++-----
 app/utils/rocketchat.info |  2 +-
 package.json              |  2 +-
 5 files changed, 68 insertions(+), 9 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 3edc448beeaa..d43a140a37d2 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.0.3
+ENV RC_VERSION 3.0.4
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index 44a7272e4ba8..8d6cdcf14c98 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -39959,6 +39959,45 @@
           ]
         }
       ]
+    },
+    "3.0.4": {
+      "node_version": "12.14.0",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "16617",
+          "title": "[IMPROVE] Send files over REST API",
+          "userLogin": "ggazzo",
+          "milestone": "3.1.0",
+          "contributors": [
+            "ggazzo",
+            "web-flow",
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "16838",
+          "title": "[FIX] Integrations page pagination",
+          "userLogin": "sampaiodiego",
+          "milestone": "3.1.0",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "16699",
+          "title": "[FIX] TypeError when trying to load avatar of an invalid room.",
+          "userLogin": "pierre-lehnen-rc",
+          "contributors": [
+            "pierre-lehnen-rc"
+          ]
+        }
+      ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/HISTORY.md b/HISTORY.md
index 40f27d6c39d5..291cd60288a4 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,27 @@
 
+# 3.0.4
+`2020-03-16  ·  1 🚀  ·  2 🐛  ·  3 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `12.14.0`
+- NPM: `6.13.4`
+- MongoDB: `3.4, 3.6, 4.0`
+
+### 🚀 Improvements
+
+- Send files over REST API ([#16617](https://github.com/RocketChat/Rocket.Chat/pull/16617))
+
+### 🐛 Bug fixes
+
+- Integrations page pagination ([#16838](https://github.com/RocketChat/Rocket.Chat/pull/16838))
+- TypeError when trying to load avatar of an invalid room. ([#16699](https://github.com/RocketChat/Rocket.Chat/pull/16699))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@ggazzo](https://github.com/ggazzo)
+- [@pierre-lehnen-rc](https://github.com/pierre-lehnen-rc)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 3.0.3
 `2020-03-02  ·  5 🐛  ·  5 👩‍💻👨‍💻`
 
@@ -24,7 +47,7 @@
 - [@rodrigok](https://github.com/rodrigok)
 
 # 3.0.2
-`2020-02-21  ·  4 🐛  ·  5 👩‍💻👨‍💻`
+`2020-02-21  ·  3 🐛  ·  3 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `12.14.0`
@@ -35,16 +58,13 @@
 
 - ie11 support ([#16682](https://github.com/RocketChat/Rocket.Chat/pull/16682))
 - Omnichannel Inquiry queues when removing chats ([#16603](https://github.com/RocketChat/Rocket.Chat/pull/16603))
-- users.info endpoint not handling the error if the user does not exist ([#16495](https://github.com/RocketChat/Rocket.Chat/pull/16495))
 - Clear unread red line when the ESC key is pressed  ([#16668](https://github.com/RocketChat/Rocket.Chat/pull/16668))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
 
-- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
 - [@gabriellsh](https://github.com/gabriellsh)
 - [@ggazzo](https://github.com/ggazzo)
 - [@renatobecker](https://github.com/renatobecker)
-- [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 3.0.1
 `2020-02-19  ·  7 🐛  ·  4 👩‍💻👨‍💻`
@@ -6673,4 +6693,4 @@
 - [@graywolf336](https://github.com/graywolf336)
 - [@marceloschmidt](https://github.com/marceloschmidt)
 - [@rodrigok](https://github.com/rodrigok)
-- [@sampaiodiego](https://github.com/sampaiodiego)
+- [@sampaiodiego](https://github.com/sampaiodiego)
\ No newline at end of file
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index ad3aeee82e4b..9b6d281d5f25 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.0.3"
+	"version": "3.0.4"
 }
diff --git a/package.json b/package.json
index b63dbf35dc2f..aafcf6c41fec 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.0.3",
+	"version": "3.0.4",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

From bedc7ee332fecf731d7bc82be77e7acfe3b2017a Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Thu, 19 Mar 2020 14:06:13 -0300
Subject: [PATCH 024/223] Fix realtime data rendering on Omnichannel info
 panel. (#16783)

---
 .../client/views/app/tabbar/visitorInfo.js    | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/livechat/client/views/app/tabbar/visitorInfo.js b/app/livechat/client/views/app/tabbar/visitorInfo.js
index 39275ffebab3..08b59ea10c04 100644
--- a/app/livechat/client/views/app/tabbar/visitorInfo.js
+++ b/app/livechat/client/views/app/tabbar/visitorInfo.js
@@ -311,8 +311,18 @@ Template.visitorInfo.onCreated(function() {
 	this.department = new ReactiveVar({});
 	this.room = new ReactiveVar({});
 
+	this.updateVisitor = async (visitorId) => {
+		const { visitor } = await APIClient.v1.get(`livechat/visitors.info?visitorId=${ visitorId }`);
+		this.user.set(visitor);
+	};
+
 	this.updateRoom = (room) => {
+		this.departmentId.set(room && room.departmentId);
+		this.tags.set(room && room.tags);
 		this.room.set(room);
+		const visitorId = room && room.v && room.v._id;
+		this.visitorId.set(visitorId);
+		this.updateVisitor(visitorId);
 	};
 
 	Meteor.call('livechat:getCustomFields', (err, customFields) => {
@@ -330,10 +340,7 @@ Template.visitorInfo.onCreated(function() {
 
 	const loadRoomData = async (rid) => {
 		const { room } = await APIClient.v1.get(`rooms.info?roomId=${ rid }`);
-		this.visitorId.set(room && room.v && room.v._id);
-		this.departmentId.set(room && room.departmentId);
-		this.tags.set(room && room.tags);
-		this.room.set(room);
+		this.updateRoom(room);
 	};
 
 	if (rid) {
@@ -348,11 +355,10 @@ Template.visitorInfo.onCreated(function() {
 		}
 	});
 
-	this.autorun(async () => {
+	this.autorun(() => {
 		const visitorId = this.visitorId.get();
 		if (visitorId) {
-			const { visitor } = await APIClient.v1.get(`livechat/visitors.info?visitorId=${ visitorId }`);
-			this.user.set(visitor);
+			this.updateVisitor(visitorId);
 		}
 	});
 });

From dab72da6fef050bc57ff73e700d20142e11c6172 Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Thu, 19 Mar 2020 14:09:50 -0300
Subject: [PATCH 025/223] [FIX]  Keeps the agent in the room after accepting a
 new Omnichannel request (#16787)

---
 app/livechat/client/views/app/livechatReadOnly.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/livechat/client/views/app/livechatReadOnly.js b/app/livechat/client/views/app/livechatReadOnly.js
index da599cb65cb0..9ea5baf1b9c5 100644
--- a/app/livechat/client/views/app/livechatReadOnly.js
+++ b/app/livechat/client/views/app/livechatReadOnly.js
@@ -12,7 +12,7 @@ import { inquiryDataStream } from '../../lib/stream/inquiry';
 Template.livechatReadOnly.helpers({
 	inquiryOpen() {
 		const inquiry = Template.instance().inquiry.get();
-		return (inquiry && inquiry.status === 'queued') || FlowRouter.go('/home');
+		return inquiry && inquiry.status === 'queued';
 	},
 
 	roomOpen() {
@@ -49,8 +49,11 @@ Template.livechatReadOnly.onCreated(function() {
 	this.routingConfig = new ReactiveVar({});
 	this.preparing = new ReactiveVar(true);
 
-	this.updateInquiry = (inquiry) => {
+	this.updateInquiry = async (inquiry) => {
 		this.inquiry.set(inquiry);
+		if (!await call('canAccessRoom', inquiry.rid, Meteor.userId())) {
+			FlowRouter.go('/home');
+		}
 	};
 
 	Meteor.call('livechat:getRoutingConfig', (err, config) => {

From 5dd8a7ef6c86bffd41d306c3d91cabb22d4430bb Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Thu, 19 Mar 2020 14:15:44 -0300
Subject: [PATCH 026/223] [FIX] Omnichannel Inquiry names not being updated
 when the guest name changes (#16782)

---
 app/livechat/server/lib/Livechat.js         |  8 +++++++-
 app/models/server/models/LivechatInquiry.js | 11 +++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/livechat/server/lib/Livechat.js b/app/livechat/server/lib/Livechat.js
index 9853dcb5a28f..36ee6fc697c0 100644
--- a/app/livechat/server/lib/Livechat.js
+++ b/app/livechat/server/lib/Livechat.js
@@ -480,7 +480,13 @@ export const Livechat = {
 		});
 
 		if (!_.isEmpty(guestData.name)) {
-			return Rooms.setFnameById(roomData._id, guestData.name) && Subscriptions.updateDisplayNameByRoomId(roomData._id, guestData.name);
+			const { _id: rid } = roomData;
+			const { name } = guestData;
+			return Rooms.setFnameById(rid, name)
+				&& LivechatInquiry.setNameByRoomId(rid, name)
+				// This one needs to be the last since the agent may not have the subscription
+				// when the conversation is in the queue, then the result will be 0(zero)
+				&& Subscriptions.updateDisplayNameByRoomId(rid, name);
 		}
 	},
 
diff --git a/app/models/server/models/LivechatInquiry.js b/app/models/server/models/LivechatInquiry.js
index ccf54c445231..1895a2547b28 100644
--- a/app/models/server/models/LivechatInquiry.js
+++ b/app/models/server/models/LivechatInquiry.js
@@ -102,6 +102,17 @@ export class LivechatInquiry extends Base {
 		return this.update(query, update);
 	}
 
+	setNameByRoomId(rid, name) {
+		const query = { rid };
+
+		const update = {
+			$set: {
+				name,
+			},
+		};
+		return this.update(query, update);
+	}
+
 	findOneByToken(token) {
 		const query = {
 			'v.token': token,

From 93d10147599ea8ca4bc80c73f1564d990b53031e Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Thu, 19 Mar 2020 14:27:52 -0300
Subject: [PATCH 027/223] [NEW] Add new Omnichannel department forwarding
 callback (#16779)

---
 app/livechat/server/lib/Helper.js             | 17 ++++++++++++++---
 app/livechat/server/lib/RoutingManager.js     |  8 ++++++--
 packages/rocketchat-i18n/i18n/en.i18n.json    |  1 +
 packages/rocketchat-i18n/i18n/pt-BR.i18n.json |  1 +
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/app/livechat/server/lib/Helper.js b/app/livechat/server/lib/Helper.js
index b8cf56a241e7..5853f1d24456 100644
--- a/app/livechat/server/lib/Helper.js
+++ b/app/livechat/server/lib/Helper.js
@@ -213,12 +213,19 @@ export const forwardRoomToAgent = async (room, transferData) => {
 	return true;
 };
 
+export const updateChatDepartment = ({ rid, newDepartmentId, oldDepartmentId }) => {
+	LivechatRooms.changeDepartmentIdByRoomId(rid, newDepartmentId);
+	LivechatInquiry.changeDepartmentIdByRoomId(rid, newDepartmentId);
+
+	return callbacks.run('livechat.afterForwardChatToDepartment', { rid, newDepartmentId, oldDepartmentId });
+};
+
 export const forwardRoomToDepartment = async (room, guest, transferData) => {
 	if (!room || !room.open) {
 		return false;
 	}
 
-	const { _id: rid, servedBy: oldServedBy } = room;
+	const { _id: rid, servedBy: oldServedBy, departmentId: oldDepartmentId } = room;
 
 	const inquiry = LivechatInquiry.findOneByRoomId(rid);
 	if (!inquiry) {
@@ -226,6 +233,11 @@ export const forwardRoomToDepartment = async (room, guest, transferData) => {
 	}
 
 	const { departmentId } = transferData;
+
+	if (oldDepartmentId === departmentId) {
+		throw new Meteor.Error('error-forwarding-chat-same-department', 'The selected department and the current room department are the same', { function: 'forwardRoomToDepartment' });
+	}
+
 	if (!RoutingManager.getConfig().autoAssignAgent) {
 		Livechat.saveTransferHistory(room, transferData);
 		return RoutingManager.unassignAgent(inquiry, departmentId);
@@ -252,8 +264,7 @@ export const forwardRoomToDepartment = async (room, guest, transferData) => {
 		Messages.createUserJoinWithRoomIdAndUser(rid, servedBy);
 	}
 
-	LivechatRooms.changeDepartmentIdByRoomId(rid, departmentId);
-	LivechatInquiry.changeDepartmentIdByRoomId(rid, departmentId);
+	updateChatDepartment({ rid, departmentId, oldDepartmentId });
 
 	const { token } = guest;
 	Livechat.setDepartmentForGuest({ token, department: departmentId });
diff --git a/app/livechat/server/lib/RoutingManager.js b/app/livechat/server/lib/RoutingManager.js
index 9352a1de9ba6..3b65ba14ceaa 100644
--- a/app/livechat/server/lib/RoutingManager.js
+++ b/app/livechat/server/lib/RoutingManager.js
@@ -7,6 +7,7 @@ import { createLivechatSubscription,
 	forwardRoomToAgent,
 	forwardRoomToDepartment,
 	removeAgentFromSubscription,
+	updateChatDepartment,
 } from './Helper';
 import { callbacks } from '../../../callbacks/server';
 import { LivechatRooms, Rooms, Messages, Users, LivechatInquiry } from '../../../models/server';
@@ -87,8 +88,11 @@ export const RoutingManager = {
 		}
 
 		if (departmentId && departmentId !== department) {
-			LivechatRooms.changeDepartmentIdByRoomId(rid, departmentId);
-			LivechatInquiry.changeDepartmentIdByRoomId(rid, departmentId);
+			updateChatDepartment({
+				rid,
+				newDepartmentId: departmentId,
+				oldDepartmentId: department,
+			});
 			// Fake the department to delegate the inquiry;
 			inquiry.department = departmentId;
 		}
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index aa7a476aed71..603253539bd4 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1305,6 +1305,7 @@
   "error-email-send-failed": "Error trying to send email: __message__",
   "error-field-unavailable": "<strong>__field__</strong> is already in use :(",
   "error-file-too-large": "File is too large",
+  "error-forwarding-chat-same-department": "The selected department and the current room department are the same",
   "error-importer-not-defined": "The importer was not defined correctly, it is missing the Import class.",
   "error-import-file-extract-error": "Failed to extract import file.",
   "error-import-file-is-empty": "Imported file seems to be empty.",
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index c95d3a7d09ae..dd10552a41b0 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -1212,6 +1212,7 @@
   "error-email-send-failed": "Erro ao tentar enviar e-mail: __message__",
   "error-field-unavailable": "<strong>__field__</strong> já está sendo usado :(",
   "error-file-too-large": "Arquivo é muito grande",
+  "error-forwarding-chat-same-department": "O departamento selecionado e o departamento atual da sala são iguais",
   "error-importer-not-defined": "O importador não foi definido corretamente;  está faltando a classe Import.",
   "error-import-file-extract-error": "Falha ao extrair o arquivo importado.",
   "error-import-file-is-empty": "Arquivo importado parece estar vazio.",

From 3813aefc8ac26d2b9f0c8309f96bc9b5315787ec Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 19 Mar 2020 15:44:40 -0300
Subject: [PATCH 028/223] [NEW] Two Factor authentication via email (#15949)

---
 .eslintrc                                     |  23 +-
 app/2fa/client/TOTPPassword.js                |  42 +-
 app/2fa/client/accountSecurity.html           |  74 ++--
 app/2fa/client/accountSecurity.js             |  28 +-
 app/2fa/client/callWithTwoFactorRequired.js   |  91 +++++
 app/2fa/client/index.js                       |   1 +
 app/2fa/server/MethodInvocationOverride.js    |  17 +
 app/2fa/server/code/EmailCheck.ts             | 138 +++++++
 app/2fa/server/code/ICodeCheck.ts             |  17 +
 app/2fa/server/code/PasswordCheckFallback.ts  |  38 ++
 app/2fa/server/code/TOTPCheck.ts              |  36 ++
 app/2fa/server/code/index.ts                  | 156 ++++++++
 app/2fa/server/index.js                       |   1 +
 app/2fa/server/loginHandler.js                |  25 +-
 app/2fa/server/startup/settings.js            |  29 +-
 app/2fa/server/twoFactorRequired.ts           |  36 ++
 app/api/server/api.js                         |  36 +-
 app/api/server/v1/users.js                    |  49 ++-
 app/blockstack/server/userHandler.js          |   4 +-
 app/cas/server/cas_server.js                  |   5 +-
 app/crowd/server/crowd.js                     |   2 +-
 app/ldap/server/sync.js                       |   6 +-
 app/lib/client/lib/index.js                   |   4 +-
 app/lib/server/methods/insertOrUpdateUser.js  |   5 +-
 app/lib/server/startup/settings.js            |   3 +
 .../server/saml_server.js                     |   5 +-
 app/models/server/models/Users.js             |  72 ++++
 app/settings/server/functions/settings.d.ts   |   3 +
 app/ui-utils/client/lib/modal.html            |   3 +
 app/ui-utils/client/lib/modal.js              |   4 +
 app/utils/client/lib/RestApiClient.js         |  38 +-
 app/utils/client/lib/handleError.js           |   7 +
 .../server/functions/getDefaultUserFields.js  |   1 +
 .../setupWizard/steps/SettingsBasedStep.js    |  18 +-
 definition/IMethodThisType.ts                 |  16 +
 definition/IMethodType.ts                     |   5 +
 definition/IUser.ts                           | 100 +++++
 .../client/personalAccessTokens.html          |  19 +-
 .../client/personalAccessTokens.js            |  15 +-
 .../server/api/methods/generateToken.js       |   6 +-
 .../server/api/methods/regenerateToken.js     |   7 +-
 .../server/api/methods/removeToken.js         |   5 +-
 package-lock.json                             | 361 +++++++-----------
 package.json                                  |   6 +-
 packages/rocketchat-i18n/i18n/en.i18n.json    |  32 +-
 packages/rocketchat-i18n/i18n/pt-BR.i18n.json |  32 +-
 packages/rocketchat-i18n/i18n/pt.i18n.json    |   2 +
 server/configuration/accounts_meld.js         |   3 +-
 server/lib/accounts.js                        |  12 +-
 server/main.d.ts                              |  40 ++
 server/methods/saveUserProfile.js             |   5 +-
 server/startup/initialData.js                 |   4 +-
 server/startup/migrations/index.js            |   1 +
 server/startup/migrations/v172.js             |   1 -
 server/startup/migrations/v177.js             |  16 +
 55 files changed, 1341 insertions(+), 364 deletions(-)
 create mode 100644 app/2fa/client/callWithTwoFactorRequired.js
 create mode 100644 app/2fa/server/MethodInvocationOverride.js
 create mode 100644 app/2fa/server/code/EmailCheck.ts
 create mode 100644 app/2fa/server/code/ICodeCheck.ts
 create mode 100644 app/2fa/server/code/PasswordCheckFallback.ts
 create mode 100644 app/2fa/server/code/TOTPCheck.ts
 create mode 100644 app/2fa/server/code/index.ts
 create mode 100644 app/2fa/server/twoFactorRequired.ts
 create mode 100644 app/settings/server/functions/settings.d.ts
 create mode 100644 definition/IMethodThisType.ts
 create mode 100644 definition/IMethodType.ts
 create mode 100644 definition/IUser.ts
 create mode 100644 server/main.d.ts
 create mode 100644 server/startup/migrations/v177.js

diff --git a/.eslintrc b/.eslintrc
index 46805bc5b654..efef5b7d68d8 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -24,12 +24,21 @@
     "react/jsx-fragments": [
       "error",
       "syntax"
-    ],
+    ]
   },
   "settings": {
-    "react": {
-      "version": "detect",
+    "import/resolver": {
+      "node": {
+        "extensions": [
+          ".js",
+          ".ts",
+          ".tsx"
+        ]
+      }
     },
+    "react": {
+      "version": "detect"
+    }
   },
   "overrides": [
     {
@@ -38,9 +47,9 @@
         "**/*.tsx"
       ],
       "extends": [
-        "@rocket.chat/eslint-config",
         "plugin:@typescript-eslint/recommended",
-        "plugin:@typescript-eslint/eslint-recommended"
+        "plugin:@typescript-eslint/eslint-recommended",
+        "@rocket.chat/eslint-config"
       ],
       "globals": {
         "Atomics": "readonly",
@@ -73,6 +82,10 @@
           "syntax"
         ],
         "@typescript-eslint/ban-ts-ignore": "off",
+        "@typescript-eslint/indent": [
+          "error",
+          "tab"
+        ],
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/interface-name-prefix": [
           "error",
diff --git a/app/2fa/client/TOTPPassword.js b/app/2fa/client/TOTPPassword.js
index 7a26863faadf..cf10bc405816 100644
--- a/app/2fa/client/TOTPPassword.js
+++ b/app/2fa/client/TOTPPassword.js
@@ -2,8 +2,8 @@ import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
 import toastr from 'toastr';
 
-import { modal } from '../../ui-utils';
 import { t } from '../../utils';
+import { process2faReturn } from './callWithTwoFactorRequired';
 
 function reportError(error, callback) {
 	if (callback) {
@@ -46,32 +46,20 @@ const { loginWithPassword } = Meteor;
 
 Meteor.loginWithPassword = function(email, password, cb) {
 	loginWithPassword(email, password, (error) => {
-		if (!error || error.error !== 'totp-required') {
-			return cb(error);
-		}
-
-		modal.open({
-			title: t('Two-factor_authentication'),
-			text: t('Open_your_authentication_app_and_enter_the_code'),
-			type: 'input',
-			inputType: 'text',
-			showCancelButton: true,
-			closeOnConfirm: true,
-			confirmButtonText: t('Verify'),
-			cancelButtonText: t('Cancel'),
-		}, (code) => {
-			if (code === false) {
-				return cb();
-			}
-
-			Meteor.loginWithPasswordAndTOTP(email, password, code, (error) => {
-				if (error && error.error === 'totp-invalid') {
-					toastr.error(t('Invalid_two_factor_code'));
-					cb();
-				} else {
-					cb(error);
-				}
-			});
+		process2faReturn({
+			error,
+			originalCallback: cb,
+			emailOrUsername: email,
+			onCode: (code) => {
+				Meteor.loginWithPasswordAndTOTP(email, password, code, (error) => {
+					if (error && error.error === 'totp-invalid') {
+						toastr.error(t('Invalid_two_factor_code'));
+						cb();
+					} else {
+						cb(error);
+					}
+				});
+			},
 		});
 	});
 };
diff --git a/app/2fa/client/accountSecurity.html b/app/2fa/client/accountSecurity.html
index c6d20854f8e9..87e42c658954 100644
--- a/app/2fa/client/accountSecurity.html
+++ b/app/2fa/client/accountSecurity.html
@@ -4,42 +4,56 @@
 		<div class="preferences-page__content">
 			<form id="security" autocomplete="off" class="container">
 				{{# if isAllowed}}
-				<div class="section">
-					<h1>{{_ "Two-factor_authentication"}}</h1>
-					<div class="section-content border-component-color">
-						{{#if isEnabled}}
-						<button class="rc-button rc-button--cancel disable-2fa">{{_ "Disable_two-factor_authentication"}}</button>
-						{{else}}
-						{{#unless isRegistering}}
-						<p>{{_ "Two-factor_authentication_is_currently_disabled"}}</p>
+					<div class="section">
+						<h1>{{_ "Two-factor_authentication"}}</h1>
+						<div class="section-content border-component-color">
+							{{#if isEnabled}}
+								<button class="rc-button rc-button--cancel disable-2fa">{{_ "Disable_two-factor_authentication"}}</button>
+							{{else}}
+								{{#unless isRegistering}}
+									<p>{{_ "Two-factor_authentication_is_currently_disabled"}}</p>
 
-						<button class="rc-button rc-button--primary enable-2fa">{{_ "Enable_two-factor_authentication"}}</button>
-						{{else}}
-						<p>{{_ "Scan_QR_code"}}</p>
-						<p>{{_ "Scan_QR_code_alternative_s" code=imageSecret}}</p>
+									<button class="rc-button rc-button--primary enable-2fa">{{_ "Enable_two-factor_authentication"}}</button>
+								{{else}}
+									<p>{{_ "Scan_QR_code"}}</p>
+									<p>{{_ "Scan_QR_code_alternative_s" code=imageSecret}}</p>
 
-						<img src="{{imageData}}">
+									<img src="{{imageData}}">
 
-						<form>
-							<div class="input-line double-col">
-								<input type="text" class="rc-input__element" id="testCode" placeholder="{{_ "Enter_authentication_code"}}">
-								<button class="rc-button rc-button--primary setting-action verify-code">{{_ "Verify"}}</button>
-							</div>
-						</form>
-						{{/unless}}
-						{{/if}}
+									<form>
+										<div class="input-line double-col">
+											<input type="text" class="rc-input__element" id="testCode" placeholder="{{_ "Enter_authentication_code"}}">
+											<button class="rc-button rc-button--primary setting-action verify-code">{{_ "Verify"}}</button>
+										</div>
+									</form>
+								{{/unless}}
+							{{/if}}
+						</div>
 					</div>
-				</div>
 
-				{{#if isEnabled}}
-				<div class="section">
-					<h1>{{_ "Backup_codes"}}</h1>
-					<div class="section-content border-component-color">
-						<p>{{codesRemaining}}</p>
-						<button class="rc-button rc-button--secondary regenerate-codes">{{_ "Regenerate_codes"}}</button>
+					{{#if isEnabled}}
+						<div class="section">
+							<h1>{{_ "Backup_codes"}}</h1>
+							<div class="section-content border-component-color">
+								<p>{{codesRemaining}}</p>
+								<button class="rc-button rc-button--secondary regenerate-codes">{{_ "Regenerate_codes"}}</button>
+							</div>
+						</div>
+					{{/if}}
+
+					<div class="section">
+						<h1>{{_ "Two-factor_authentication_email"}}</h1>
+						<div class="section-content border-component-color">
+							{{#if isEmailEnabled}}
+								<button class="rc-button rc-button--cancel disable-2fa-email">{{_ "Disable_two-factor_authentication_email"}}</button>
+							{{else}}
+								<p>{{_ "Two-factor_authentication_email_is_currently_disabled"}}</p>
+
+								<button class="rc-button rc-button--primary enable-2fa-email">{{_ "Enable_two-factor_authentication_email"}}</button>
+							{{/if}}
+						</div>
 					</div>
-				</div>
-				{{/if}}
+
 				{{/if}}
 			</form>
 		</div>
diff --git a/app/2fa/client/accountSecurity.js b/app/2fa/client/accountSecurity.js
index 005f29c13df4..38d975e82328 100644
--- a/app/2fa/client/accountSecurity.js
+++ b/app/2fa/client/accountSecurity.js
@@ -5,7 +5,7 @@ import toastr from 'toastr';
 
 import { modal } from '../../ui-utils';
 import { settings } from '../../settings';
-import { t } from '../../utils';
+import { t, handleError, APIClient } from '../../utils/client';
 
 Template.accountSecurity.helpers({
 	showImage() {
@@ -32,6 +32,10 @@ Template.accountSecurity.helpers({
 			return t('You_have_n_codes_remaining', { number: Template.instance().codesRemaining.get() });
 		}
 	},
+	isEmailEnabled() {
+		const user = Meteor.user();
+		return user && user.services && user.services.email2fa && user.services.email2fa.enabled;
+	},
 });
 
 Template.accountSecurity.events({
@@ -82,6 +86,28 @@ Template.accountSecurity.events({
 		});
 	},
 
+	async 'click .enable-2fa-email'(event) {
+		event.preventDefault();
+
+		try {
+			await APIClient.v1.post('users.2fa.enableEmail');
+			toastr.success(t('Two-factor_authentication_enabled'));
+		} catch (error) {
+			handleError(error);
+		}
+	},
+
+	async 'click .disable-2fa-email'(event) {
+		event.preventDefault();
+
+		try {
+			await APIClient.v1.post('users.2fa.disableEmail');
+			toastr.success(t('Two-factor_authentication_disabled'));
+		} catch (error) {
+			handleError(error);
+		}
+	},
+
 	'click .verify-code'(event, instance) {
 		event.preventDefault();
 
diff --git a/app/2fa/client/callWithTwoFactorRequired.js b/app/2fa/client/callWithTwoFactorRequired.js
new file mode 100644
index 000000000000..a7bc16514f1b
--- /dev/null
+++ b/app/2fa/client/callWithTwoFactorRequired.js
@@ -0,0 +1,91 @@
+import { Meteor } from 'meteor/meteor';
+import { SHA256 } from 'meteor/sha';
+import toastr from 'toastr';
+
+import { modal } from '../../ui-utils/client';
+import { t, APIClient } from '../../utils/client';
+
+const methods = {
+	totp: {
+		text: 'Open_your_authentication_app_and_enter_the_code',
+	},
+	email: {
+		text: 'Verify_your_email_for_the_code_we_sent',
+		html: true,
+	},
+	password: {
+		title: 'Please_enter_your_password',
+		text: 'For_your_security_you_must_enter_your_current_password_to_continue',
+		inputType: 'password',
+	},
+};
+
+export function process2faReturn({ error, result, originalCallback, onCode, emailOrUsername }) {
+	if (!error || (error.error !== 'totp-required' && error.errorType !== 'totp-required')) {
+		return originalCallback(error, result);
+	}
+
+	const method = error.details && error.details.method;
+
+	if (!emailOrUsername && Meteor.user()) {
+		emailOrUsername = Meteor.user().username;
+	}
+
+	modal.open({
+		title: t(methods[method].title || 'Two Factor Authentication'),
+		text: t(methods[method].text),
+		html: methods[method].html,
+		type: 'input',
+		inputActionText: method === 'email' && t('Send_me_the_code_again'),
+		async inputAction(e) {
+			const { value } = e.currentTarget;
+			e.currentTarget.value = t('Sending');
+
+			await APIClient.v1.post('users.2fa.sendEmailCode', { emailOrUsername });
+
+			e.currentTarget.value = value;
+		},
+		inputType: methods[method].inputType || 'text',
+		showCancelButton: true,
+		closeOnConfirm: true,
+		confirmButtonText: t('Verify'),
+		cancelButtonText: t('Cancel'),
+	}, (code) => {
+		if (code === false) {
+			return originalCallback(new Meteor.Error('totp-canceled'));
+		}
+
+		if (method === 'password') {
+			code = SHA256(code);
+		}
+		onCode(code, method);
+	});
+}
+
+const { call } = Meteor;
+Meteor.call = function(ddpMethod, ...args) {
+	let callback = args.pop();
+	if (typeof callback !== 'function') {
+		args.push(callback);
+		callback = () => {};
+	}
+
+	return call(ddpMethod, ...args, function(error, result) {
+		process2faReturn({
+			error,
+			result,
+			originalCallback: callback,
+			onCode: (code, method) => {
+				call(ddpMethod, ...args, { twoFactorCode: code, twoFactorMethod: method }, (error, result) => {
+					if (error && error.error === 'totp-invalid') {
+						error.toastrShowed = true;
+						toastr.error(t('Invalid_two_factor_code'));
+						return callback(error);
+					}
+
+					callback(error, result);
+				});
+			},
+		});
+	});
+};
diff --git a/app/2fa/client/index.js b/app/2fa/client/index.js
index c5b1485a073b..cc18071f0238 100644
--- a/app/2fa/client/index.js
+++ b/app/2fa/client/index.js
@@ -1,3 +1,4 @@
 import './accountSecurity.html';
 import './accountSecurity';
+import './callWithTwoFactorRequired';
 import './TOTPPassword';
diff --git a/app/2fa/server/MethodInvocationOverride.js b/app/2fa/server/MethodInvocationOverride.js
new file mode 100644
index 000000000000..19b37e041fd1
--- /dev/null
+++ b/app/2fa/server/MethodInvocationOverride.js
@@ -0,0 +1,17 @@
+import { DDPCommon } from 'meteor/ddp-common';
+import { DDP } from 'meteor/ddp';
+
+class MethodInvocation extends DDPCommon.MethodInvocation {
+	constructor(options) {
+		const result = super(options);
+		const currentInvocation = DDP._CurrentInvocation.get();
+
+		if (currentInvocation) {
+			this.twoFactorChecked = currentInvocation.twoFactorChecked;
+		}
+
+		return result;
+	}
+}
+
+DDPCommon.MethodInvocation = MethodInvocation;
diff --git a/app/2fa/server/code/EmailCheck.ts b/app/2fa/server/code/EmailCheck.ts
new file mode 100644
index 000000000000..1199c22397b1
--- /dev/null
+++ b/app/2fa/server/code/EmailCheck.ts
@@ -0,0 +1,138 @@
+import { Random } from 'meteor/random';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
+import { Accounts } from 'meteor/accounts-base';
+import bcrypt from 'bcrypt';
+
+import { settings } from '../../../settings/server';
+import * as Mailer from '../../../mailer';
+import { Users } from '../../../models/server';
+import { ICodeCheck, IProcessInvalidCodeResult } from './ICodeCheck';
+import { IUser } from '../../../../definition/IUser';
+
+export class EmailCheck implements ICodeCheck {
+	public readonly name = 'email';
+
+	private getUserVerifiedEmails(user: IUser): string[] {
+		if (!Array.isArray(user.emails)) {
+			return [];
+		}
+		return user.emails.filter(({ verified }) => verified).map((e) => e.address);
+	}
+
+	public isEnabled(user: IUser): boolean {
+		if (!settings.get('Accounts_TwoFactorAuthentication_By_Email_Enabled')) {
+			return false;
+		}
+
+		if (!user.services?.email2fa?.enabled) {
+			return false;
+		}
+
+		return this.getUserVerifiedEmails(user).length > 0;
+	}
+
+	private send2FAEmail(address: string, random: string, user: IUser): void {
+		const language = user.language || settings.get('Language') || 'en';
+
+		const t = (s: string): string => TAPi18n.__(s, { lng: language });
+
+		Mailer.send({
+			to: address,
+			from: settings.get('From_Email'),
+			subject: 'Authentication code',
+			replyTo: undefined,
+			data: {
+				code: random.replace(/^(\d{3})/, '$1-'),
+			},
+			headers: undefined,
+			text: `
+${ t('Here_is_your_authentication_code') }
+
+__code__
+
+${ t('Do_not_provide_this_code_to_anyone') }
+${ t('If_you_didnt_try_to_login_in_your_account_please_ignore_this_email') }
+`,
+			html: `
+				<p>${ t('Here_is_your_authentication_code') }</p>
+				<p style="font-size: 30px;">
+					<b>__code__</b>
+				</p>
+				<p>${ t('Do_not_provide_this_code_to_anyone') }</p>
+				<p>${ t('If_you_didnt_try_to_login_in_your_account_please_ignore_this_email') }</p>
+			`,
+		});
+	}
+
+	public verify(user: IUser, codeFromEmail: string): boolean {
+		if (!this.isEnabled(user)) {
+			return false;
+		}
+
+		if (!user.services || !Array.isArray(user.services?.emailCode)) {
+			return false;
+		}
+
+		// Remove non digits
+		codeFromEmail = codeFromEmail.replace(/([^\d])/g, '');
+
+		Users.removeExpiredEmailCodesOfUserId(user._id);
+
+		const valid = user.services.emailCode.find(({ code, expire }) => {
+			if (expire < new Date()) {
+				return false;
+			}
+
+			if (bcrypt.compareSync(codeFromEmail, code)) {
+				Users.removeEmailCodeByUserIdAndCode(user._id, code);
+				return true;
+			}
+
+			return false;
+		});
+
+		return !!valid;
+	}
+
+	public sendEmailCode(user: IUser): string[] {
+		const emails = this.getUserVerifiedEmails(user);
+		const random = Random._randomString(6, '0123456789');
+		const encryptedRandom = bcrypt.hashSync(random, Accounts._bcryptRounds());
+		const expire = new Date();
+		const expirationInSeconds = parseInt(settings.get('Accounts_TwoFactorAuthentication_By_Email_Code_Expiration'));
+
+		expire.setSeconds(expire.getSeconds() + expirationInSeconds);
+
+		Users.addEmailCodeByUserId(user._id, encryptedRandom, expire);
+
+		for (const address of emails) {
+			this.send2FAEmail(address, random, user);
+		}
+
+		return emails;
+	}
+
+	public processInvalidCode(user: IUser): IProcessInvalidCodeResult {
+		Users.removeExpiredEmailCodesOfUserId(user._id);
+
+		// Generate new code if the there isn't any code with more than 5 minutes to expire
+		const expireWithDelta = new Date();
+		expireWithDelta.setMinutes(expireWithDelta.getMinutes() - 5);
+
+		const hasValidCode = user.services?.emailCode?.filter(({ expire }) => expire > expireWithDelta);
+
+		if (hasValidCode?.length) {
+			return {
+				codeGenerated: false,
+				codeCount: hasValidCode.length,
+				codeExpires: hasValidCode.map((i) => i.expire),
+			};
+		}
+
+		this.sendEmailCode(user);
+
+		return {
+			codeGenerated: true,
+		};
+	}
+}
diff --git a/app/2fa/server/code/ICodeCheck.ts b/app/2fa/server/code/ICodeCheck.ts
new file mode 100644
index 000000000000..3c8f6a896fc3
--- /dev/null
+++ b/app/2fa/server/code/ICodeCheck.ts
@@ -0,0 +1,17 @@
+import { IUser } from '../../../../definition/IUser';
+
+export interface IProcessInvalidCodeResult {
+	codeGenerated: boolean;
+	codeCount?: number;
+	codeExpires?: Date[];
+}
+
+export interface ICodeCheck {
+	readonly name: string;
+
+	isEnabled(user: IUser): boolean;
+
+	verify(user: IUser, code: string): boolean;
+
+	processInvalidCode(user: IUser): IProcessInvalidCodeResult;
+}
diff --git a/app/2fa/server/code/PasswordCheckFallback.ts b/app/2fa/server/code/PasswordCheckFallback.ts
new file mode 100644
index 000000000000..aef70ba64427
--- /dev/null
+++ b/app/2fa/server/code/PasswordCheckFallback.ts
@@ -0,0 +1,38 @@
+import { Accounts } from 'meteor/accounts-base';
+
+import { ICodeCheck, IProcessInvalidCodeResult } from './ICodeCheck';
+import { IUser } from '../../../../definition/IUser';
+
+export class PasswordCheckFallback implements ICodeCheck {
+	public readonly name = 'password';
+
+	public isEnabled(user: IUser): boolean {
+		// TODO: Uncomment for version 4.0 forcing the
+		// password fallback for who has password set.
+		// return user.services?.password?.bcrypt != null;
+		return !user;
+	}
+
+	public verify(user: IUser, code: string): boolean {
+		if (!this.isEnabled(user)) {
+			return false;
+		}
+
+		const passCheck = Accounts._checkPassword(user, {
+			digest: code.toLowerCase(),
+			algorithm: 'sha-256',
+		});
+
+		if (passCheck.error) {
+			return false;
+		}
+
+		return true;
+	}
+
+	public processInvalidCode(): IProcessInvalidCodeResult {
+		return {
+			codeGenerated: false,
+		};
+	}
+}
diff --git a/app/2fa/server/code/TOTPCheck.ts b/app/2fa/server/code/TOTPCheck.ts
new file mode 100644
index 000000000000..35ea93ccdec4
--- /dev/null
+++ b/app/2fa/server/code/TOTPCheck.ts
@@ -0,0 +1,36 @@
+import { TOTP } from '../lib/totp';
+import { IUser } from '../../../../definition/IUser';
+import { settings } from '../../../settings/server';
+import { ICodeCheck, IProcessInvalidCodeResult } from './ICodeCheck';
+
+export class TOTPCheck implements ICodeCheck {
+	public readonly name = 'totp';
+
+	public isEnabled(user: IUser): boolean {
+		if (!settings.get('Accounts_TwoFactorAuthentication_Enabled')) {
+			return false;
+		}
+
+		return user.services?.totp?.enabled === true;
+	}
+
+	public verify(user: IUser, code: string): boolean {
+		if (!this.isEnabled(user)) {
+			return false;
+		}
+
+		return TOTP.verify({
+			secret: user.services?.totp?.secret,
+			token: code,
+			userId: user._id,
+			backupTokens: user.services?.totp?.hashedBackup,
+		});
+	}
+
+	public processInvalidCode(): IProcessInvalidCodeResult {
+		// Nothing to do
+		return {
+			codeGenerated: false,
+		};
+	}
+}
diff --git a/app/2fa/server/code/index.ts b/app/2fa/server/code/index.ts
new file mode 100644
index 000000000000..233e86dded59
--- /dev/null
+++ b/app/2fa/server/code/index.ts
@@ -0,0 +1,156 @@
+import crypto from 'crypto';
+
+import { Meteor } from 'meteor/meteor';
+import { Accounts } from 'meteor/accounts-base';
+
+import { settings } from '../../../settings/server';
+import { TOTPCheck } from './TOTPCheck';
+import { EmailCheck } from './EmailCheck';
+import { PasswordCheckFallback } from './PasswordCheckFallback';
+import { IUser } from '../../../../definition/IUser';
+import { ICodeCheck } from './ICodeCheck';
+import { Users } from '../../../models/server';
+import { IMethodConnection } from '../../../../definition/IMethodThisType';
+
+export interface ITwoFactorOptions {
+	disablePasswordFallback?: boolean;
+	disableRememberMe?: boolean;
+}
+
+export const totpCheck = new TOTPCheck();
+export const emailCheck = new EmailCheck();
+export const passwordCheckFallback = new PasswordCheckFallback();
+
+export const checkMethods = new Map<string, ICodeCheck>();
+
+checkMethods.set(totpCheck.name, totpCheck);
+checkMethods.set(emailCheck.name, emailCheck);
+
+export function getMethodByNameOrFirstActiveForUser(user: IUser, name?: string): ICodeCheck | undefined {
+	if (name && checkMethods.has(name)) {
+		return checkMethods.get(name);
+	}
+
+	return Array.from(checkMethods.values()).find((method) => method.isEnabled(user));
+}
+
+export function getAvailableMethodNames(user: IUser): string[] | [] {
+	return Array.from(checkMethods).filter(([, method]) => method.isEnabled(user)).map(([name]) => name) || [];
+}
+
+export function getUserForCheck(userId: string): IUser {
+	return Users.findOneById(userId, {
+		fields: {
+			emails: 1,
+			language: 1,
+			'services.totp': 1,
+			'services.email2fa': 1,
+			'services.emailCode': 1,
+			'services.password': 1,
+			'services.resume.loginTokens': 1,
+		},
+	});
+}
+
+export function getFingerprintFromConnection(connection: IMethodConnection): string {
+	const data = JSON.stringify({
+		userAgent: connection.httpHeaders['user-agent'],
+		clientAddress: connection.clientAddress,
+	});
+
+	return crypto.createHash('md5').update(data).digest('hex');
+}
+
+export function isAuthorizedForToken(connection: IMethodConnection, user: IUser, options: ITwoFactorOptions): boolean {
+	const currentToken = Accounts._getLoginToken(connection.id);
+	const tokenObject = user.services?.resume?.loginTokens?.find((i) => i.hashedToken === currentToken);
+
+	if (!tokenObject) {
+		return false;
+	}
+
+	if (tokenObject.bypassTwoFactor === true) {
+		return true;
+	}
+
+	if (options.disableRememberMe === true) {
+		return false;
+	}
+
+	if (!tokenObject.twoFactorAuthorizedUntil || !tokenObject.twoFactorAuthorizedHash) {
+		return false;
+	}
+
+	if (tokenObject.twoFactorAuthorizedUntil < new Date()) {
+		return false;
+	}
+
+	if (tokenObject.twoFactorAuthorizedHash !== getFingerprintFromConnection(connection)) {
+		return false;
+	}
+
+	return true;
+}
+
+export function rememberAuthorization(connection: IMethodConnection, user: IUser): void {
+	const currentToken = Accounts._getLoginToken(connection.id);
+
+	const rememberFor = parseInt(settings.get('Accounts_TwoFactorAuthentication_RememberFor'));
+
+	if (rememberFor <= 0) {
+		return;
+	}
+
+	const expires = new Date();
+	expires.setSeconds(expires.getSeconds() + rememberFor);
+
+	Users.setTwoFactorAuthorizationHashAndUntilForUserIdAndToken(user._id, currentToken, getFingerprintFromConnection(connection), expires);
+}
+
+interface ICheckCodeForUser {
+	user: IUser | string;
+	code?: string;
+	method?: string;
+	options?: ITwoFactorOptions;
+	connection?: IMethodConnection;
+}
+
+function _checkCodeForUser({ user, code, method, options = {}, connection }: ICheckCodeForUser): boolean {
+	if (typeof user === 'string') {
+		user = getUserForCheck(user);
+	}
+
+	if (connection && isAuthorizedForToken(connection, user, options)) {
+		return true;
+	}
+
+	let selectedMethod = getMethodByNameOrFirstActiveForUser(user, method);
+
+	if (!selectedMethod) {
+		if (options.disablePasswordFallback || !passwordCheckFallback.isEnabled(user)) {
+			return true;
+		}
+		selectedMethod = passwordCheckFallback;
+	}
+
+	if (!code) {
+		const data = selectedMethod.processInvalidCode(user);
+		const availableMethods = getAvailableMethodNames(user);
+
+		throw new Meteor.Error('totp-required', 'TOTP Required', { method: selectedMethod.name, ...data, availableMethods });
+	}
+
+	const valid = selectedMethod.verify(user, code);
+
+	if (!valid) {
+		throw new Meteor.Error('totp-invalid', 'TOTP Invalid', { method: selectedMethod.name });
+	}
+
+	if (options.disableRememberMe !== true && connection) {
+		rememberAuthorization(connection, user);
+	}
+
+	return true;
+}
+
+export const checkCodeForUser = process.env.TEST_MODE ? (): boolean => true : _checkCodeForUser;
diff --git a/app/2fa/server/index.js b/app/2fa/server/index.js
index e5d5ab3fc445..8e8555dd2ebe 100644
--- a/app/2fa/server/index.js
+++ b/app/2fa/server/index.js
@@ -1,3 +1,4 @@
+import './MethodInvocationOverride';
 import './startup/settings';
 import './methods/checkCodesRemaining';
 import './methods/disable';
diff --git a/app/2fa/server/loginHandler.js b/app/2fa/server/loginHandler.js
index a70f582f946b..7138a7b3d61f 100644
--- a/app/2fa/server/loginHandler.js
+++ b/app/2fa/server/loginHandler.js
@@ -1,9 +1,7 @@
-import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
 
-import { TOTP } from './lib/totp';
-import { settings } from '../../settings';
 import { callbacks } from '../../callbacks';
+import { checkCodeForUser } from './code/index';
 
 Accounts.registerLoginHandler('totp', function(options) {
 	if (!options.totp || !options.totp.code) {
@@ -14,26 +12,11 @@ Accounts.registerLoginHandler('totp', function(options) {
 });
 
 callbacks.add('onValidateLogin', (login) => {
-	if (!settings.get('Accounts_TwoFactorAuthentication_Enabled')) {
+	if (login.type !== 'password') {
 		return;
 	}
 
-	if (login.type === 'password' && login.user.services && login.user.services.totp && login.user.services.totp.enabled === true) {
-		const { totp } = login.methodArguments[0];
+	const { totp } = login.methodArguments[0];
 
-		if (!totp || !totp.code) {
-			throw new Meteor.Error('totp-required', 'TOTP Required');
-		}
-
-		const verified = TOTP.verify({
-			secret: login.user.services.totp.secret,
-			token: totp.code,
-			userId: login.user._id,
-			backupTokens: login.user.services.totp.hashedBackup,
-		});
-
-		if (verified !== true) {
-			throw new Meteor.Error('totp-invalid', 'TOTP Invalid');
-		}
-	}
+	checkCodeForUser({ user: login.user, code: totp && totp.code, options: { disablePasswordFallback: true } });
 }, callbacks.priority.MEDIUM, '2fa');
diff --git a/app/2fa/server/startup/settings.js b/app/2fa/server/startup/settings.js
index 51ccf2ac68f3..621c2f186697 100644
--- a/app/2fa/server/startup/settings.js
+++ b/app/2fa/server/startup/settings.js
@@ -8,12 +8,37 @@ settings.addGroup('Accounts', function() {
 		});
 		this.add('Accounts_TwoFactorAuthentication_MaxDelta', 1, {
 			type: 'int',
-			public: true,
-			i18nLabel: 'Accounts_TwoFactorAuthentication_MaxDelta',
 			enableQuery: {
 				_id: 'Accounts_TwoFactorAuthentication_Enabled',
 				value: true,
 			},
 		});
+
+		this.add('Accounts_TwoFactorAuthentication_By_Email_Enabled', true, {
+			type: 'boolean',
+			public: true,
+		});
+		this.add('Accounts_TwoFactorAuthentication_By_Email_Auto_Opt_In', true, {
+			type: 'boolean',
+			enableQuery: {
+				_id: 'Accounts_TwoFactorAuthentication_By_Email_Enabled',
+				value: true,
+			},
+			wizard: {
+				step: 3,
+				order: 3,
+			},
+		});
+		this.add('Accounts_TwoFactorAuthentication_By_Email_Code_Expiration', 3600, {
+			type: 'int',
+			enableQuery: {
+				_id: 'Accounts_TwoFactorAuthentication_By_Email_Enabled',
+				value: true,
+			},
+		});
+
+		this.add('Accounts_TwoFactorAuthentication_RememberFor', 300, {
+			type: 'int',
+		});
 	});
 });
diff --git a/app/2fa/server/twoFactorRequired.ts b/app/2fa/server/twoFactorRequired.ts
new file mode 100644
index 000000000000..316ad726b139
--- /dev/null
+++ b/app/2fa/server/twoFactorRequired.ts
@@ -0,0 +1,36 @@
+import { Meteor } from 'meteor/meteor';
+
+import { checkCodeForUser, ITwoFactorOptions } from './code/index';
+import { IMethodThisType } from '../../../definition/IMethodThisType';
+
+export function twoFactorRequired(fn: Function, options: ITwoFactorOptions): Function {
+	return function(this: IMethodThisType, ...args: any[]): any {
+		if (!this.userId) {
+			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'twoFactorRequired' });
+		}
+
+		// get two factor options from last item of args and remove it
+		const twoFactor = args.pop();
+		if (twoFactor) {
+			if (twoFactor.twoFactorCode && twoFactor.twoFactorMethod) {
+				checkCodeForUser({
+					user: this.userId,
+					connection: this.connection || undefined,
+					code: twoFactor.twoFactorCode,
+					method: twoFactor.twoFactorMethod,
+					options,
+				});
+				this.twoFactorChecked = true;
+			} else {
+				// if it was not two factor options, put it back
+				args.push(twoFactor);
+			}
+		}
+
+		if (!this.twoFactorChecked) {
+			checkCodeForUser({ user: this.userId, connection: this.connection || undefined, options });
+		}
+
+		return fn.apply(this, args);
+	};
+}
diff --git a/app/api/server/api.js b/app/api/server/api.js
index adda6f7d23ca..8c731e7bfcce 100644
--- a/app/api/server/api.js
+++ b/app/api/server/api.js
@@ -12,6 +12,7 @@ import { settings } from '../../settings';
 import { metrics } from '../../metrics';
 import { hasPermission, hasAllPermission } from '../../authorization';
 import { getDefaultUserFields } from '../../utils/server/functions/getDefaultUserFields';
+import { checkCodeForUser } from '../../2fa/server/code';
 
 
 const logger = new Logger('API', {});
@@ -110,7 +111,7 @@ export class APIClass extends Restivus {
 		return result;
 	}
 
-	failure(result, errorType, stack) {
+	failure(result, errorType, stack, error) {
 		if (_.isObject(result)) {
 			result.success = false;
 		} else {
@@ -123,6 +124,14 @@ export class APIClass extends Restivus {
 			if (errorType) {
 				result.errorType = errorType;
 			}
+
+			if (error && error.details) {
+				try {
+					result.details = JSON.parse(error.details);
+				} catch (e) {
+					result.details = error.details;
+				}
+			}
 		}
 
 		result = {
@@ -245,6 +254,15 @@ export class APIClass extends Restivus {
 			.map(addRateLimitRuleToEveryRoute);
 	}
 
+	processTwoFactor({ userId, request, invocation, options, connection }) {
+		const code = request.headers['x-2fa-code'];
+		const method = request.headers['x-2fa-method'];
+
+		checkCodeForUser({ user: userId, code, method, options, connection });
+
+		invocation.twoFactorChecked = true;
+	}
+
 	getFullRouteName(route, method, apiVersion = null) {
 		let prefix = `/${ this.apiPath || '' }`;
 		if (apiVersion) {
@@ -318,6 +336,8 @@ export class APIClass extends Restivus {
 						id: Random.id(),
 						close() {},
 						token: this.token,
+						httpHeaders: this.request.headers,
+						clientAddress: requestIp,
 					};
 
 					try {
@@ -340,6 +360,10 @@ export class APIClass extends Restivus {
 						};
 						Accounts._setAccountData(connection.id, 'loginToken', this.token);
 
+						if (options.twoFactorRequired) {
+							api.processTwoFactor({ userId: this.userId, request: this.request, invocation, options: options.twoFactorOptions, connection });
+						}
+
 						result = DDP._CurrentInvocation.withValue(invocation, () => originalAction.apply(this));
 					} catch (e) {
 						logger.debug(`${ method } ${ route } threw an error:`, e.stack);
@@ -349,7 +373,7 @@ export class APIClass extends Restivus {
 							'error-unauthorized': 'unauthorized',
 						}[e.error] || 'failure';
 
-						result = API.v1[apiMethod](typeof e === 'string' ? e : e.message, e.error);
+						result = API.v1[apiMethod](typeof e === 'string' ? e : e.message, e.error, undefined, e);
 					} finally {
 						delete Accounts._accountData[connection.id];
 					}
@@ -378,9 +402,9 @@ export class APIClass extends Restivus {
 	}
 
 	_initAuth() {
-		const loginCompatibility = (bodyParams) => {
+		const loginCompatibility = (bodyParams, request) => {
 			// Grab the username or email that the user is logging in with
-			const { user, username, email, password, code } = bodyParams;
+			const { user, username, email, password, code: bodyCode } = bodyParams;
 
 			if (password == null) {
 				return bodyParams;
@@ -390,6 +414,8 @@ export class APIClass extends Restivus {
 				return bodyParams;
 			}
 
+			const code = bodyCode || request.headers['x-2fa-code'];
+
 			const auth = {
 				password,
 			};
@@ -429,7 +455,7 @@ export class APIClass extends Restivus {
 
 		this.addRoute('login', { authRequired: false }, {
 			post() {
-				const args = loginCompatibility(this.bodyParams);
+				const args = loginCompatibility(this.bodyParams, this.request);
 				const getUserInfo = self.getHelperMethod('getUserInfo');
 
 				const invocation = new DDPCommon.MethodInvocation({
diff --git a/app/api/server/v1/users.js b/app/api/server/v1/users.js
index 222c000360fb..18fcb5c8ddbd 100644
--- a/app/api/server/v1/users.js
+++ b/app/api/server/v1/users.js
@@ -20,6 +20,7 @@ import { getFullUserData, getFullUserDataById } from '../../../lib/server/functi
 import { API } from '../api';
 import { setStatusText } from '../../../lib/server';
 import { findUsersToAutocomplete } from '../lib/users';
+import { getUserForCheck, emailCheck } from '../../../2fa/server/code';
 
 API.v1.addRoute('users.create', { authRequired: true }, {
 	post() {
@@ -426,7 +427,7 @@ API.v1.addRoute('users.setStatus', { authRequired: true }, {
 	},
 });
 
-API.v1.addRoute('users.update', { authRequired: true }, {
+API.v1.addRoute('users.update', { authRequired: true, twoFactorRequired: true }, {
 	post() {
 		check(this.bodyParams, {
 			userId: String,
@@ -611,19 +612,19 @@ API.v1.addRoute('users.getUsernameSuggestion', { authRequired: true }, {
 	},
 });
 
-API.v1.addRoute('users.generatePersonalAccessToken', { authRequired: true }, {
+API.v1.addRoute('users.generatePersonalAccessToken', { authRequired: true, twoFactorRequired: true }, {
 	post() {
-		const { tokenName } = this.bodyParams;
+		const { tokenName, bypassTwoFactor } = this.bodyParams;
 		if (!tokenName) {
 			return API.v1.failure('The \'tokenName\' param is required');
 		}
-		const token = Meteor.runAsUser(this.userId, () => Meteor.call('personalAccessTokens:generateToken', { tokenName }));
+		const token = Meteor.runAsUser(this.userId, () => Meteor.call('personalAccessTokens:generateToken', { tokenName, bypassTwoFactor }));
 
 		return API.v1.success({ token });
 	},
 });
 
-API.v1.addRoute('users.regeneratePersonalAccessToken', { authRequired: true }, {
+API.v1.addRoute('users.regeneratePersonalAccessToken', { authRequired: true, twoFactorRequired: true }, {
 	post() {
 		const { tokenName } = this.bodyParams;
 		if (!tokenName) {
@@ -647,6 +648,7 @@ API.v1.addRoute('users.getPersonalAccessTokens', { authRequired: true }, {
 				name: loginToken.name,
 				createdAt: loginToken.createdAt,
 				lastTokenPart: loginToken.lastTokenPart,
+				bypassTwoFactor: loginToken.bypassTwoFactor,
 			}));
 
 		return API.v1.success({
@@ -655,7 +657,7 @@ API.v1.addRoute('users.getPersonalAccessTokens', { authRequired: true }, {
 	},
 });
 
-API.v1.addRoute('users.removePersonalAccessToken', { authRequired: true }, {
+API.v1.addRoute('users.removePersonalAccessToken', { authRequired: true, twoFactorRequired: true }, {
 	post() {
 		const { tokenName } = this.bodyParams;
 		if (!tokenName) {
@@ -669,6 +671,41 @@ API.v1.addRoute('users.removePersonalAccessToken', { authRequired: true }, {
 	},
 });
 
+API.v1.addRoute('users.2fa.enableEmail', { authRequired: true }, {
+	post() {
+		Users.enableEmail2FAByUserId(this.userId);
+
+		return API.v1.success();
+	},
+});
+
+API.v1.addRoute('users.2fa.disableEmail', { authRequired: true, twoFactorRequired: true, twoFactorOptions: { disableRememberMe: true } }, {
+	post() {
+		Users.disableEmail2FAByUserId(this.userId);
+
+		return API.v1.success();
+	},
+});
+
+API.v1.addRoute('users.2fa.sendEmailCode', {
+	post() {
+		const { emailOrUsername } = this.bodyParams;
+
+		if (!emailOrUsername) {
+			throw new Meteor.Error('error-parameter-required', 'emailOrUsername is required');
+		}
+
+		const method = emailOrUsername.includes('@') ? 'findOneByEmailAddress' : 'findOneByUsername';
+		const userId = this.userId || Users[method](emailOrUsername, { fields: { _id: 1 } })?._id;
+
+		if (!userId) {
+			throw new Meteor.Error('error-invalid-user', 'Invalid user');
+		}
+
+		return API.v1.success(emailCheck.sendEmailCode(getUserForCheck(userId)));
+	},
+});
+
 API.v1.addRoute('users.presence', { authRequired: true }, {
 	get() {
 		const { from, ids } = this.queryParams;
diff --git a/app/blockstack/server/userHandler.js b/app/blockstack/server/userHandler.js
index 8078d5358c7d..5ead21a43878 100644
--- a/app/blockstack/server/userHandler.js
+++ b/app/blockstack/server/userHandler.js
@@ -3,6 +3,7 @@ import { Accounts } from 'meteor/accounts-base';
 import { ServiceConfiguration } from 'meteor/service-configuration';
 
 import { logger } from './logger';
+import { settings } from '../../settings/server';
 import { generateUsernameSuggestion } from '../../lib';
 
 // Updates or creates a user after we authenticate with Blockstack
@@ -34,8 +35,9 @@ export const updateOrCreateUser = (serviceData, options) => {
 			// gaia, encrypting mail for DID user only. @TODO: document this approach.
 			emails.push({ address: `${ did }@blockstack.email`, verified: false });
 		} else {
+			const verified = settings.get('Accounts_Verify_Email_For_External_Accounts');
 			// Reformat array of emails into expected format if they exist
-			emails = profile.emails.map((address) => ({ address, verified: true }));
+			emails = profile.emails.map((address) => ({ address, verified }));
 		}
 
 		const newUser = {
diff --git a/app/cas/server/cas_server.js b/app/cas/server/cas_server.js
index 3d8cfcd9801a..de2bec2ff5ff 100644
--- a/app/cas/server/cas_server.js
+++ b/app/cas/server/cas_server.js
@@ -125,6 +125,7 @@ Accounts.registerLoginHandler(function(options) {
 	const cas_version = parseFloat(settings.get('CAS_version'));
 	const sync_enabled = settings.get('CAS_Sync_User_Data_Enabled');
 	const trustUsername = settings.get('CAS_trust_username');
+	const verified = settings.get('Accounts_Verify_Email_For_External_Accounts');
 
 	// We have these
 	const ext_attrs = {
@@ -201,7 +202,7 @@ Accounts.registerLoginHandler(function(options) {
 
 			// Update email
 			if (int_attrs.email) {
-				Meteor.users.update(user, { $set: { emails: [{ address: int_attrs.email, verified: true }] } });
+				Meteor.users.update(user, { $set: { emails: [{ address: int_attrs.email, verified }] } });
 			}
 		}
 	} else {
@@ -230,7 +231,7 @@ Accounts.registerLoginHandler(function(options) {
 		// Add email
 		if (int_attrs.email) {
 			_.extend(newUser, {
-				emails: [{ address: int_attrs.email, verified: true }],
+				emails: [{ address: int_attrs.email, verified }],
 			});
 		}
 
diff --git a/app/crowd/server/crowd.js b/app/crowd/server/crowd.js
index ed64c9657884..c91d2de399e4 100644
--- a/app/crowd/server/crowd.js
+++ b/app/crowd/server/crowd.js
@@ -151,7 +151,7 @@ export class CROWD {
 			crowd_username: crowdUser.crowd_username,
 			emails: [{
 				address: crowdUser.email,
-				verified: true,
+				verified: settings.get('Accounts_Verify_Email_For_External_Accounts'),
 			}],
 			active: crowdUser.active,
 			crowd: true,
diff --git a/app/ldap/server/sync.js b/app/ldap/server/sync.js
index 5a17a64f9e87..9778bad9a3dc 100644
--- a/app/ldap/server/sync.js
+++ b/app/ldap/server/sync.js
@@ -123,12 +123,14 @@ export function getDataToSyncUserData(ldapUser, user) {
 						return;
 					}
 
+					const verified = settings.get('Accounts_Verify_Email_For_External_Accounts');
+
 					if (_.isObject(ldapUser[ldapField])) {
 						_.map(ldapUser[ldapField], function(item) {
-							emailList.push({ address: item, verified: true });
+							emailList.push({ address: item, verified });
 						});
 					} else {
-						emailList.push({ address: ldapUser[ldapField], verified: true });
+						emailList.push({ address: ldapUser[ldapField], verified });
 					}
 					break;
 
diff --git a/app/lib/client/lib/index.js b/app/lib/client/lib/index.js
index 3b7017648ba7..4cc975c68ce2 100644
--- a/app/lib/client/lib/index.js
+++ b/app/lib/client/lib/index.js
@@ -5,6 +5,8 @@
 	for the *client* pieces of code which does include the shared
 	library files.
 */
+import * as DateFormat from './formatDate';
+
 export { RocketChatAnnouncement } from './RocketChatAnnouncement';
 export { LoginPresence } from './LoginPresence';
-export * as DateFormat from './formatDate';
+export { DateFormat };
diff --git a/app/lib/server/methods/insertOrUpdateUser.js b/app/lib/server/methods/insertOrUpdateUser.js
index 5ef244126412..4d258c18d2a0 100644
--- a/app/lib/server/methods/insertOrUpdateUser.js
+++ b/app/lib/server/methods/insertOrUpdateUser.js
@@ -2,9 +2,10 @@ import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 
 import { saveUser } from '../functions';
+import { twoFactorRequired } from '../../../2fa/server/twoFactorRequired';
 
 Meteor.methods({
-	insertOrUpdateUser(userData) {
+	insertOrUpdateUser: twoFactorRequired(function(userData) {
 		check(userData, Object);
 
 		if (!Meteor.userId()) {
@@ -12,5 +13,5 @@ Meteor.methods({
 		}
 
 		return saveUser(Meteor.userId(), userData);
-	},
+	}),
 });
diff --git a/app/lib/server/startup/settings.js b/app/lib/server/startup/settings.js
index 4d1c9b253bab..02489b745fac 100644
--- a/app/lib/server/startup/settings.js
+++ b/app/lib/server/startup/settings.js
@@ -144,6 +144,9 @@ settings.addGroup('Accounts', function() {
 				},
 			},
 		});
+		this.add('Accounts_Verify_Email_For_External_Accounts', true, {
+			type: 'boolean',
+		});
 		this.add('Accounts_ManuallyApproveNewUsers', false, {
 			public: true,
 			type: 'boolean',
diff --git a/app/meteor-accounts-saml/server/saml_server.js b/app/meteor-accounts-saml/server/saml_server.js
index 23801cbcf0f5..4d0e716b273e 100644
--- a/app/meteor-accounts-saml/server/saml_server.js
+++ b/app/meteor-accounts-saml/server/saml_server.js
@@ -10,6 +10,7 @@ import _ from 'underscore';
 import s from 'underscore.string';
 
 import { SAML } from './saml_utils';
+import { settings } from '../../settings/server';
 import { Rooms, Subscriptions, CredentialTokens } from '../../models';
 import { generateUsernameSuggestion } from '../../lib';
 import { _setUsername } from '../../lib/server/functions';
@@ -192,7 +193,7 @@ function overwriteData(user, fullName, eppnMatch, emailList) {
 			$set: {
 				emails: emailList.map((email) => ({
 					address: email,
-					verified: true,
+					verified: settings.get('Accounts_Verify_Email_For_External_Accounts'),
 				})),
 			},
 		});
@@ -294,7 +295,7 @@ Accounts.registerLoginHandler(function(loginRequest) {
 
 		const emails = emailList.map((email) => ({
 			address: email,
-			verified: true,
+			verified: settings.get('Accounts_Verify_Email_For_External_Accounts'),
 		}));
 
 		let globalRoles;
diff --git a/app/models/server/models/Users.js b/app/models/server/models/Users.js
index bdce8470ee47..c0bbea891b17 100644
--- a/app/models/server/models/Users.js
+++ b/app/models/server/models/Users.js
@@ -398,6 +398,32 @@ export class Users extends Base {
 		});
 	}
 
+	enableEmail2FAByUserId(userId) {
+		return this.update({
+			_id: userId,
+		}, {
+			$set: {
+				'services.email2fa': {
+					enabled: true,
+					changedAt: new Date(),
+				},
+			},
+		});
+	}
+
+	disableEmail2FAByUserId(userId) {
+		return this.update({
+			_id: userId,
+		}, {
+			$set: {
+				'services.email2fa': {
+					enabled: false,
+					changedAt: new Date(),
+				},
+			},
+		});
+	}
+
 	findByIdsWithPublicE2EKey(ids, options) {
 		const query = {
 			_id: {
@@ -419,6 +445,40 @@ export class Users extends Base {
 		});
 	}
 
+	removeExpiredEmailCodesOfUserId(userId) {
+		this.update({ _id: userId }, {
+			$pull: {
+				'services.emailCode': {
+					expire: { $lt: new Date() },
+				},
+			},
+		});
+	}
+
+	removeEmailCodeByUserIdAndCode(userId, code) {
+		this.update({ _id: userId }, {
+			$pull: {
+				'services.emailCode': {
+					code,
+				},
+			},
+		});
+	}
+
+	addEmailCodeByUserId(userId, code, expire) {
+		this.update({ _id: userId }, {
+			$push: {
+				'services.emailCode': {
+					$each: [{
+						code,
+						expire,
+					}],
+					$slice: -5,
+				},
+			},
+		});
+	}
+
 	findUsersInRoles(roles, scope, options) {
 		roles = [].concat(roles);
 
@@ -1074,6 +1134,18 @@ export class Users extends Base {
 		return this.update(_id, update);
 	}
 
+	setTwoFactorAuthorizationHashAndUntilForUserIdAndToken(_id, token, hash, until) {
+		return this.update({
+			_id,
+			'services.resume.loginTokens.hashedToken': token,
+		}, {
+			$set: {
+				'services.resume.loginTokens.$.twoFactorAuthorizedHash': hash,
+				'services.resume.loginTokens.$.twoFactorAuthorizedUntil': until,
+			},
+		});
+	}
+
 	setUtcOffset(_id, utcOffset) {
 		const query = {
 			_id,
diff --git a/app/settings/server/functions/settings.d.ts b/app/settings/server/functions/settings.d.ts
new file mode 100644
index 000000000000..8748685d0bb7
--- /dev/null
+++ b/app/settings/server/functions/settings.d.ts
@@ -0,0 +1,3 @@
+export namespace settings {
+	export function get(name: string): string;
+}
diff --git a/app/ui-utils/client/lib/modal.html b/app/ui-utils/client/lib/modal.html
index 19ad6fe23d55..5a3d7d95efd5 100644
--- a/app/ui-utils/client/lib/modal.html
+++ b/app/ui-utils/client/lib/modal.html
@@ -47,6 +47,9 @@ <h1 class="rc-modal__title">
 						</div>
 						<div class="rc-modal__content-error"></div>
 					{{/if}}
+					{{#if inputActionText}}
+						<input class="rc-button rc-button--nude js-input-action" type="submit" data-button="input-action" value="{{inputActionText}}">
+					{{/if}}
 					{{#if dontAskAgain}}
 						<label class="rc-checkbox">
 							<input type="checkbox" id="dont-ask-me-again" class="rc-checkbox__input js-modal-dont-ask">
diff --git a/app/ui-utils/client/lib/modal.js b/app/ui-utils/client/lib/modal.js
index dc77ddbce180..759fef8c1367 100644
--- a/app/ui-utils/client/lib/modal.js
+++ b/app/ui-utils/client/lib/modal.js
@@ -233,6 +233,10 @@ Template.rc_modal.events({
 		event.stopPropagation();
 		this.close();
 	},
+	'click .js-input-action'(e, instance) {
+		!this.inputAction || this.inputAction.call(instance.data.data, e, instance);
+		e.stopPropagation();
+	},
 	'click .js-close'(e) {
 		e.preventDefault();
 		e.stopPropagation();
diff --git a/app/utils/client/lib/RestApiClient.js b/app/utils/client/lib/RestApiClient.js
index 6b927743cac4..a0d74e93d0b2 100644
--- a/app/utils/client/lib/RestApiClient.js
+++ b/app/utils/client/lib/RestApiClient.js
@@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
 
 import { baseURI } from './baseuri';
+import { process2faReturn } from '../../../2fa/client/callWithTwoFactorRequired';
 
 export const APIClient = {
 	delete(endpoint, params) {
@@ -43,26 +44,34 @@ export const APIClient = {
 		return query;
 	},
 
-	_jqueryCall(method, endpoint, params, body) {
+	_jqueryCall(method, endpoint, params, body, headers = {}) {
 		const query = APIClient._generateQueryFromParams(params);
 
 		return new Promise(function _rlRestApiGet(resolve, reject) {
 			jQuery.ajax({
 				method,
 				url: `${ baseURI }api/${ endpoint }${ query }`,
-				headers: {
+				headers: Object.assign({
 					'Content-Type': 'application/json',
 					'X-User-Id': Meteor._localStorage.getItem(Accounts.USER_ID_KEY),
 					'X-Auth-Token': Meteor._localStorage.getItem(Accounts.LOGIN_TOKEN_KEY),
-				},
+				}, headers),
 				data: JSON.stringify(body),
 				success: function _rlGetSuccess(result) {
 					resolve(result);
 				},
 				error: function _rlGetFailure(xhr, status, errorThrown) {
-					const error = new Error(errorThrown);
-					error.xhr = xhr;
-					reject(error);
+					APIClient.processTwoFactorError({
+						xhr,
+						params: [method, endpoint, params, body, headers],
+						resolve,
+						reject,
+						originalCallback() {
+							const error = new Error(errorThrown);
+							error.xhr = xhr;
+							reject(error);
+						},
+					});
 				},
 			});
 		});
@@ -116,6 +125,23 @@ export const APIClient = {
 		return ret;
 	},
 
+	processTwoFactorError({ xhr, params, originalCallback, resolve, reject }) {
+		if (!xhr.responseJSON || !xhr.responseJSON.errorType) {
+			return originalCallback();
+		}
+
+		process2faReturn({
+			error: xhr.responseJSON,
+			originalCallback,
+			onCode(code, method) {
+				const headers = params[params.length - 1];
+				headers['x-2fa-code'] = code;
+				headers['x-2fa-method'] = method;
+				APIClient._jqueryCall(...params).then(resolve).catch(reject);
+			},
+		});
+	},
+
 	v1: {
 		delete(endpoint, params) {
 			return APIClient.delete(`v1/${ endpoint }`, params);
diff --git a/app/utils/client/lib/handleError.js b/app/utils/client/lib/handleError.js
index eb041954736e..6e2fb92bb2e9 100644
--- a/app/utils/client/lib/handleError.js
+++ b/app/utils/client/lib/handleError.js
@@ -4,6 +4,10 @@ import s from 'underscore.string';
 import toastr from 'toastr';
 
 export const handleError = function(error, useToastr = true) {
+	if (error.xhr) {
+		error = error.xhr.responseJSON || {};
+	}
+
 	if (_.isObject(error.details)) {
 		for (const key in error.details) {
 			if (error.details.hasOwnProperty(key)) {
@@ -13,6 +17,9 @@ export const handleError = function(error, useToastr = true) {
 	}
 
 	if (useToastr) {
+		if (error.toastrShowed) {
+			return;
+		}
 		const details = Object.entries(error.details || {})
 			.reduce((obj, [key, value]) => ({ ...obj, [key]: s.escapeHTML(value) }), {});
 		const message = TAPi18n.__(error.error, details);
diff --git a/app/utils/server/functions/getDefaultUserFields.js b/app/utils/server/functions/getDefaultUserFields.js
index 41f8187279a6..492a3732018e 100644
--- a/app/utils/server/functions/getDefaultUserFields.js
+++ b/app/utils/server/functions/getDefaultUserFields.js
@@ -24,6 +24,7 @@ export const getDefaultUserFields = () => ({
 	'services.blockstack': 1,
 	'services.password.bcrypt': 1,
 	'services.totp.enabled': 1,
+	'services.email2fa.enabled': 1,
 	statusLivechat: 1,
 	banners: 1,
 	'oauth.authorizedClients': 1,
diff --git a/client/components/setupWizard/steps/SettingsBasedStep.js b/client/components/setupWizard/steps/SettingsBasedStep.js
index 245b4dc1871d..331f02b658e7 100644
--- a/client/components/setupWizard/steps/SettingsBasedStep.js
+++ b/client/components/setupWizard/steps/SettingsBasedStep.js
@@ -53,9 +53,9 @@ export function SettingsBasedStep({ step, title, active }) {
 		resetFields(
 			settings
 				.filter(({ wizard }) => wizard.step === step)
-				.filter(({ type }) => ['string', 'select', 'language'].includes(type))
+				.filter(({ type }) => ['string', 'select', 'language', 'boolean'].includes(type))
 				.sort(({ wizard: { order: a } }, { wizard: { order: b } }) => a - b)
-				.map(({ value, ...field }) => ({ ...field, value: value || '' })),
+				.map(({ value, ...field }) => ({ ...field, value: value != null ? value : '' })),
 		);
 	}, [settings, currentStep]);
 
@@ -135,6 +135,20 @@ export function SettingsBasedStep({ step, title, active }) {
 								options={values.map(({ i18nLabel, key }) => [key, t(i18nLabel)])}
 							/>}
 
+							{type === 'boolean' && <Select
+								type='select'
+								data-qa={_id}
+								id={_id}
+								name={_id}
+								ref={i === 0 ? autoFocusRef : undefined}
+								value={String(value)}
+								onChange={(value) => setFieldValue(_id, value === 'true')}
+								options={[
+									['true', t('Yes')],
+									['false', t('No')],
+								]}
+							/>}
+
 							{type === 'language' && <Select
 								type='select'
 								data-qa={_id}
diff --git a/definition/IMethodThisType.ts b/definition/IMethodThisType.ts
new file mode 100644
index 000000000000..a019b3d8a7b3
--- /dev/null
+++ b/definition/IMethodThisType.ts
@@ -0,0 +1,16 @@
+export interface IMethodConnection {
+	id: string;
+	close: Function;
+	onClose: Function;
+	clientAddress: string;
+	httpHeaders: Record<string, any>;
+}
+
+export interface IMethodThisType {
+	isSimulation: boolean;
+	userId: string | null;
+	connection: IMethodConnection | null;
+	setUserId(userId: string): void;
+	unblock(): void;
+	twoFactorChecked: boolean | undefined;
+}
diff --git a/definition/IMethodType.ts b/definition/IMethodType.ts
new file mode 100644
index 000000000000..44541381e139
--- /dev/null
+++ b/definition/IMethodType.ts
@@ -0,0 +1,5 @@
+import { IMethodThisType } from './IMethodThisType';
+
+export interface IMethodType {
+	[key: string]: (this: IMethodThisType, ...args: any[]) => any;
+}
diff --git a/definition/IUser.ts b/definition/IUser.ts
new file mode 100644
index 000000000000..3e7ff4caf239
--- /dev/null
+++ b/definition/IUser.ts
@@ -0,0 +1,100 @@
+export interface ILoginToken {
+	hashedToken: string;
+	twoFactorAuthorizedUntil?: Date;
+	twoFactorAuthorizedHash?: string;
+}
+
+export interface IMeteorLoginToken extends ILoginToken {
+	when: Date;
+}
+
+export interface IPersonalAccessToken extends ILoginToken {
+	type: 'personalAccessToken';
+	createdAt: Date;
+	lastTokenPart: string;
+	name?: string;
+	bypassTwoFactor?: boolean;
+}
+
+export interface IUserEmailVerificationToken {
+	token: string;
+	address: string;
+	when: Date;
+}
+
+export interface IUserEmailCode {
+	code: string;
+	expire: Date;
+}
+
+type LoginToken = ILoginToken & IPersonalAccessToken;
+
+export interface IUserServices {
+	password?: {
+		bcrypt: string;
+	};
+	email?: {
+		verificationTokens?: IUserEmailVerificationToken[];
+	};
+	resume?: {
+		loginTokens?: LoginToken[];
+	};
+	google?: any;
+	facebook?: any;
+	github?: any;
+	totp?: {
+		enabled: boolean;
+		hashedBackup: string[];
+		secret: string;
+	};
+	email2fa?: {
+		enabled: boolean;
+		changedAt: Date;
+	};
+	emailCode: IUserEmailCode[];
+}
+
+export interface IUserEmail {
+	address: string;
+	verified: boolean;
+}
+
+export interface IUserSettings {
+	profile: any;
+	preferences: {
+		[key: string]: any;
+	};
+}
+
+export interface IUser {
+	_id: string;
+	createdAt: Date;
+	roles: string[];
+	type: string;
+	active: boolean;
+	username?: string;
+	name?: string;
+	services?: IUserServices;
+	emails?: IUserEmail[];
+	status?: string;
+	statusConnection?: string;
+	lastLogin?: Date;
+	avatarOrigin?: string;
+	utcOffset?: number;
+	language?: string;
+	statusDefault?: string;
+	oauth?: {
+		authorizedClients: string[];
+	};
+	_updatedAt?: Date;
+	statusLivechat?: string;
+	e2e?: {
+		private_key: string;
+		public_key: string;
+	};
+	requirePasswordChange?: boolean;
+	customFields?: {
+		[key: string]: any;
+	};
+	settings?: IUserSettings;
+}
diff --git a/imports/personal-access-tokens/client/personalAccessTokens.html b/imports/personal-access-tokens/client/personalAccessTokens.html
index 340ade1e13ab..b0e790ecd1c5 100644
--- a/imports/personal-access-tokens/client/personalAccessTokens.html
+++ b/imports/personal-access-tokens/client/personalAccessTokens.html
@@ -8,9 +8,18 @@
 				<div class="section-content border-component-color">
 					<div class="input-line double-col">
 						<label for="tokenName" class="setting-label">{{_ "API_Personal_Access_Tokens_To_REST_API"}}</label>
-						<div class="setting-field">
-							<input type="text" class="rc-input__element js-search" name="tokenName" id="tokenName"
-								placeholder={{_ "API_Add_Personal_Access_Token"}} autocomplete="off" />
+						<div style="display: flex;">
+							<div class="setting-field" style="flex-grow: 1;">
+								<input type="text" class="rc-input__element js-search" name="tokenName" id="tokenName"
+									placeholder={{_ "API_Add_Personal_Access_Token"}} autocomplete="off" />
+							</div>
+							<div class="rc-select setting-field">
+								<select id="bypassTwoFactor" class="required rc-select__element">
+									<option value="false" selected dir="auto">{{_ "Require"}} ({{_ "Two Factor Authentication"}})</option>
+									<option value="true" dir="auto">{{_ "Ignore"}} ({{_ "Two Factor Authentication"}})</option>
+								</select>
+								{{> icon block="rc-select__arrow" icon="arrow-down"}}
+							</div>
 						</div>
 						<button name="add" class="rc-button rc-button--primary setting-action save-token">{{_ "Add"}}</button>
 					</div>
@@ -29,6 +38,9 @@
 						<th>
 							<div class="table-fake-th">{{_ "Last_token_part"}}</div>
 						</th>
+						<th>
+							<div class="table-fake-th">{{_ "Two Factor Authentication"}}</div>
+						</th>
 						<th></th>
 					</tr>
 				</thead>
@@ -42,6 +54,7 @@
 						</td>
 						<td>{{dateFormated createdAt}}</td>
 						<td>...{{lastTokenPart}}</td>
+						<td>{{twoFactor bypassTwoFactor}}</td>
 						<td><button class="regenerate-personal-access-token"><i class="icon-ccw"></i></button></td>
 						<td><button class="remove-personal-access-token"><i class="icon-block"></i></button></td>
 					</tr>
diff --git a/imports/personal-access-tokens/client/personalAccessTokens.js b/imports/personal-access-tokens/client/personalAccessTokens.js
index a327768d6755..1e4403b6fe68 100644
--- a/imports/personal-access-tokens/client/personalAccessTokens.js
+++ b/imports/personal-access-tokens/client/personalAccessTokens.js
@@ -9,7 +9,7 @@ import { t } from '../../../app/utils';
 import { modal, SideNav } from '../../../app/ui-utils';
 import { hasAllPermission } from '../../../app/authorization';
 import './personalAccessTokens.html';
-import { APIClient } from '../../../app/utils/client';
+import { APIClient, handleError } from '../../../app/utils/client';
 
 const loadTokens = async (instance) => {
 	const { tokens } = await APIClient.v1.get('users.getPersonalAccessTokens');
@@ -26,6 +26,9 @@ Template.accountTokens.helpers({
 	dateFormated(date) {
 		return moment(date).format('L LT');
 	},
+	twoFactor(bypassTwoFactor) {
+		return bypassTwoFactor ? t('Ignore') : t('Require');
+	},
 });
 
 const showSuccessModal = (token) => {
@@ -40,6 +43,7 @@ const showSuccessModal = (token) => {
 	}, () => {
 	});
 };
+
 Template.accountTokens.events({
 	'submit #form-tokens'(e, instance) {
 		e.preventDefault();
@@ -47,9 +51,10 @@ Template.accountTokens.events({
 		if (tokenName === '') {
 			return toastr.error(t('Please_fill_a_token_name'));
 		}
-		Meteor.call('personalAccessTokens:generateToken', { tokenName }, (error, token) => {
+		const bypassTwoFactor = $('#bypassTwoFactor').val() === 'true';
+		Meteor.call('personalAccessTokens:generateToken', { tokenName, bypassTwoFactor }, (error, token) => {
 			if (error) {
-				return toastr.error(t(error.error));
+				return handleError(error);
 			}
 			showSuccessModal(token);
 			loadTokens(instance);
@@ -72,7 +77,7 @@ Template.accountTokens.events({
 				tokenName: this.name,
 			}, (error) => {
 				if (error) {
-					return toastr.error(t(error.error));
+					return handleError(error);
 				}
 				loadTokens(instance);
 				toastr.success(t('Removed'));
@@ -95,7 +100,7 @@ Template.accountTokens.events({
 				tokenName: this.name,
 			}, (error, token) => {
 				if (error) {
-					return toastr.error(t(error.error));
+					return handleError(error);
 				}
 				loadTokens(instance);
 				showSuccessModal(token);
diff --git a/imports/personal-access-tokens/server/api/methods/generateToken.js b/imports/personal-access-tokens/server/api/methods/generateToken.js
index 100c6e71bc21..5d46bc4f8d53 100644
--- a/imports/personal-access-tokens/server/api/methods/generateToken.js
+++ b/imports/personal-access-tokens/server/api/methods/generateToken.js
@@ -4,9 +4,10 @@ import { Accounts } from 'meteor/accounts-base';
 
 import { hasPermission } from '../../../../../app/authorization';
 import { Users } from '../../../../../app/models';
+import { twoFactorRequired } from '../../../../../app/2fa/server/twoFactorRequired';
 
 Meteor.methods({
-	'personalAccessTokens:generateToken'({ tokenName }) {
+	'personalAccessTokens:generateToken': twoFactorRequired(function({ tokenName, bypassTwoFactor }) {
 		if (!Meteor.userId()) {
 			throw new Meteor.Error('not-authorized', 'Not Authorized', { method: 'personalAccessTokens:generateToken' });
 		}
@@ -31,8 +32,9 @@ Meteor.methods({
 				createdAt: new Date(),
 				lastTokenPart: token.slice(-6),
 				name: tokenName,
+				bypassTwoFactor,
 			},
 		});
 		return token;
-	},
+	}),
 });
diff --git a/imports/personal-access-tokens/server/api/methods/regenerateToken.js b/imports/personal-access-tokens/server/api/methods/regenerateToken.js
index 3745c2b048a3..09c8d40ad448 100644
--- a/imports/personal-access-tokens/server/api/methods/regenerateToken.js
+++ b/imports/personal-access-tokens/server/api/methods/regenerateToken.js
@@ -2,9 +2,10 @@ import { Meteor } from 'meteor/meteor';
 
 import { hasPermission } from '../../../../../app/authorization';
 import { Users } from '../../../../../app/models';
+import { twoFactorRequired } from '../../../../../app/2fa/server/twoFactorRequired';
 
 Meteor.methods({
-	'personalAccessTokens:regenerateToken'({ tokenName }) {
+	'personalAccessTokens:regenerateToken': twoFactorRequired(function({ tokenName }) {
 		if (!Meteor.userId()) {
 			throw new Meteor.Error('not-authorized', 'Not Authorized', { method: 'personalAccessTokens:regenerateToken' });
 		}
@@ -21,6 +22,6 @@ Meteor.methods({
 		}
 
 		Meteor.call('personalAccessTokens:removeToken', { tokenName });
-		return Meteor.call('personalAccessTokens:generateToken', { tokenName });
-	},
+		return Meteor.call('personalAccessTokens:generateToken', { tokenName, bypassTwoFactor: tokenExist.bypassTwoFactor });
+	}),
 });
diff --git a/imports/personal-access-tokens/server/api/methods/removeToken.js b/imports/personal-access-tokens/server/api/methods/removeToken.js
index 5a304b6b798b..641e26203b56 100644
--- a/imports/personal-access-tokens/server/api/methods/removeToken.js
+++ b/imports/personal-access-tokens/server/api/methods/removeToken.js
@@ -2,9 +2,10 @@ import { Meteor } from 'meteor/meteor';
 
 import { hasPermission } from '../../../../../app/authorization';
 import { Users } from '../../../../../app/models';
+import { twoFactorRequired } from '../../../../../app/2fa/server/twoFactorRequired';
 
 Meteor.methods({
-	'personalAccessTokens:removeToken'({ tokenName }) {
+	'personalAccessTokens:removeToken': twoFactorRequired(function({ tokenName }) {
 		if (!Meteor.userId()) {
 			throw new Meteor.Error('not-authorized', 'Not Authorized', { method: 'personalAccessTokens:removeToken' });
 		}
@@ -25,5 +26,5 @@ Meteor.methods({
 				name: tokenName,
 			},
 		});
-	},
+	}),
 });
diff --git a/package-lock.json b/package-lock.json
index 31bc73de2f2f..0a1ef314bae8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6939,7 +6939,6 @@
 			"version": "3.1.1",
 			"resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz",
 			"integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==",
-			"dev": true,
 			"requires": {
 				"define-properties": "^1.1.3",
 				"es-abstract": "^1.17.0",
@@ -6950,7 +6949,6 @@
 					"version": "1.17.4",
 					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
 					"integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
-					"dev": true,
 					"requires": {
 						"es-to-primitive": "^1.2.1",
 						"function-bind": "^1.1.1",
@@ -6969,7 +6967,6 @@
 					"version": "1.2.1",
 					"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
 					"integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-					"dev": true,
 					"requires": {
 						"is-callable": "^1.1.4",
 						"is-date-object": "^1.0.1",
@@ -6979,20 +6976,17 @@
 				"has-symbols": {
 					"version": "1.0.1",
 					"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-					"integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
-					"dev": true
+					"integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
 				},
 				"is-callable": {
 					"version": "1.1.5",
 					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
-					"integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
-					"dev": true
+					"integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="
 				},
 				"is-regex": {
 					"version": "1.0.5",
 					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
 					"integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
-					"dev": true,
 					"requires": {
 						"has": "^1.0.3"
 					}
@@ -7000,8 +6994,7 @@
 				"object-keys": {
 					"version": "1.1.1",
 					"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-					"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-					"dev": true
+					"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
 				}
 			}
 		},
@@ -7044,7 +7037,6 @@
 			"version": "1.2.3",
 			"resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz",
 			"integrity": "sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==",
-			"dev": true,
 			"requires": {
 				"define-properties": "^1.1.3",
 				"es-abstract": "^1.17.0-next.1"
@@ -7054,7 +7046,6 @@
 					"version": "1.17.4",
 					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
 					"integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
-					"dev": true,
 					"requires": {
 						"es-to-primitive": "^1.2.1",
 						"function-bind": "^1.1.1",
@@ -7073,7 +7064,6 @@
 					"version": "1.2.1",
 					"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
 					"integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-					"dev": true,
 					"requires": {
 						"is-callable": "^1.1.4",
 						"is-date-object": "^1.0.1",
@@ -7083,20 +7073,17 @@
 				"has-symbols": {
 					"version": "1.0.1",
 					"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-					"integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
-					"dev": true
+					"integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
 				},
 				"is-callable": {
 					"version": "1.1.5",
 					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
-					"integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
-					"dev": true
+					"integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="
 				},
 				"is-regex": {
 					"version": "1.0.5",
 					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
 					"integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
-					"dev": true,
 					"requires": {
 						"has": "^1.0.3"
 					}
@@ -7104,8 +7091,7 @@
 				"object-keys": {
 					"version": "1.1.1",
 					"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-					"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-					"dev": true
+					"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
 				}
 			}
 		},
@@ -9673,8 +9659,7 @@
 		"builtin-modules": {
 			"version": "1.1.1",
 			"resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
-			"integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=",
-			"dev": true
+			"integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8="
 		},
 		"builtin-status-codes": {
 			"version": "3.0.0",
@@ -10683,8 +10668,7 @@
 		"contains-path": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
-			"integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
-			"dev": true
+			"integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo="
 		},
 		"content-disposition": {
 			"version": "0.5.2",
@@ -12547,7 +12531,6 @@
 			"version": "1.5.0",
 			"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
 			"integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
-			"dev": true,
 			"requires": {
 				"esutils": "^2.0.2",
 				"isarray": "^1.0.0"
@@ -12917,7 +12900,6 @@
 			"version": "1.3.2",
 			"resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
 			"integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-			"dev": true,
 			"requires": {
 				"is-arrayish": "^0.2.1"
 			},
@@ -12925,8 +12907,7 @@
 				"is-arrayish": {
 					"version": "0.2.1",
 					"resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-					"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-					"dev": true
+					"integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
 				}
 			}
 		},
@@ -13438,7 +13419,6 @@
 			"version": "0.3.3",
 			"resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz",
 			"integrity": "sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg==",
-			"dev": true,
 			"requires": {
 				"debug": "^2.6.9",
 				"resolve": "^1.13.1"
@@ -13448,7 +13428,6 @@
 					"version": "1.15.0",
 					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.0.tgz",
 					"integrity": "sha512-+hTmAldEGE80U2wJJDC1lebb5jWqvTYAfm3YZ1ckk1gBr0MnCqUKlwK1e+anaFljIl+F5tR5IoZcm4ZDA1zMQw==",
-					"dev": true,
 					"requires": {
 						"path-parse": "^1.0.6"
 					}
@@ -13459,7 +13438,6 @@
 			"version": "2.5.2",
 			"resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz",
 			"integrity": "sha512-LGScZ/JSlqGKiT8OC+cYRxseMjyqt6QO54nl281CK93unD89ijSeRV6An8Ci/2nvWVKe8K/Tqdm75RQoIOCr+Q==",
-			"dev": true,
 			"requires": {
 				"debug": "^2.6.9",
 				"pkg-dir": "^2.0.0"
@@ -13469,7 +13447,6 @@
 			"version": "2.20.0",
 			"resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.20.0.tgz",
 			"integrity": "sha512-NK42oA0mUc8Ngn4kONOPsPB1XhbUvNHqF+g307dPV28aknPoiNnKLFd9em4nkswwepdF5ouieqv5Th/63U7YJQ==",
-			"dev": true,
 			"requires": {
 				"array-includes": "^3.0.3",
 				"array.prototype.flat": "^1.2.1",
@@ -13489,7 +13466,6 @@
 					"version": "1.17.4",
 					"resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
 					"integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
-					"dev": true,
 					"requires": {
 						"es-to-primitive": "^1.2.1",
 						"function-bind": "^1.1.1",
@@ -13508,7 +13484,6 @@
 					"version": "1.2.1",
 					"resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
 					"integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
-					"dev": true,
 					"requires": {
 						"is-callable": "^1.1.4",
 						"is-date-object": "^1.0.1",
@@ -13518,20 +13493,17 @@
 				"has-symbols": {
 					"version": "1.0.1",
 					"resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-					"integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
-					"dev": true
+					"integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg=="
 				},
 				"is-callable": {
 					"version": "1.1.5",
 					"resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
-					"integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
-					"dev": true
+					"integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q=="
 				},
 				"is-regex": {
 					"version": "1.0.5",
 					"resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
 					"integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
-					"dev": true,
 					"requires": {
 						"has": "^1.0.3"
 					}
@@ -13539,14 +13511,12 @@
 				"object-keys": {
 					"version": "1.1.1",
 					"resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-					"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-					"dev": true
+					"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
 				},
 				"object.values": {
 					"version": "1.1.1",
 					"resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz",
 					"integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==",
-					"dev": true,
 					"requires": {
 						"define-properties": "^1.1.3",
 						"es-abstract": "^1.17.0-next.1",
@@ -13558,7 +13528,6 @@
 					"version": "1.15.0",
 					"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.0.tgz",
 					"integrity": "sha512-+hTmAldEGE80U2wJJDC1lebb5jWqvTYAfm3YZ1ckk1gBr0MnCqUKlwK1e+anaFljIl+F5tR5IoZcm4ZDA1zMQw==",
-					"dev": true,
 					"requires": {
 						"path-parse": "^1.0.6"
 					}
@@ -14914,28 +14883,28 @@
 			"dependencies": {
 				"abbrev": {
 					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+					"resolved": false,
 					"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
 					"dev": true,
 					"optional": true
 				},
 				"ansi-regex": {
 					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
 					"dev": true,
 					"optional": true
 				},
 				"aproba": {
 					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
 					"dev": true,
 					"optional": true
 				},
 				"are-we-there-yet": {
 					"version": "1.1.5",
-					"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
+					"resolved": false,
 					"integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
 					"dev": true,
 					"optional": true,
@@ -14946,14 +14915,14 @@
 				},
 				"balanced-match": {
 					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
 					"dev": true,
 					"optional": true
 				},
 				"brace-expansion": {
 					"version": "1.1.11",
-					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+					"resolved": false,
 					"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
 					"dev": true,
 					"optional": true,
@@ -14971,28 +14940,28 @@
 				},
 				"code-point-at": {
 					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
 					"dev": true,
 					"optional": true
 				},
 				"concat-map": {
 					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
 					"dev": true,
 					"optional": true
 				},
 				"console-control-strings": {
 					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
 					"dev": true,
 					"optional": true
 				},
 				"core-util-is": {
 					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+					"resolved": false,
 					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
 					"dev": true,
 					"optional": true
@@ -15009,21 +14978,21 @@
 				},
 				"deep-extend": {
 					"version": "0.6.0",
-					"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
 					"dev": true,
 					"optional": true
 				},
 				"delegates": {
 					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
 					"dev": true,
 					"optional": true
 				},
 				"detect-libc": {
 					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+					"resolved": false,
 					"integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
 					"dev": true,
 					"optional": true
@@ -15040,14 +15009,14 @@
 				},
 				"fs.realpath": {
 					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
 					"dev": true,
 					"optional": true
 				},
 				"gauge": {
 					"version": "2.7.4",
-					"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+					"resolved": false,
 					"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
 					"dev": true,
 					"optional": true,
@@ -15079,14 +15048,14 @@
 				},
 				"has-unicode": {
 					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
 					"dev": true,
 					"optional": true
 				},
 				"iconv-lite": {
 					"version": "0.4.24",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+					"resolved": false,
 					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
 					"dev": true,
 					"optional": true,
@@ -15106,7 +15075,7 @@
 				},
 				"inflight": {
 					"version": "1.0.6",
-					"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+					"resolved": false,
 					"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
 					"dev": true,
 					"optional": true,
@@ -15124,14 +15093,14 @@
 				},
 				"ini": {
 					"version": "1.3.5",
-					"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+					"resolved": false,
 					"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
 					"dev": true,
 					"optional": true
 				},
 				"is-fullwidth-code-point": {
 					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
 					"dev": true,
 					"optional": true,
@@ -15141,14 +15110,14 @@
 				},
 				"isarray": {
 					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
 					"dev": true,
 					"optional": true
 				},
 				"minimatch": {
 					"version": "3.0.4",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+					"resolved": false,
 					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
 					"dev": true,
 					"optional": true,
@@ -15158,7 +15127,7 @@
 				},
 				"minimist": {
 					"version": "0.0.8",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+					"resolved": false,
 					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
 					"dev": true,
 					"optional": true
@@ -15186,7 +15155,7 @@
 				},
 				"mkdirp": {
 					"version": "0.5.1",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
 					"dev": true,
 					"optional": true,
@@ -15241,7 +15210,7 @@
 				},
 				"nopt": {
 					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
 					"dev": true,
 					"optional": true,
@@ -15270,7 +15239,7 @@
 				},
 				"npmlog": {
 					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+					"resolved": false,
 					"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
 					"dev": true,
 					"optional": true,
@@ -15283,21 +15252,21 @@
 				},
 				"number-is-nan": {
 					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
 					"dev": true,
 					"optional": true
 				},
 				"object-assign": {
 					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
 					"dev": true,
 					"optional": true
 				},
 				"once": {
 					"version": "1.4.0",
-					"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
 					"dev": true,
 					"optional": true,
@@ -15307,21 +15276,21 @@
 				},
 				"os-homedir": {
 					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+					"resolved": false,
 					"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
 					"dev": true,
 					"optional": true
 				},
 				"os-tmpdir": {
 					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+					"resolved": false,
 					"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
 					"dev": true,
 					"optional": true
 				},
 				"osenv": {
 					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+					"resolved": false,
 					"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
 					"dev": true,
 					"optional": true,
@@ -15332,7 +15301,7 @@
 				},
 				"path-is-absolute": {
 					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
 					"dev": true,
 					"optional": true
@@ -15346,7 +15315,7 @@
 				},
 				"rc": {
 					"version": "1.2.8",
-					"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+					"resolved": false,
 					"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
 					"dev": true,
 					"optional": true,
@@ -15359,7 +15328,7 @@
 					"dependencies": {
 						"minimist": {
 							"version": "1.2.0",
-							"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+							"resolved": false,
 							"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
 							"dev": true,
 							"optional": true
@@ -15368,7 +15337,7 @@
 				},
 				"readable-stream": {
 					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+					"resolved": false,
 					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
 					"dev": true,
 					"optional": true,
@@ -15394,21 +15363,21 @@
 				},
 				"safe-buffer": {
 					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+					"resolved": false,
 					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
 					"dev": true,
 					"optional": true
 				},
 				"safer-buffer": {
 					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+					"resolved": false,
 					"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
 					"dev": true,
 					"optional": true
 				},
 				"sax": {
 					"version": "1.2.4",
-					"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+					"resolved": false,
 					"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
 					"dev": true,
 					"optional": true
@@ -15422,21 +15391,21 @@
 				},
 				"set-blocking": {
 					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
 					"dev": true,
 					"optional": true
 				},
 				"signal-exit": {
 					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+					"resolved": false,
 					"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
 					"dev": true,
 					"optional": true
 				},
 				"string-width": {
 					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+					"resolved": false,
 					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
 					"dev": true,
 					"optional": true,
@@ -15448,7 +15417,7 @@
 				},
 				"string_decoder": {
 					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+					"resolved": false,
 					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 					"dev": true,
 					"optional": true,
@@ -15458,7 +15427,7 @@
 				},
 				"strip-ansi": {
 					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
 					"dev": true,
 					"optional": true,
@@ -15468,7 +15437,7 @@
 				},
 				"strip-json-comments": {
 					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
 					"dev": true,
 					"optional": true
@@ -15491,14 +15460,14 @@
 				},
 				"util-deprecate": {
 					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+					"resolved": false,
 					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
 					"dev": true,
 					"optional": true
 				},
 				"wide-align": {
 					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+					"resolved": false,
 					"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
 					"dev": true,
 					"optional": true,
@@ -15508,7 +15477,7 @@
 				},
 				"wrappy": {
 					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+					"resolved": false,
 					"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
 					"dev": true,
 					"optional": true
@@ -16447,8 +16416,7 @@
 		"hosted-git-info": {
 			"version": "2.7.1",
 			"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
-			"integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==",
-			"dev": true
+			"integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w=="
 		},
 		"hot-patcher": {
 			"version": "0.5.0",
@@ -17543,7 +17511,6 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
 			"integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
-			"dev": true,
 			"requires": {
 				"builtin-modules": "^1.0.0"
 			}
@@ -17806,8 +17773,7 @@
 		"is-string": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz",
-			"integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==",
-			"dev": true
+			"integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ=="
 		},
 		"is-supported-regexp-flag": {
 			"version": "1.0.1",
@@ -18916,7 +18882,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
 			"integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
-			"dev": true,
 			"requires": {
 				"graceful-fs": "^4.1.2",
 				"parse-json": "^2.2.0",
@@ -18927,8 +18892,7 @@
 				"pify": {
 					"version": "2.3.0",
 					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-					"dev": true
+					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
 				}
 			}
 		},
@@ -19871,7 +19835,7 @@
 			"dependencies": {
 				"asn1.js": {
 					"version": "4.10.1",
-					"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+					"resolved": false,
 					"integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
 					"requires": {
 						"bn.js": "^4.0.0",
@@ -19881,7 +19845,7 @@
 				},
 				"assert": {
 					"version": "1.4.1",
-					"resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
 					"requires": {
 						"util": "0.10.3"
@@ -19889,7 +19853,7 @@
 					"dependencies": {
 						"util": {
 							"version": "0.10.3",
-							"resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+							"resolved": false,
 							"integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
 							"requires": {
 								"inherits": "2.0.1"
@@ -19899,22 +19863,22 @@
 				},
 				"base64-js": {
 					"version": "1.3.0",
-					"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="
 				},
 				"bn.js": {
 					"version": "4.11.8",
-					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+					"resolved": false,
 					"integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
 				},
 				"brorand": {
 					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
 				},
 				"browserify-aes": {
 					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
 					"requires": {
 						"buffer-xor": "^1.0.3",
@@ -19927,7 +19891,7 @@
 				},
 				"browserify-cipher": {
 					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
 					"requires": {
 						"browserify-aes": "^1.0.4",
@@ -19937,7 +19901,7 @@
 				},
 				"browserify-des": {
 					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+					"resolved": false,
 					"integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
 					"requires": {
 						"cipher-base": "^1.0.1",
@@ -19948,7 +19912,7 @@
 				},
 				"browserify-rsa": {
 					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
 					"requires": {
 						"bn.js": "^4.1.0",
@@ -19957,7 +19921,7 @@
 				},
 				"browserify-sign": {
 					"version": "4.0.4",
-					"resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
+					"resolved": false,
 					"integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
 					"requires": {
 						"bn.js": "^4.1.1",
@@ -19971,7 +19935,7 @@
 				},
 				"browserify-zlib": {
 					"version": "0.2.0",
-					"resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
 					"requires": {
 						"pako": "~1.0.5"
@@ -19979,7 +19943,7 @@
 				},
 				"buffer": {
 					"version": "5.2.1",
-					"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz",
+					"resolved": false,
 					"integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==",
 					"requires": {
 						"base64-js": "^1.0.2",
@@ -19988,17 +19952,17 @@
 				},
 				"buffer-xor": {
 					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+					"resolved": false,
 					"integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
 				},
 				"builtin-status-codes": {
 					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug="
 				},
 				"cipher-base": {
 					"version": "1.0.4",
-					"resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+					"resolved": false,
 					"integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
 					"requires": {
 						"inherits": "^2.0.1",
@@ -20007,7 +19971,7 @@
 				},
 				"console-browserify": {
 					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
 					"requires": {
 						"date-now": "^0.1.4"
@@ -20015,17 +19979,17 @@
 				},
 				"constants-browserify": {
 					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U="
 				},
 				"core-util-is": {
 					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+					"resolved": false,
 					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
 				},
 				"create-ecdh": {
 					"version": "4.0.3",
-					"resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
+					"resolved": false,
 					"integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
 					"requires": {
 						"bn.js": "^4.1.0",
@@ -20034,7 +19998,7 @@
 				},
 				"create-hash": {
 					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
 					"requires": {
 						"cipher-base": "^1.0.1",
@@ -20046,7 +20010,7 @@
 				},
 				"create-hmac": {
 					"version": "1.1.7",
-					"resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+					"resolved": false,
 					"integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
 					"requires": {
 						"cipher-base": "^1.0.3",
@@ -20059,7 +20023,7 @@
 				},
 				"crypto-browserify": {
 					"version": "3.12.0",
-					"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
 					"requires": {
 						"browserify-cipher": "^1.0.0",
@@ -20077,12 +20041,12 @@
 				},
 				"date-now": {
 					"version": "0.1.4",
-					"resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
+					"resolved": false,
 					"integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs="
 				},
 				"des.js": {
 					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
 					"requires": {
 						"inherits": "^2.0.1",
@@ -20091,7 +20055,7 @@
 				},
 				"diffie-hellman": {
 					"version": "5.0.3",
-					"resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+					"resolved": false,
 					"integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
 					"requires": {
 						"bn.js": "^4.1.0",
@@ -20101,12 +20065,12 @@
 				},
 				"domain-browser": {
 					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="
 				},
 				"elliptic": {
 					"version": "6.4.1",
-					"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz",
+					"resolved": false,
 					"integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
 					"requires": {
 						"bn.js": "^4.4.0",
@@ -20120,12 +20084,12 @@
 				},
 				"events": {
 					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA=="
 				},
 				"evp_bytestokey": {
 					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+					"resolved": false,
 					"integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
 					"requires": {
 						"md5.js": "^1.3.4",
@@ -20134,7 +20098,7 @@
 				},
 				"hash-base": {
 					"version": "3.0.4",
-					"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+					"resolved": false,
 					"integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
 					"requires": {
 						"inherits": "^2.0.1",
@@ -20143,7 +20107,7 @@
 				},
 				"hash.js": {
 					"version": "1.1.7",
-					"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+					"resolved": false,
 					"integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
 					"requires": {
 						"inherits": "^2.0.3",
@@ -20152,14 +20116,14 @@
 					"dependencies": {
 						"inherits": {
 							"version": "2.0.3",
-							"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+							"resolved": false,
 							"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
 						}
 					}
 				},
 				"hmac-drbg": {
 					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
 					"requires": {
 						"hash.js": "^1.0.3",
@@ -20169,27 +20133,27 @@
 				},
 				"https-browserify": {
 					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM="
 				},
 				"ieee754": {
 					"version": "1.1.13",
-					"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+					"resolved": false,
 					"integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
 				},
 				"inherits": {
 					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
 				},
 				"isarray": {
 					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
 				},
 				"md5.js": {
 					"version": "1.3.5",
-					"resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+					"resolved": false,
 					"integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
 					"requires": {
 						"hash-base": "^3.0.0",
@@ -20199,7 +20163,7 @@
 				},
 				"miller-rabin": {
 					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
 					"requires": {
 						"bn.js": "^4.0.0",
@@ -20208,27 +20172,27 @@
 				},
 				"minimalistic-assert": {
 					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
 				},
 				"minimalistic-crypto-utils": {
 					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
 				},
 				"os-browserify": {
 					"version": "0.3.0",
-					"resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc="
 				},
 				"pako": {
 					"version": "1.0.10",
-					"resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
+					"resolved": false,
 					"integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw=="
 				},
 				"parse-asn1": {
 					"version": "5.1.4",
-					"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz",
+					"resolved": false,
 					"integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
 					"requires": {
 						"asn1.js": "^4.0.0",
@@ -20241,12 +20205,12 @@
 				},
 				"path-browserify": {
 					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-Hkavx/nY4/plImrZPHRk2CL9vpOymZLgEbMNX1U0bjcBL7QN9wODxyx0yaMZURSQaUtSEvDrfAvxa9oPb0at9g=="
 				},
 				"pbkdf2": {
 					"version": "3.0.17",
-					"resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
+					"resolved": false,
 					"integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
 					"requires": {
 						"create-hash": "^1.1.2",
@@ -20258,17 +20222,17 @@
 				},
 				"process": {
 					"version": "0.11.10",
-					"resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+					"resolved": false,
 					"integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
 				},
 				"process-nextick-args": {
 					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
 				},
 				"public-encrypt": {
 					"version": "4.0.3",
-					"resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+					"resolved": false,
 					"integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
 					"requires": {
 						"bn.js": "^4.1.0",
@@ -20281,22 +20245,22 @@
 				},
 				"punycode": {
 					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+					"resolved": false,
 					"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
 				},
 				"querystring": {
 					"version": "0.2.0",
-					"resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
 				},
 				"querystring-es3": {
 					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM="
 				},
 				"randombytes": {
 					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
 					"requires": {
 						"safe-buffer": "^5.1.0"
@@ -20304,7 +20268,7 @@
 				},
 				"randomfill": {
 					"version": "1.0.4",
-					"resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+					"resolved": false,
 					"integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
 					"requires": {
 						"randombytes": "^2.0.5",
@@ -20313,7 +20277,7 @@
 				},
 				"readable-stream": {
 					"version": "3.3.0",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.3.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==",
 					"requires": {
 						"inherits": "^2.0.3",
@@ -20323,14 +20287,14 @@
 					"dependencies": {
 						"inherits": {
 							"version": "2.0.3",
-							"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+							"resolved": false,
 							"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
 						}
 					}
 				},
 				"ripemd160": {
 					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+					"resolved": false,
 					"integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
 					"requires": {
 						"hash-base": "^3.0.0",
@@ -20339,17 +20303,17 @@
 				},
 				"safe-buffer": {
 					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+					"resolved": false,
 					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
 				},
 				"setimmediate": {
 					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+					"resolved": false,
 					"integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
 				},
 				"sha.js": {
 					"version": "2.4.11",
-					"resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+					"resolved": false,
 					"integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
 					"requires": {
 						"inherits": "^2.0.1",
@@ -20358,7 +20322,7 @@
 				},
 				"stream-browserify": {
 					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+					"resolved": false,
 					"integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
 					"requires": {
 						"inherits": "~2.0.1",
@@ -20367,7 +20331,7 @@
 					"dependencies": {
 						"readable-stream": {
 							"version": "2.3.6",
-							"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+							"resolved": false,
 							"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
 							"requires": {
 								"core-util-is": "~1.0.0",
@@ -20381,14 +20345,14 @@
 							"dependencies": {
 								"inherits": {
 									"version": "2.0.3",
-									"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+									"resolved": false,
 									"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
 								}
 							}
 						},
 						"string_decoder": {
 							"version": "1.1.1",
-							"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+							"resolved": false,
 							"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 							"requires": {
 								"safe-buffer": "~5.1.0"
@@ -20398,7 +20362,7 @@
 				},
 				"stream-http": {
 					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-JELJfd+btL9GHtxU3+XXhg9NLYrKFnhybfvRuDghtyVkOFydz3PKNT1df07AMr88qW03WHF+FSV0PySpXignCA==",
 					"requires": {
 						"builtin-status-codes": "^3.0.0",
@@ -20409,7 +20373,7 @@
 				},
 				"string_decoder": {
 					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==",
 					"requires": {
 						"safe-buffer": "~5.1.0"
@@ -20417,7 +20381,7 @@
 				},
 				"timers-browserify": {
 					"version": "2.0.10",
-					"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
+					"resolved": false,
 					"integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
 					"requires": {
 						"setimmediate": "^1.0.4"
@@ -20425,12 +20389,12 @@
 				},
 				"tty-browserify": {
 					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw=="
 				},
 				"url": {
 					"version": "0.11.0",
-					"resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
 					"requires": {
 						"punycode": "1.3.2",
@@ -20439,14 +20403,14 @@
 					"dependencies": {
 						"punycode": {
 							"version": "1.3.2",
-							"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+							"resolved": false,
 							"integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
 						}
 					}
 				},
 				"util": {
 					"version": "0.11.1",
-					"resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+					"resolved": false,
 					"integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
 					"requires": {
 						"inherits": "2.0.3"
@@ -20454,24 +20418,24 @@
 					"dependencies": {
 						"inherits": {
 							"version": "2.0.3",
-							"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+							"resolved": false,
 							"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
 						}
 					}
 				},
 				"util-deprecate": {
 					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+					"resolved": false,
 					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
 				},
 				"vm-browserify": {
 					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw=="
 				},
 				"xtend": {
 					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
 				}
 			}
@@ -21669,7 +21633,6 @@
 			"version": "2.4.0",
 			"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
 			"integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
-			"dev": true,
 			"requires": {
 				"hosted-git-info": "^2.1.4",
 				"is-builtin-module": "^1.0.0",
@@ -21833,8 +21796,7 @@
 		"object-inspect": {
 			"version": "1.7.0",
 			"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
-			"integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
-			"dev": true
+			"integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="
 		},
 		"object-is": {
 			"version": "1.0.2",
@@ -21865,7 +21827,6 @@
 			"version": "4.1.0",
 			"resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
 			"integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-			"dev": true,
 			"requires": {
 				"define-properties": "^1.1.2",
 				"function-bind": "^1.1.1",
@@ -22309,7 +22270,6 @@
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
 			"integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-			"dev": true,
 			"requires": {
 				"error-ex": "^1.2.0"
 			}
@@ -22351,8 +22311,7 @@
 		"path-exists": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-			"integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-			"dev": true
+			"integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
 		},
 		"path-is-absolute": {
 			"version": "1.0.1",
@@ -22373,8 +22332,7 @@
 		"path-parse": {
 			"version": "1.0.6",
 			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-			"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
-			"dev": true
+			"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
 		},
 		"path-posix": {
 			"version": "1.0.0",
@@ -22586,7 +22544,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
 			"integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
-			"dev": true,
 			"requires": {
 				"find-up": "^2.1.0"
 			},
@@ -22595,7 +22552,6 @@
 					"version": "2.1.0",
 					"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
 					"integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-					"dev": true,
 					"requires": {
 						"locate-path": "^2.0.0"
 					}
@@ -22604,7 +22560,6 @@
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
 					"integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-					"dev": true,
 					"requires": {
 						"p-locate": "^2.0.0",
 						"path-exists": "^3.0.0"
@@ -22614,7 +22569,6 @@
 					"version": "1.3.0",
 					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
 					"integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-					"dev": true,
 					"requires": {
 						"p-try": "^1.0.0"
 					}
@@ -22623,7 +22577,6 @@
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
 					"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-					"dev": true,
 					"requires": {
 						"p-limit": "^1.1.0"
 					}
@@ -22631,8 +22584,7 @@
 				"p-try": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-					"integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-					"dev": true
+					"integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
 				}
 			}
 		},
@@ -25003,7 +24955,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
 			"integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
-			"dev": true,
 			"requires": {
 				"load-json-file": "^2.0.0",
 				"normalize-package-data": "^2.3.2",
@@ -25014,7 +24965,6 @@
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
 					"integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
-					"dev": true,
 					"requires": {
 						"pify": "^2.0.0"
 					}
@@ -25022,8 +24972,7 @@
 				"pify": {
 					"version": "2.3.0",
 					"resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-					"dev": true
+					"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw="
 				}
 			}
 		},
@@ -25031,7 +24980,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
 			"integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
-			"dev": true,
 			"requires": {
 				"find-up": "^2.0.0",
 				"read-pkg": "^2.0.0"
@@ -25041,7 +24989,6 @@
 					"version": "2.1.0",
 					"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
 					"integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
-					"dev": true,
 					"requires": {
 						"locate-path": "^2.0.0"
 					}
@@ -25050,7 +24997,6 @@
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
 					"integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
-					"dev": true,
 					"requires": {
 						"p-locate": "^2.0.0",
 						"path-exists": "^3.0.0"
@@ -25060,7 +25006,6 @@
 					"version": "1.3.0",
 					"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
 					"integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
-					"dev": true,
 					"requires": {
 						"p-try": "^1.0.0"
 					}
@@ -25069,7 +25014,6 @@
 					"version": "2.0.0",
 					"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
 					"integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
-					"dev": true,
 					"requires": {
 						"p-limit": "^1.1.0"
 					}
@@ -25077,8 +25021,7 @@
 				"p-try": {
 					"version": "1.0.0",
 					"resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
-					"integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
-					"dev": true
+					"integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M="
 				}
 			}
 		},
@@ -26521,7 +26464,6 @@
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.2.tgz",
 			"integrity": "sha512-q9hedtzyXHr5S0A1vEPoK/7l8NpfkFYTq6iCY+Pno2ZbdZR6WexZFtqeVGkGxW3TEJMN914Z55EnAGMmenlIQQ==",
-			"dev": true,
 			"requires": {
 				"spdx-expression-parse": "^3.0.0",
 				"spdx-license-ids": "^3.0.0"
@@ -26530,14 +26472,12 @@
 		"spdx-exceptions": {
 			"version": "2.2.0",
 			"resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
-			"integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
-			"dev": true
+			"integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="
 		},
 		"spdx-expression-parse": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
 			"integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
-			"dev": true,
 			"requires": {
 				"spdx-exceptions": "^2.1.0",
 				"spdx-license-ids": "^3.0.0"
@@ -26546,8 +26486,7 @@
 		"spdx-license-ids": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.2.tgz",
-			"integrity": "sha512-qky9CVt0lVIECkEsYbNILVnPvycuEBkXoMFLRWsREkomQLevYhtRKC+R91a5TOAQ3bCMjikRwhyaRqj1VYatYg==",
-			"dev": true
+			"integrity": "sha512-qky9CVt0lVIECkEsYbNILVnPvycuEBkXoMFLRWsREkomQLevYhtRKC+R91a5TOAQ3bCMjikRwhyaRqj1VYatYg=="
 		},
 		"speakeasy": {
 			"version": "2.0.0",
@@ -27114,7 +27053,6 @@
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz",
 			"integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==",
-			"dev": true,
 			"requires": {
 				"define-properties": "^1.1.3",
 				"function-bind": "^1.1.1"
@@ -27124,7 +27062,6 @@
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz",
 			"integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==",
-			"dev": true,
 			"requires": {
 				"define-properties": "^1.1.3",
 				"function-bind": "^1.1.1"
@@ -27161,8 +27098,7 @@
 		"strip-bom": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-			"integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-			"dev": true
+			"integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
 		},
 		"strip-color": {
 			"version": "0.1.0",
@@ -29164,7 +29100,6 @@
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
 			"integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-			"dev": true,
 			"requires": {
 				"spdx-correct": "^3.0.0",
 				"spdx-expression-parse": "^3.0.0"
diff --git a/package.json b/package.json
index cb3ff0f6100a..266c74603f99 100644
--- a/package.json
+++ b/package.json
@@ -26,8 +26,9 @@
 		"debug": "meteor run --inspect",
 		"debug-brk": "meteor run --inspect-brk",
 		"lint": "meteor npm run stylelint && meteor npm run eslint",
-		"jslint": "npm run eslint",
-		"eslint": "eslint --ext .js,.ts,.jsx,.tsx .",
+		"jslint": "eslint --ext .js,.jsx .",
+		"tslint": "eslint --ext .ts,.tsx .",
+		"eslint": "meteor npm run jslint && meteor npm run tslint",
 		"stylelint": "stylelint \"app/**/*.css\" \"client/**/*.css\"",
 		"deploy": "npm run build && pm2 startOrRestart pm2.json",
 		"postinstall": "node .scripts/npm-postinstall.js",
@@ -156,6 +157,7 @@
 		"csv-parse": "^4.0.1",
 		"emailreplyparser": "^0.0.5",
 		"emojione": "^4.5.0",
+		"eslint-plugin-import": "^2.19.1",
 		"express": "^4.16.4",
 		"express-session": "^1.15.4",
 		"fibers": "4.0.3",
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 603253539bd4..bab0b1082f1d 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -203,11 +203,21 @@
   "Accounts_Directory_DefaultView": "Default Directory Listing",
   "Accounts_SetDefaultAvatar": "Set Default Avatar",
   "Accounts_SetDefaultAvatar_Description": "Tries to determine default avatar based on OAuth Account or Gravatar",
+  "Accounts_Set_Email_Of_External_Accounts_as_Verified": "Set email of external accounts as verified",
+  "Accounts_Set_Email_Of_External_Accounts_as_Verified_Description": "Accounts created from external services, like LDAP, OAth, etc, will have their emails verified automatically",
   "Accounts_ShowFormLogin": "Show Default Login Form",
-  "Accounts_TwoFactorAuthentication_Enabled": "Enable Two Factor Authentication",
+  "Accounts_TwoFactorAuthentication_By_Email_Enabled": "Enable Two Factor Authentication via Email",
+  "Accounts_TwoFactorAuthentication_By_Email_Enabled_Description": "Users with email verified and the option enabled in their profile page will receive an email with a temporary code to authorize certain actions like login, save the profile, etc.",
+  "Accounts_TwoFactorAuthentication_By_Email_Auto_Opt_In": "Auto opt in new users for Two Factor via Email",
+  "Accounts_TwoFactorAuthentication_By_Email_Auto_Opt_In_Description": "New users will have the Two Factor Authentication via Email enabled by default. They will be able to disable it in their profile page.",
+  "Accounts_TwoFactorAuthentication_By_Email_Code_Expiration": "Time to expire the code sent via email in seconds",
+  "Accounts_TwoFactorAuthentication_Enabled": "Enable Two Factor Authentication via TOTP",
+  "Accounts_TwoFactorAuthentication_Enabled_Description": "Users can setup their Two Factor Authentication using any TOTP app, like Google Authenticator or Authy",
   "Accounts_TwoFactorAuthentication_MaxDelta": "Maximum Delta",
   "Accounts_UserAddedEmail_Default": "<h1>Welcome to <strong>[Site_Name]</strong></h1><p>Go to <a href=\"[Site_URL]\">[Site_URL]</a> and try the best open source chat solution available today!</p><p>You may login using your email: [email] and password: [password]. You may be required to change it after your first login.",
   "Accounts_TwoFactorAuthentication_MaxDelta_Description": "The Maximum Delta determines how many tokens are valid at any given time. Tokens are generated every 30 seconds, and are valid for (30 * Maximum Delta) seconds. <br/>Example: With a Maximum Delta set to 10, each token can be used up to 300 seconds before or after it's timestamp. This is useful when the client's clock is not properly synced with the server.",
+  "Accounts_TwoFactorAuthentication_RememberFor": "Remember Two Factor for (seconds)",
+  "Accounts_TwoFactorAuthentication_RememberFor_Description": "Do not request two factor authorization code if it was already provided before in the given time.",
   "Accounts_UseDefaultBlockedDomainsList": "Use Default Blocked Domains List",
   "Accounts_UseDNSDomainCheck": "Use DNS Domain Check",
   "Accounts_UserAddedEmailSubject_Default": "You have been added to [Site_Name]",
@@ -1141,7 +1151,8 @@
   "Directory": "Directory",
   "Disable_Facebook_integration": "Disable Facebook integration",
   "Disable_Notifications": "Disable Notifications",
-  "Disable_two-factor_authentication": "Disable two-factor authentication",
+  "Disable_two-factor_authentication": "Disable two-factor authentication via TOTP",
+  "Disable_two-factor_authentication_email": "Disable two-factor authentication via Email",
   "Disabled": "Disabled",
   "Disallow_reacting": "Disallow Reacting",
   "Disallow_reacting_Description": "Disallows reacting",
@@ -1178,6 +1189,7 @@
   "Download_My_Data": "Download My Data (HTML)",
   "Download_Pending_Files": "Download Pending Files",
   "Download_Snippet": "Download",
+  "Do_not_provide_this_code_to_anyone": "Do not provide this code to anyone.",
   "Drop_to_upload_file": "Drop to upload file",
   "Dry_run": "Dry run",
   "Dry_run_description": "Will only send one email, to the same address as in From. The email must belong to a valid user.",
@@ -1258,7 +1270,8 @@
   "Enable_Desktop_Notifications": "Enable Desktop Notifications",
   "Enable_inquiry_fetch_by_stream": "Enable inquiry data fetch from server using a stream",
   "Enable_Svg_Favicon": "Enable SVG favicon",
-  "Enable_two-factor_authentication": "Enable two-factor authentication",
+  "Enable_two-factor_authentication": "Enable two-factor authentication via TOTP",
+  "Enable_two-factor_authentication_email": "Enable two-factor authentication via Email",
   "Enabled": "Enabled",
   "Encrypted": "Encrypted",
   "Encrypted_channel_Description": "End to end encrypted channel. Search will not work with encrypted channels and notifications may not show the messages content.",
@@ -1623,6 +1636,7 @@
   "Header": "Header",
   "Header_and_Footer": "Header and Footer",
   "Healthcare_and_Pharmaceutical": "Healthcare/Pharmaceutical",
+  "Here_is_your_authentication_code": "Here is your authentication code:",
   "Help_Center": "Help Center",
   "Helpers": "Helpers",
   "Hex_Color_Preview": "Hex Color Preview",
@@ -1666,6 +1680,7 @@
   "If_you_are_sure_type_in_your_username": "If you are sure type in your username:",
   "If_you_dont_have_one_send_an_email_to_omni_rocketchat_to_get_yours": "If you don't have one send an email to [omni@rocket.chat](mailto:omni@rocket.chat) to get yours.",
   "If_you_didnt_ask_for_reset_ignore_this_email": "If you didn't ask for your password reset, you can ignore this email.",
+  "If_you_didnt_try_to_login_in_your_account_please_ignore_this_email": "If you didn't try to login in your account please ignore this email.",
   "Iframe_Integration": "Iframe Integration",
   "Iframe_Integration_receive_enable": "Enable Receive",
   "Iframe_Integration_receive_enable_Description": "Allow parent window to send commands to Rocket.Chat.",
@@ -2746,6 +2761,7 @@
   "Request_comment_when_closing_conversation": "Request comment when closing conversation",
   "Request_comment_when_closing_conversation_description": "If enabled, the agent will need to set a comment before the conversation is closed.",
   "Request_tag_before_closing_chat": "Request tag(s) before closing conversation",
+  "Require": "Require",
   "Require_all_tokens": "Require all tokens",
   "Require_any_token": "Require any token",
   "Require_password_change": "Require password change",
@@ -2925,6 +2941,7 @@
   "Send_invitation_email_error": "You haven't provided any valid email address.",
   "Send_invitation_email_info": "You can send multiple email invitations at once.",
   "Send_invitation_email_success": "You have successfully sent an invitation email to the following addresses:",
+  "Send_me_the_code_again": "Send me the code again",
   "Send_request_on_agent_message": "Send Request on Agent Messages",
   "Send_request_on_chat_close": "Send Request on Chat Close",
   "Send_request_on_lead_capture": "Send request on lead capture",
@@ -3269,6 +3286,8 @@
   "Total_messages": "Total Messages",
   "Total_Threads": "Total Threads",
   "Total_visitors": "Total Visitors",
+  "totp-invalid": "Code or password invalid",
+  "TOTP Invalid [totp-invalid]": "Code or password invalid",
   "Tourism": "Tourism",
   "Transcript_Enabled": "Ask Visitor if They Would Like a Transcript After Chat Closed",
   "Transcript_message": "Message to Show When Asking About Transcript",
@@ -3286,11 +3305,13 @@
   "Turn_OFF": "Turn OFF",
   "Turn_ON": "Turn ON",
   "Two Factor Authentication": "Two Factor Authentication",
-  "Two-factor_authentication": "Two-factor authentication",
+  "Two-factor_authentication": "Two-factor authentication via TOTP",
+  "Two-factor_authentication_email": "Two-factor authentication via Email",
   "Two-factor_authentication_disabled": "Two-factor authentication disabled",
   "Two-factor_authentication_enabled": "Two-factor authentication enabled",
-  "Two-factor_authentication_is_currently_disabled": "Two-factor authentication is currently disabled",
+  "Two-factor_authentication_is_currently_disabled": "Two-factor authentication via TOTP is currently disabled",
   "Two-factor_authentication_native_mobile_app_warning": "WARNING: Once you enable this, you will not be able to login on the native mobile apps (Rocket.Chat+) using your password until they implement the 2FA.",
+  "Two-factor_authentication_email_is_currently_disabled": "Two-factor authentication via Email is currently disabled",
   "Type": "Type",
   "Type_your_email": "Type your email",
   "Type_your_job_title": "Type your job title",
@@ -3471,6 +3492,7 @@
   "Verified": "Verified",
   "Verify": "Verify",
   "Verify_your_email": "Verify your email",
+  "Verify_your_email_for_the_code_we_sent": "Verify your email for the code we sent",
   "Version": "Version",
   "Videos": "Videos",
   "Video Conference": "Video Conference",
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index dd10552a41b0..0a31cffc3310 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -196,10 +196,18 @@
   "Accounts_SetDefaultAvatar": "Definir Avatar Padrão",
   "Accounts_SetDefaultAvatar_Description": "Tenta determinar o avatar padrão com base em OAuth Account ou Gravatar",
   "Accounts_ShowFormLogin": "Mostrar formulário de login padrão",
-  "Accounts_TwoFactorAuthentication_Enabled": "Ativar autenticação de dois fatores",
+  "Accounts_TwoFactorAuthentication_By_Email_Enabled": "Ativar autenticação de dois fatores por Email",
+  "Accounts_TwoFactorAuthentication_By_Email_Enabled_Description": "Usuários com email verificado e com a opção habilitada em seu perfil receberão um email com um código temporário para autorizar certas ações como o login, salvar o perfil, etc.",
+  "Accounts_TwoFactorAuthentication_By_Email_Auto_Opt_In": "Auto ativar a autenticação de duas etapas via email para novos usuários",
+  "Accounts_TwoFactorAuthentication_By_Email_Auto_Opt_In_Description": "Novos usuários terão a autenticação por duas etapas via email ativada por padrão. Eles poderão desabilitá-la em sua página de perfil.",
+  "Accounts_TwoFactorAuthentication_By_Email_Code_Expiration": "Tempo para expirar o código enviado por email (em segundos)",
+  "Accounts_TwoFactorAuthentication_Enabled": "Ativar autenticação de dois fatores por TOTP",
+  "Accounts_TwoFactorAuthentication_Enabled_Description": "Os usuários podem configurar sua autenticação de dois fatores usando qualquer aplicativo de TOTP, como o Google Authenticator ou o Authy",
   "Accounts_TwoFactorAuthentication_MaxDelta": "Delta máximo",
   "Accounts_UserAddedEmail_Default": "<h1>Bem-vindo ao <strong>[Site_Name]</strong></h1>.<p> Vá para <a href=\"[Site_URL]\">[Site_URL]</a> e experimente a melhor solução de chat com código aberto da atualidade! </p><p> Você pode fazer o login usando seu e-mail: [email] e senha: [password]. Pode ser pedida a mudança da senha após o seu primeiro login.",
   "Accounts_TwoFactorAuthentication_MaxDelta_Description": "O Delta máximo determina quantos tokens são válidos em qualquer momento. Os tokens são gerados a cada 30 segundos e são válidos por (30 * Delta máximo) segundos. <br/>Exemplo: com um Delta máximo configurado para 10, cada token pode ser usado até 300 segundos antes ou depois do timestamp. Isso é útil quando o relógio do cliente não está corretamente sincronizado com o servidor.",
+  "Accounts_TwoFactorAuthentication_RememberFor": "Lembrar a autenticação por (segundos)",
+  "Accounts_TwoFactorAuthentication_RememberFor_Description": "Não requisitar a autenticação de dois fatores se já requisitada anteriormente dentro do tempo determinado.",
   "Accounts_UseDefaultBlockedDomainsList": "Use Lista Padrão de Domínios Bloqueados",
   "Accounts_UseDNSDomainCheck": "Use verificação de Domínio DNS",
   "Accounts_UserAddedEmailSubject_Default": "Você foi adicionado ao [Site_Name]",
@@ -1066,7 +1074,8 @@
   "Directory": "Diretório",
   "Disable_Facebook_integration": "Desabilitar a integração do Facebook",
   "Disable_Notifications": "Desativar as notificações",
-  "Disable_two-factor_authentication": "Desativar a autenticação de dois fatores",
+  "Disable_two-factor_authentication": "Desativar a autenticação de dois fatores por TOTP",
+  "Disable_two-factor_authentication_email": "Desativar a autenticação de dois fatores por Email",
   "Disabled": "Desativado",
   "Disallow_reacting": "Não permitir reagir",
   "Disallow_reacting_Description": "Não permite reagir",
@@ -1098,6 +1107,7 @@
   "Downloading_file_from_external_URL": "Baixar arquivo de URL externa",
   "Download_My_Data": "Baixar meus dados (HTML)",
   "Download_Snippet": "Baixar",
+  "Do_not_provide_this_code_to_anyone": "Não forneça este código para ninguém.",
   "Drop_to_upload_file": "Largue para enviar arquivos",
   "Dry_run": "Simulação",
   "Dry_run_description": "Enviará apenas um e-mail, para o mesmo endereço definido em 'De'. O e-mail deve pertencer a um usuário válido.",
@@ -1166,7 +1176,8 @@
   "Enable_Desktop_Notifications": "Habilitar Notificações Desktop",
   "Enable_inquiry_fetch_by_stream": "Habilitar carga de dados de novos inquéritos de omnichannel utilizando stream",
   "Enable_Svg_Favicon": "Ativar SVG favicon",
-  "Enable_two-factor_authentication": "Ativar autenticação de dois fatores",
+  "Enable_two-factor_authentication": "Ativar autenticação de dois fatores por TOTP",
+  "Enable_two-factor_authentication_email": "Enable two-factor authentication por Email",
   "Enabled": "Ativado",
   "Encrypted": "Criptografado",
   "Encrypted_channel_Description": "Canal criptografado de Ponta a ponta. A pesquisa não funcionará com canais criptografados e as notificações podem não mostrar o conteúdo das mensagens.",
@@ -1502,6 +1513,7 @@
   "Header": "Cabeçalho",
   "Header_and_Footer": "Cabeçalho e rodapé",
   "Healthcare_and_Pharmaceutical": "Saúde / Farmacêutica",
+  "Here_is_your_authentication_code": "Aqui está o seu código de autenticação:",
   "Help_Center": "Centro de ajuda",
   "Helpers": "Ajudantes",
   "Hex_Color_Preview": "Hex Color Preview",
@@ -1543,6 +1555,7 @@
   "If_you_are_sure_type_in_your_username": "Se você tem certeza, digite seu nome de usuário:",
   "If_you_dont_have_one_send_an_email_to_omni_rocketchat_to_get_yours": "Se você não tiver um, envie um e-mail para [omni@rocket.chat] (mailto: omni@rocket.chat) para obter o seu.",
   "If_you_didnt_ask_for_reset_ignore_this_email": "Se você não solicitou a redefinição de sua senha, ignore este e-mail.",
+  "If_you_didnt_try_to_login_in_your_account_please_ignore_this_email": "Por favor ignore este email se você não tentou entrar na sua conta.",
   "Iframe_Integration": "Integração do Iframe",
   "Iframe_Integration_receive_enable": "Habilitar Receber",
   "Iframe_Integration_receive_enable_Description": "Permitir que a janela pai envie comandos para Rocket.Chat.",
@@ -2506,6 +2519,7 @@
   "Request_comment_when_closing_conversation": "Solicitar comentário ao encerrar a conversa",
   "Request_comment_when_closing_conversation_description": "Se ativado, o agente precisará informar um comentário antes que a conversa seja encerrada.",
   "Request_tag_before_closing_chat": "Solicitar tag(s) antes de encerrar a conversa",
+  "Require": "Exigir",
   "Require_all_tokens": "Exigir todos os tokens",
   "Require_any_token": "Exigir qualquer token",
   "Require_password_change": "Exigir alteração de senha",
@@ -2667,6 +2681,7 @@
   "Send_invitation_email_error": "Você não forneceu um e-mail válido.",
   "Send_invitation_email_info": "Você pode enviar vários convites por e-mail de uma vez.",
   "Send_invitation_email_success": "Você enviou com sucesso um convite por e-mail para os seguintes endereços:",
+  "Send_me_the_code_again": "Envie-me o código novamente",
   "Send_request_on_agent_message": "Enviar requisição para mensagens do Agente",
   "Send_request_on_chat_close": "Enviar requisição ao fechar conversa",
   "Send_request_on_lead_capture": "Enviar solicitação sobre a captura de chumbo",
@@ -2980,6 +2995,8 @@
   "Total_messages": "Quantidade de Mensagens",
   "Total_Threads": "Total de Tópicos",
   "Total_visitors": "Total de visitantes",
+  "totp-invalid": "Código ou senha invalidos",
+  "TOTP Invalid [totp-invalid]": "Código ou senha invalidos",
   "Tourism": "Turismo",
   "Transcript_Enabled": "Pergunte ao visitante se eles gostariam de uma transcrição após o bate-papo fechado",
   "Transcript_message": "Mensagem para mostrar ao perguntar sobre Transcrição",
@@ -2996,11 +3013,13 @@
   "Turn_OFF": "Desligar",
   "Turn_ON": "Ligar",
   "Two Factor Authentication": "Autenticação de dois fatores",
-  "Two-factor_authentication": "Autenticação de dois fatores",
+  "Two-factor_authentication": "Autenticação de dois fatores por TOTP",
+  "Two-factor_authentication_email": "Autenticação de dois fatores por Email",
   "Two-factor_authentication_disabled": "Autenticação de dois fatores desativada",
   "Two-factor_authentication_enabled": "Autenticação de dois fatores ativada",
-  "Two-factor_authentication_is_currently_disabled": "A autenticação de dois fatores está atualmente desativada",
+  "Two-factor_authentication_is_currently_disabled": "A autenticação de dois fatores por TOTP está atualmente desativada",
   "Two-factor_authentication_native_mobile_app_warning": "AVISO: depois de ativar isso, você não poderá fazer login nos aplicativos móveis nativos (Rocket.Chat +) usando sua senha até implementar o 2FA.",
+  "Two-factor_authentication_email_is_currently_disabled": "A autenticação de dois fatores por Email está atualmente desativada",
   "Type": "Tipo",
   "Type_your_email": "Digite seu e-mail",
   "Type_your_job_title": "Digite o seu cargo",
@@ -3176,6 +3195,7 @@
   "Verified": "Verificado",
   "Verify": "Verificar",
   "Verify_your_email": "Verifique seu e-mail",
+  "Verify_your_email_for_the_code_we_sent": "Verifique o seu email pelo código que enviamos",
   "Version": "Versão",
   "Videos": "Vídeos",
   "Video Conference": "Vídeo Conferência",
@@ -3323,4 +3343,4 @@
   "Your_question": "A sua pergunta",
   "Your_server_link": "O link do seu servidor",
   "Your_workspace_is_ready": "O seu espaço de trabalho está pronto a usar 🎉"
-}
\ No newline at end of file
+}
diff --git a/packages/rocketchat-i18n/i18n/pt.i18n.json b/packages/rocketchat-i18n/i18n/pt.i18n.json
index 42c3e400642c..6cbc7aee7b23 100644
--- a/packages/rocketchat-i18n/i18n/pt.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt.i18n.json
@@ -203,6 +203,8 @@
   "Accounts_Directory_DefaultView": "Lista de directoria por defeito",
   "Accounts_SetDefaultAvatar": "Definir Avatar Padrão",
   "Accounts_SetDefaultAvatar_Description": "Tenta determinar o avatar padrão com base em OAuth Account ou Gravatar",
+  "Accounts_Set_Email_Of_External_Accounts_as_Verified": "Definir o email das contas externas como verificado",
+  "Accounts_Set_Email_Of_External_Accounts_as_Verified_Description": "Contas criadas por serviços externos, tais como LDAP, OAth, etc, terão o email definido como verificado automáticamente",
   "Accounts_ShowFormLogin": "Mostrar formulário de login",
   "Accounts_TwoFactorAuthentication_Enabled": "Activar autenticação com dois parâmetros",
   "Accounts_TwoFactorAuthentication_MaxDelta": "Delta máximo",
diff --git a/server/configuration/accounts_meld.js b/server/configuration/accounts_meld.js
index 139b1be0262b..e1415ccadc5e 100644
--- a/server/configuration/accounts_meld.js
+++ b/server/configuration/accounts_meld.js
@@ -1,6 +1,7 @@
 import _ from 'underscore';
 import { Accounts } from 'meteor/accounts-base';
 
+import { settings } from '../../app/settings/server';
 import { Users } from '../../app/models';
 
 const orig_updateOrCreateUserFromExternalService = Accounts.updateOrCreateUserFromExternalService;
@@ -36,7 +37,7 @@ Accounts.updateOrCreateUserFromExternalService = function(serviceName, serviceDa
 		if (user != null) {
 			const findQuery = {
 				address: serviceData.email,
-				verified: true,
+				verified: settings.get('Accounts_Verify_Email_For_External_Accounts'),
 			};
 
 			if (!_.findWhere(user.emails, findQuery)) {
diff --git a/server/lib/accounts.js b/server/lib/accounts.js
index fa771ce9cb64..1083c9e03be0 100644
--- a/server/lib/accounts.js
+++ b/server/lib/accounts.js
@@ -119,6 +119,8 @@ Accounts.onCreateUser(function(options, user = {}) {
 	}
 
 	if (user.services) {
+		const verified = settings.get('Accounts_Verify_Email_For_External_Accounts');
+
 		for (const service of Object.values(user.services)) {
 			if (!user.name) {
 				user.name = service.name || service.username;
@@ -127,7 +129,7 @@ Accounts.onCreateUser(function(options, user = {}) {
 			if (!user.emails && service.email) {
 				user.emails = [{
 					address: service.email,
-					verified: true,
+					verified,
 				}];
 			}
 		}
@@ -177,6 +179,14 @@ Accounts.insertUserDoc = _.wrap(Accounts.insertUserDoc, function(insertUserDoc,
 		user.type = 'user';
 	}
 
+	if (settings.get('Accounts_TwoFactorAuthentication_By_Email_Auto_Opt_In')) {
+		user.services = user.services || {};
+		user.services.email2fa = {
+			enabled: true,
+			changedAt: new Date(),
+		};
+	}
+
 	const _id = insertUserDoc.call(Accounts, options, user);
 
 	user = Meteor.users.findOne({
diff --git a/server/main.d.ts b/server/main.d.ts
new file mode 100644
index 000000000000..f248e333a28a
--- /dev/null
+++ b/server/main.d.ts
@@ -0,0 +1,40 @@
+/* eslint-disable @typescript-eslint/interface-name-prefix */
+declare module 'meteor/random' {
+	namespace Random {
+		function _randomString(numberOfChars: number, map: string): string;
+	}
+}
+
+declare module 'meteor/accounts-base' {
+	namespace Accounts {
+		function _bcryptRounds(): number;
+
+		function _getLoginToken(connectionId: string): string | undefined;
+	}
+}
+
+declare module 'meteor/meteor' {
+	type globalError = Error;
+	namespace Meteor {
+		interface ErrorStatic {
+			new (error: string | number, reason?: string, details?: any): Error;
+		}
+		interface Error extends globalError {
+			error: string | number;
+			reason?: string;
+			details?: any;
+		}
+
+		const server: any;
+
+		interface MethodThisType {
+			twoFactorChecked: boolean | undefined;
+		}
+	}
+}
+
+declare module 'meteor/rocketchat:tap-i18n' {
+	namespace TAPi18n {
+		function __(s: string, options: { lng: string }): string;
+	}
+}
diff --git a/server/methods/saveUserProfile.js b/server/methods/saveUserProfile.js
index f42dbe5671f8..9a1487a40a4b 100644
--- a/server/methods/saveUserProfile.js
+++ b/server/methods/saveUserProfile.js
@@ -5,9 +5,10 @@ import { Accounts } from 'meteor/accounts-base';
 import { saveCustomFields, passwordPolicy } from '../../app/lib';
 import { Users } from '../../app/models';
 import { settings as rcSettings } from '../../app/settings';
+import { twoFactorRequired } from '../../app/2fa/server/twoFactorRequired';
 
 Meteor.methods({
-	saveUserProfile(settings, customFields) {
+	saveUserProfile: twoFactorRequired(function(settings, customFields) {
 		check(settings, Object);
 		check(customFields, Match.Maybe(Object));
 
@@ -91,5 +92,5 @@ Meteor.methods({
 		}
 
 		return true;
-	},
+	}),
 });
diff --git a/server/startup/initialData.js b/server/startup/initialData.js
index 4f25be39dbaf..6974e3aa03e7 100644
--- a/server/startup/initialData.js
+++ b/server/startup/initialData.js
@@ -70,7 +70,7 @@ Meteor.startup(function() {
 						if (!Users.findOneByEmailAddress(process.env.ADMIN_EMAIL)) {
 							adminUser.emails = [{
 								address: process.env.ADMIN_EMAIL,
-								verified: true,
+								verified: process.env.ADMIN_EMAIL_VERIFIED === 'true',
 							}];
 
 							console.log(`Email: ${ process.env.ADMIN_EMAIL }`.green);
@@ -160,7 +160,7 @@ Meteor.startup(function() {
 				emails: [
 					{
 						address: 'rocketchat.internal.admin.test@rocket.chat',
-						verified: true,
+						verified: false,
 					},
 				],
 				status: 'offline',
diff --git a/server/startup/migrations/index.js b/server/startup/migrations/index.js
index 08e082dbebca..1dd59ebbd7cc 100644
--- a/server/startup/migrations/index.js
+++ b/server/startup/migrations/index.js
@@ -174,4 +174,5 @@ import './v173';
 import './v174';
 import './v175';
 import './v176';
+import './v177';
 import './xrun';
diff --git a/server/startup/migrations/v172.js b/server/startup/migrations/v172.js
index 3eb3ec0bfbaf..f2368b237ac9 100644
--- a/server/startup/migrations/v172.js
+++ b/server/startup/migrations/v172.js
@@ -5,7 +5,6 @@ import {
 	Settings,
 } from '../../../app/models';
 
-
 Migrations.add({
 	version: 172,
 	up() {
diff --git a/server/startup/migrations/v177.js b/server/startup/migrations/v177.js
new file mode 100644
index 000000000000..0b6916181241
--- /dev/null
+++ b/server/startup/migrations/v177.js
@@ -0,0 +1,16 @@
+import { Migrations } from '../../../app/migrations';
+import { Settings } from '../../../app/models/server';
+
+Migrations.add({
+	version: 177,
+	up() {
+		// Disable auto opt in for existent installations
+		Settings.upsert({
+			_id: 'Accounts_TwoFactorAuthentication_By_Email_Auto_Opt_In',
+		}, {
+			$set: {
+				value: false,
+			},
+		});
+	},
+});

From a102c6fb4b023c0970d4306ef0442a69757264b8 Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Thu, 19 Mar 2020 16:57:59 -0300
Subject: [PATCH 029/223] [NEW] Allow to set default department and location
 sharing on SMS / WhatsApp integration (#16557)

---
 app/livechat/imports/server/rest/sms.js       |  87 +++++++++------
 app/livechat/server/sendMessageBySMS.js       |   5 +
 app/models/server/models/LivechatRooms.js     |  10 ++
 app/sms/server/SMS.js                         |   5 +
 app/sms/server/services/twilio.js             |  18 ++-
 app/sms/server/settings.js                    |   4 +
 package-lock.json                             | 103 +++++++++++-------
 package.json                                  |   2 +-
 packages/rocketchat-i18n/i18n/en.i18n.json    |   3 +
 packages/rocketchat-i18n/i18n/pt-BR.i18n.json |   3 +
 10 files changed, 168 insertions(+), 72 deletions(-)

diff --git a/app/livechat/imports/server/rest/sms.js b/app/livechat/imports/server/rest/sms.js
index e4aebef2686d..5f600a0de73c 100644
--- a/app/livechat/imports/server/rest/sms.js
+++ b/app/livechat/imports/server/rest/sms.js
@@ -1,23 +1,75 @@
 import { Meteor } from 'meteor/meteor';
 import { Random } from 'meteor/random';
 
-import { LivechatRooms, LivechatVisitors } from '../../../../models';
+import { LivechatRooms, LivechatVisitors, LivechatDepartment } from '../../../../models';
 import { API } from '../../../../api';
 import { SMS } from '../../../../sms';
 import { Livechat } from '../../../server/lib/Livechat';
 
+const defineDepartment = (idOrName) => {
+	if (!idOrName || idOrName === '') {
+		return;
+	}
+
+	const department = LivechatDepartment.findOneByIdOrName(idOrName);
+	return department && department._id;
+};
+
+const defineVisitor = (smsNumber) => {
+	const visitor = LivechatVisitors.findOneVisitorByPhone(smsNumber);
+	let data = {
+		token: (visitor && visitor.token) || Random.id(),
+	};
+
+	if (!visitor) {
+		data = Object.assign(data, {
+			username: smsNumber.replace(/[^0-9]/g, ''),
+			phone: {
+				number: smsNumber,
+			},
+		});
+	}
+
+	const department = defineDepartment(SMS.department);
+	if (department) {
+		data.department = department;
+	}
+
+	const id = Livechat.registerGuest(data);
+	return LivechatVisitors.findOneById(id);
+};
+
+const normalizeLocationSharing = (payload) => {
+	const { extra: { fromLatitude: latitude, fromLongitude: longitude } } = payload;
+	if (!latitude || !longitude) {
+		return;
+	}
+
+	return {
+		type: 'Point',
+		coordinates: [parseFloat(longitude), parseFloat(latitude)],
+	};
+};
+
 API.v1.addRoute('livechat/sms-incoming/:service', {
 	post() {
 		const SMSService = SMS.getService(this.urlParams.service);
-
 		const sms = SMSService.parse(this.bodyParams);
 
-		let visitor = LivechatVisitors.findOneVisitorByPhone(sms.from);
+		const visitor = defineVisitor(sms.from);
+		const { token } = visitor;
+		const room = LivechatRooms.findOneOpenByVisitorToken(token);
+		const location = normalizeLocationSharing(sms);
 
 		const sendMessage = {
 			message: {
 				_id: Random.id(),
+				rid: (room && room._id) || Random.id(),
+				token,
+				msg: sms.body,
+				...location && { location },
 			},
+			guest: visitor,
 			roomInfo: {
 				sms: {
 					from: sms.to,
@@ -25,33 +77,6 @@ API.v1.addRoute('livechat/sms-incoming/:service', {
 			},
 		};
 
-		if (visitor) {
-			const rooms = LivechatRooms.findOpenByVisitorToken(visitor.token).fetch();
-
-			if (rooms && rooms.length > 0) {
-				sendMessage.message.rid = rooms[0]._id;
-			} else {
-				sendMessage.message.rid = Random.id();
-			}
-			sendMessage.message.token = visitor.token;
-		} else {
-			sendMessage.message.rid = Random.id();
-			sendMessage.message.token = Random.id();
-
-			const visitorId = Livechat.registerGuest({
-				username: sms.from.replace(/[^0-9]/g, ''),
-				token: sendMessage.message.token,
-				phone: {
-					number: sms.from,
-				},
-			});
-
-			visitor = LivechatVisitors.findOneById(visitorId);
-		}
-
-		sendMessage.message.msg = sms.body;
-		sendMessage.guest = visitor;
-
 		sendMessage.message.attachments = sms.media.map((curr) => {
 			const attachment = {
 				message_link: curr.url,
@@ -74,7 +99,7 @@ API.v1.addRoute('livechat/sms-incoming/:service', {
 		});
 
 		try {
-			const message = SMSService.response.call(this, Livechat.sendMessage(sendMessage));
+			const message = SMSService.response.call(this, Promise.await(Livechat.sendMessage(sendMessage)));
 
 			Meteor.defer(() => {
 				if (sms.extra) {
diff --git a/app/livechat/server/sendMessageBySMS.js b/app/livechat/server/sendMessageBySMS.js
index cbceda93baff..6094d1dc62a3 100644
--- a/app/livechat/server/sendMessageBySMS.js
+++ b/app/livechat/server/sendMessageBySMS.js
@@ -36,6 +36,11 @@ callbacks.add('afterSaveMessage', function(message, room) {
 		extraData = Object.assign({}, { rid, userId, fileUpload });
 	}
 
+	if (message.location) {
+		const { location } = message;
+		extraData = Object.assign({}, extraData, { location });
+	}
+
 	const SMSService = SMS.getService(settings.get('SMS_Service'));
 
 	if (!SMSService) {
diff --git a/app/models/server/models/LivechatRooms.js b/app/models/server/models/LivechatRooms.js
index 4a6767d92906..91e560ea4f64 100644
--- a/app/models/server/models/LivechatRooms.js
+++ b/app/models/server/models/LivechatRooms.js
@@ -204,6 +204,16 @@ export class LivechatRooms extends Base {
 		return this.find(query, options);
 	}
 
+	findOneOpenByVisitorToken(visitorToken, options) {
+		const query = {
+			t: 'l',
+			open: true,
+			'v.token': visitorToken,
+		};
+
+		return this.findOne(query, options);
+	}
+
 	findOpenByVisitorTokenAndDepartmentId(visitorToken, departmentId, options) {
 		const query = {
 			t: 'l',
diff --git a/app/sms/server/SMS.js b/app/sms/server/SMS.js
index a812307f5a4e..9ee7c90b10e7 100644
--- a/app/sms/server/SMS.js
+++ b/app/sms/server/SMS.js
@@ -4,6 +4,7 @@ import { settings } from '../../settings';
 
 export const SMS = {
 	enabled: false,
+	department: null,
 	services: {},
 	accountSid: null,
 	authToken: null,
@@ -24,3 +25,7 @@ export const SMS = {
 settings.get('SMS_Enabled', function(key, value) {
 	SMS.enabled = value;
 });
+
+settings.get('SMS_Default_Omnichannel_Department', function(key, value) {
+	SMS.department = value;
+});
diff --git a/app/sms/server/services/twilio.js b/app/sms/server/services/twilio.js
index 67920e131450..c928ed8a447f 100644
--- a/app/sms/server/services/twilio.js
+++ b/app/sms/server/services/twilio.js
@@ -43,6 +43,8 @@ class Twilio {
 				fromState: data.FromState,
 				fromCity: data.FromCity,
 				fromZip: data.FromZip,
+				fromLatitude: data.Latitude,
+				fromLongitude: data.Longitude,
 			},
 		};
 
@@ -77,12 +79,14 @@ class Twilio {
 
 	send(fromNumber, toNumber, message, extraData) {
 		const client = twilio(this.accountSid, this.authToken);
+		let body = message;
 
 		let mediaUrl;
+		const defaultLanguage = settings.get('Language') || 'en';
 		if (extraData && extraData.fileUpload) {
 			const { rid, userId, fileUpload: { size, type, publicFilePath } } = extraData;
 			const user = userId ? Meteor.users.findOne(userId) : null;
-			const lng = (user && user.language) || settings.get('Language') || 'en';
+			const lng = (user && user.language) || defaultLanguage;
 
 			let reason;
 			if (!this.fileUploadEnabled) {
@@ -103,12 +107,20 @@ class Twilio {
 
 			mediaUrl = [publicFilePath];
 		}
-		// return
+
+		let persistentAction;
+		if (extraData && extraData.location) {
+			const [longitude, latitude] = extraData.location.coordinates;
+			persistentAction = `geo:${ latitude },${ longitude }`;
+			body = TAPi18n.__('Location', { lng: defaultLanguage });
+		}
+
 		client.messages.create({
 			to: toNumber,
 			from: fromNumber,
-			body: message,
+			body,
 			...mediaUrl && { mediaUrl },
+			...persistentAction && { persistentAction },
 		});
 	}
 
diff --git a/app/sms/server/settings.js b/app/sms/server/settings.js
index 466df5d8c65a..9f620642db27 100644
--- a/app/sms/server/settings.js
+++ b/app/sms/server/settings.js
@@ -28,6 +28,10 @@ Meteor.startup(function() {
 			i18nLabel: 'Service',
 		});
 
+		this.add('SMS_Default_Omnichannel_Department', '', {
+			type: 'string',
+		});
+
 		this.section('Twilio', function() {
 			this.add('SMS_Twilio_Account_SID', '', {
 				type: 'string',
diff --git a/package-lock.json b/package-lock.json
index 0a1ef314bae8..8c97b0aaed90 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5896,9 +5896,9 @@
 			}
 		},
 		"@types/body-parser": {
-			"version": "1.17.1",
-			"resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.17.1.tgz",
-			"integrity": "sha512-RoX2EZjMiFMjZh9lmYrwgoP9RTpAjSHiJxdp4oidAQVO02T7HER3xj9UKue5534ULWeqVEkujhWcyvUce+d68w==",
+			"version": "1.19.0",
+			"resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.0.tgz",
+			"integrity": "sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==",
 			"requires": {
 				"@types/connect": "*",
 				"@types/node": "*"
@@ -5951,9 +5951,9 @@
 			"integrity": "sha512-KEIlhXnIutzKwRbQkGWb/I4HFqBuUykAdHgDED6xqwXJfONCjF5VoE0cXEiurh3XauygxzeDzgtXUqvLkxFzzA=="
 		},
 		"@types/express": {
-			"version": "4.17.1",
-			"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.1.tgz",
-			"integrity": "sha512-VfH/XCP0QbQk5B5puLqTLEeFgR8lfCJHZJKkInZ9mkYd+u8byX0kztXEQxEk4wZXJs8HI+7km2ALXjn4YKcX9w==",
+			"version": "4.17.3",
+			"resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.3.tgz",
+			"integrity": "sha512-I8cGRJj3pyOLs/HndoP+25vOqhqWkAZsWMEmq1qXy/b/M3ppufecUwaK2/TVDVxcV61/iSdhykUjQQ2DLSrTdg==",
 			"requires": {
 				"@types/body-parser": "*",
 				"@types/express-serve-static-core": "*",
@@ -5961,9 +5961,9 @@
 			}
 		},
 		"@types/express-serve-static-core": {
-			"version": "4.16.9",
-			"resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.9.tgz",
-			"integrity": "sha512-GqpaVWR0DM8FnRUJYKlWgyARoBUAVfRIeVDZQKOttLFp5SmhhF9YFIYeTPwMd/AXfxlP7xVO2dj1fGu0Q+krKQ==",
+			"version": "4.17.2",
+			"resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.2.tgz",
+			"integrity": "sha512-El9yMpctM6tORDAiBwZVLMcxoTMcqqRO9dVyYcn7ycLWbvR8klrDn8CAOwRfZujZtWD7yS/mshTdz43jMOejbg==",
 			"requires": {
 				"@types/node": "*",
 				"@types/range-parser": "*"
@@ -12105,6 +12105,11 @@
 			"integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=",
 			"dev": true
 		},
+		"dayjs": {
+			"version": "1.8.22",
+			"resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.22.tgz",
+			"integrity": "sha512-N8IXfxBD62Y9cKTuuuSoOlCXRnnzaTj1vu91r855iq6FbY5cZqOZnW/95nUn6kJiR+W9PHHrLykEoQOe6fUKxQ=="
+		},
 		"dbly-linked-list": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/dbly-linked-list/-/dbly-linked-list-0.2.0.tgz",
@@ -12418,11 +12423,6 @@
 			"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
 			"integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak="
 		},
-		"deprecate": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/deprecate/-/deprecate-1.0.0.tgz",
-			"integrity": "sha1-ZhSQ7SQokWpsiIPYg05WRvTkpKg="
-		},
 		"des.js": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
@@ -23902,8 +23902,7 @@
 		"querystringify": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
-			"integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
-			"dev": true
+			"integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="
 		},
 		"queue-fifo": {
 			"version": "0.2.5",
@@ -25720,9 +25719,9 @@
 			}
 		},
 		"scmp": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/scmp/-/scmp-2.0.0.tgz",
-			"integrity": "sha1-JHEQ7yLM+JexOj8KvdtSeCOTzWo="
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/scmp/-/scmp-2.1.0.tgz",
+			"integrity": "sha512-o/mRQGk9Rcer/jEEw/yw4mwo3EU/NvYvp577/Btqrym9Qy5/MdWGBqipbALgd2lrdWTJ5/gqDusxfnQBxOxT2Q=="
 		},
 		"seek-bzip": {
 			"version": "1.0.5",
@@ -28372,20 +28371,20 @@
 			"integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
 		},
 		"twilio": {
-			"version": "3.35.0",
-			"resolved": "https://registry.npmjs.org/twilio/-/twilio-3.35.0.tgz",
-			"integrity": "sha512-UtXhrlY6y+5tRoF98VDUOWDR+UTq5Stdy3BWv2JS3iDBthI3pZIYyptIiwPtSb57o9jXRSd57uZ4OW8NCdTVQw==",
+			"version": "3.40.0",
+			"resolved": "https://registry.npmjs.org/twilio/-/twilio-3.40.0.tgz",
+			"integrity": "sha512-aXDhmEm5RWMd+5kVbfMp1WTZIGiDwzuLewkzqhWE0eww2T6/PvK4Q4NoPJXDGh7LbcUjRhaS/8PzioSURAqDPw==",
 			"requires": {
-				"@types/express": "^4.17.1",
-				"deprecate": "1.0.0",
+				"@types/express": "^4.17.3",
+				"dayjs": "^1.8.21",
 				"jsonwebtoken": "^8.5.1",
 				"lodash": "^4.17.15",
-				"moment": "^2.24.0",
 				"q": "2.0.x",
-				"request": "^2.88.0",
-				"rootpath": "0.1.2",
-				"scmp": "2.0.0",
-				"xmlbuilder": "9.0.1"
+				"request": "^2.88.2",
+				"rootpath": "^0.1.2",
+				"scmp": "^2.1.0",
+				"url-parse": "^1.4.7",
+				"xmlbuilder": "^13.0.2"
 			},
 			"dependencies": {
 				"lodash": {
@@ -28393,15 +28392,46 @@
 					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
 					"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
 				},
-				"moment": {
-					"version": "2.24.0",
-					"resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
-					"integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
+				"request": {
+					"version": "2.88.2",
+					"resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+					"integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+					"requires": {
+						"aws-sign2": "~0.7.0",
+						"aws4": "^1.8.0",
+						"caseless": "~0.12.0",
+						"combined-stream": "~1.0.6",
+						"extend": "~3.0.2",
+						"forever-agent": "~0.6.1",
+						"form-data": "~2.3.2",
+						"har-validator": "~5.1.3",
+						"http-signature": "~1.2.0",
+						"is-typedarray": "~1.0.0",
+						"isstream": "~0.1.2",
+						"json-stringify-safe": "~5.0.1",
+						"mime-types": "~2.1.19",
+						"oauth-sign": "~0.9.0",
+						"performance-now": "^2.1.0",
+						"qs": "~6.5.2",
+						"safe-buffer": "^5.1.2",
+						"tough-cookie": "~2.5.0",
+						"tunnel-agent": "^0.6.0",
+						"uuid": "^3.3.2"
+					}
+				},
+				"tough-cookie": {
+					"version": "2.5.0",
+					"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+					"integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+					"requires": {
+						"psl": "^1.1.28",
+						"punycode": "^2.1.1"
+					}
 				},
 				"xmlbuilder": {
-					"version": "9.0.1",
-					"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.1.tgz",
-					"integrity": "sha1-kc1wiXdVNj66V8Et3uq0o0GmH2U="
+					"version": "13.0.2",
+					"resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-13.0.2.tgz",
+					"integrity": "sha512-Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ=="
 				}
 			}
 		},
@@ -28957,7 +28987,6 @@
 			"version": "1.4.7",
 			"resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
 			"integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
-			"dev": true,
 			"requires": {
 				"querystringify": "^2.1.1",
 				"requires-port": "^1.0.0"
diff --git a/package.json b/package.json
index 266c74603f99..15dced2347e9 100644
--- a/package.json
+++ b/package.json
@@ -216,7 +216,7 @@
 		"tar-stream": "^1.6.2",
 		"toastr": "^2.1.4",
 		"turndown": "^5.0.1",
-		"twilio": "^3.35.0",
+		"twilio": "^3.40.0",
 		"twit": "^2.2.11",
 		"ua-parser-js": "^0.7.19",
 		"underscore": "^1.9.1",
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index bab0b1082f1d..bcef536dfcfc 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -2132,6 +2132,7 @@
   "Local_Domains": "Local Domains",
   "Local_Password": "Local Password",
   "Localization": "Localization",
+  "Location": "Location",
   "Log_Exceptions_to_Channel_Description": "A channel that will receive all captured exceptions. Leave empty to ignore exceptions.",
   "Log_Exceptions_to_Channel": "Log Exceptions to Channel",
   "Log_File": "Show File and Line",
@@ -3044,6 +3045,8 @@
   "Smarsh_MissingEmail_Email_Description": "The email to show for a user account when their email address is missing, generally happens with bot accounts.",
   "Smarsh_Timezone": "Smarsh Timezone",
   "Smileys_and_People": "Smileys & People",
+  "SMS_Default_Omnichannel_Department": "Omnichannel Department (Default)",
+  "SMS_Default_Omnichannel_Department_Description": "If set, all new incoming chats initiated by this integration will be routed to this department.",
   "SMS_Enabled": "SMS Enabled",
   "SMTP": "SMTP",
   "SMTP_Host": "SMTP Host",
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index 0a31cffc3310..6b18a52a876d 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -1945,6 +1945,7 @@
   "Local_Domains": "Domínios Locais",
   "Local_Password": "Senha local",
   "Localization": "Localização",
+  "Location": "Localização",
   "Log_Exceptions_to_Channel_Description": "Um canal que irá receber todas as exceções capturadas. Deixe em branco para ignorar exceções.",
   "Log_Exceptions_to_Channel": "Log de Exceções no Canal",
   "Log_File": "Mostrar Arquivo e Linha",
@@ -2776,6 +2777,8 @@
   "Smarsh_MissingEmail_Email_Description": "O email para mostrar para uma conta de usuário quando seu endereço de e-mail está faltando, geralmente acontece com contas de bot.",
   "Smarsh_Timezone": "Smarsh Timezone",
   "Smileys_and_People": "Smileys & Pessoas",
+  "SMS_Default_Omnichannel_Department": "Departamento (Default)",
+  "SMS_Default_Omnichannel_Department_Description": "Se definido, todos os novos chats iniciados por essa integração serão roteados para este departamento.",
   "SMS_Enabled": "SMS Ativado",
   "SMTP": "SMTP",
   "SMTP_Host": "Host SMTP",

From 0340d5696ce76fafd79e3bbadd5e064478667ace Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Thu, 19 Mar 2020 18:05:58 -0300
Subject: [PATCH 030/223] [NEW] Add default chat closing tags in Omnichannel
 departments (#16859)

---
 .../views/app/livechatDepartmentForm.html     | 44 ++++++++++++++
 .../views/app/livechatDepartmentForm.js       | 60 ++++++++++++++++++-
 .../client/views/app/tabbar/visitorInfo.js    |  2 +-
 app/livechat/server/hooks/beforeCloseRoom.js  | 30 +++++++---
 app/livechat/server/lib/Livechat.js           | 12 +++-
 app/livechat/server/methods/closeRoom.js      |  3 +-
 app/models/server/models/LivechatRooms.js     | 11 ++--
 packages/rocketchat-i18n/i18n/en.i18n.json    |  3 +
 packages/rocketchat-i18n/i18n/pt-BR.i18n.json |  3 +
 9 files changed, 150 insertions(+), 18 deletions(-)

diff --git a/app/livechat/client/views/app/livechatDepartmentForm.html b/app/livechat/client/views/app/livechatDepartmentForm.html
index 3305382d02ec..6621458a767e 100644
--- a/app/livechat/client/views/app/livechatDepartmentForm.html
+++ b/app/livechat/client/views/app/livechatDepartmentForm.html
@@ -55,6 +55,50 @@
 											<label><input type="radio" name="requestTagBeforeClosingChat" value="0" checked="{{$eq requestTagBeforeClosingChat false}}" /> {{_ "No"}}</label>
 										</div>
 									</div>
+									<label>{{_ "Conversation_closing_tags"}}</label>
+									<div class="input-line form-inline">
+										<div class="form-group">
+											{{#if hasAvailableTags}}
+												<div class="rc-input__wrapper">
+													<select id="tagSelect" class="rc-input rc-input__element rc-input--small rc-form-item-inline">
+														<option value="placeholder" disabled selected>{{_ "Select_tag"}}</option>
+														{{#each availableDepartmentTags}}
+															<option value="{{_id}}">{{this}}</option>
+														{{/each}}
+													</select>
+												</div>
+											{{else}}
+												<div class="rc-input" id="add-tag-input">
+													<label class="rc-input__label">
+														<div class="rc-input__wrapper">
+															<div class="rc-input__icon">
+																{{> icon icon='edit' }}
+															</div>
+															<input id="tagInput" class="rc-input__element" type="text" name="tags" autocomplete="off" placeholder="{{_"Enter_a_tag"}}">
+														</div>
+													</label>
+												</div>
+											{{/if}}
+										</div>
+										<div class="form-group">
+											<button id="addTag" name="addTag" class="rc-button rc-button--primary add-tag">{{_ "Add"}}</button>
+										</div>
+										<div>
+											<small class="secondary-font-color">{{{_ "Conversation_closing_tags_description"}}}</small>
+										</div>
+									</div>
+									{{#if hasChatClosingTags}}
+										<div class="input-line">
+											<ul id="tags" class="chip-container department-fallback-tags">
+												{{#each chatClosingTags}}
+												<li class="remove-tag" title="{{this}}">
+													<i class="icon icon-cancel-circled"></i>
+													{{this}}
+												</li>
+												{{/each}}
+											</ul>
+										</div>
+									{{/if}}
 									{{#if customFieldsTemplate}}
 										{{> Template.dynamic template=customFieldsTemplate data=data }}
 									{{/if}}
diff --git a/app/livechat/client/views/app/livechatDepartmentForm.js b/app/livechat/client/views/app/livechatDepartmentForm.js
index 47458c4b0013..4af23b45ddcf 100644
--- a/app/livechat/client/views/app/livechatDepartmentForm.js
+++ b/app/livechat/client/views/app/livechatDepartmentForm.js
@@ -79,6 +79,18 @@ Template.livechatDepartmentForm.helpers({
 			.some((button) => button.groups
 				.some((group) => group.startsWith('livechat-department')));
 	},
+	chatClosingTags() {
+		return Template.instance().chatClosingTags.get();
+	},
+	availableDepartmentTags() {
+		return Template.instance().availableDepartmentTags.get();
+	},
+	hasAvailableTags() {
+		return [...Template.instance().availableTags.get()].length > 0;
+	},
+	hasChatClosingTags() {
+		return [...Template.instance().chatClosingTags.get()].length > 0;
+	},
 });
 
 Template.livechatDepartmentForm.events({
@@ -98,7 +110,7 @@ Template.livechatDepartmentForm.events({
 			const email = instance.$('input[name=email]').val();
 			const showOnOfflineForm = instance.$('input[name=showOnOfflineForm]:checked').val();
 			const requestTagBeforeClosingChat = instance.$('input[name=requestTagBeforeClosingChat]:checked').val();
-
+			const chatClosingTags = instance.chatClosingTags.get();
 			if (enabled !== '1' && enabled !== '0') {
 				return toastr.error(t('Please_select_enabled_yes_or_no'));
 			}
@@ -119,6 +131,7 @@ Template.livechatDepartmentForm.events({
 				showOnOfflineForm: showOnOfflineForm === '1',
 				requestTagBeforeClosingChat: requestTagBeforeClosingChat === '1',
 				email: email.trim(),
+				chatClosingTags,
 			};
 		}
 
@@ -190,6 +203,33 @@ Template.livechatDepartmentForm.events({
 
 		instance.departmentAgents.set(instance.departmentAgents.get().filter((agent) => agent.agentId !== this.agentId));
 	},
+
+	'click #addTag'(e, instance) {
+		e.stopPropagation();
+		e.preventDefault();
+
+		const isSelect = [...instance.availableTags.get()].length > 0;
+		const elId = isSelect ? '#tagSelect' : '#tagInput';
+		const elDefault = isSelect ? 'placeholder' : '';
+
+		const tag = $(elId).val();
+		const chatClosingTags = [...instance.chatClosingTags.get()];
+		if (tag === '' || chatClosingTags.indexOf(tag) > -1) {
+			return;
+		}
+
+		chatClosingTags.push(tag);
+		instance.chatClosingTags.set(chatClosingTags);
+		$(elId).val(elDefault);
+	},
+
+	'click .remove-tag'(e, instance) {
+		e.stopPropagation();
+		e.preventDefault();
+
+		const chatClosingTags = [...instance.chatClosingTags.get()].filter((el) => el !== this.valueOf());
+		instance.chatClosingTags.set(chatClosingTags);
+	},
 });
 
 Template.livechatDepartmentForm.onCreated(async function() {
@@ -199,21 +239,37 @@ Template.livechatDepartmentForm.onCreated(async function() {
 	this.tabBar = new RocketChatTabBar();
 	this.tabBar.showGroup(FlowRouter.current().route.name);
 	this.tabBarData = new ReactiveVar();
+	this.chatClosingTags = new ReactiveVar([]);
+	this.availableTags = new ReactiveVar([]);
+	this.availableDepartmentTags = new ReactiveVar([]);
 
 	this.onSelectAgents = ({ item: agent }) => {
 		this.selectedAgents.set([agent]);
 	};
 
-	this.onClickTagAgent = ({ username }) => {
+	this.onClickTagAgents = ({ username }) => {
 		this.selectedAgents.set(this.selectedAgents.get().filter((user) => user.username !== username));
 	};
 
+	this.loadAvailableTags = (departmentId) => {
+		Meteor.call('livechat:getTagsList', (err, tagsList) => {
+			this.availableTags.set(tagsList || []);
+			const tags = this.availableTags.get();
+			const availableTags = tags
+				.filter(({ departments }) => departments.length === 0 || departments.indexOf(departmentId) > -1)
+				.map(({ name }) => name);
+			this.availableDepartmentTags.set(availableTags);
+		});
+	};
+
 	this.autorun(async () => {
 		const id = FlowRouter.getParam('_id');
 		if (id) {
 			const { department, agents } = await APIClient.v1.get(`livechat/department/${ FlowRouter.getParam('_id') }`);
 			this.department.set(department);
 			this.departmentAgents.set(agents);
+			this.chatClosingTags.set((department && department.chatClosingTags) || []);
+			this.loadAvailableTags(id);
 		}
 	});
 });
diff --git a/app/livechat/client/views/app/tabbar/visitorInfo.js b/app/livechat/client/views/app/tabbar/visitorInfo.js
index 08b59ea10c04..3ebc6cc66a46 100644
--- a/app/livechat/client/views/app/tabbar/visitorInfo.js
+++ b/app/livechat/client/views/app/tabbar/visitorInfo.js
@@ -231,7 +231,7 @@ Template.visitorInfo.events({
 	'click .close-livechat'(event) {
 		event.preventDefault();
 
-		const closeRoom = (comment) => Meteor.call('livechat:closeRoom', this.rid, comment, function(error/* , result*/) {
+		const closeRoom = (comment) => Meteor.call('livechat:closeRoom', this.rid, comment, { clientAction: true }, function(error/* , result*/) {
 			if (error) {
 				return handleError(error);
 			}
diff --git a/app/livechat/server/hooks/beforeCloseRoom.js b/app/livechat/server/hooks/beforeCloseRoom.js
index 0a2f84b489b8..de4f13a7f8c5 100644
--- a/app/livechat/server/hooks/beforeCloseRoom.js
+++ b/app/livechat/server/hooks/beforeCloseRoom.js
@@ -3,20 +3,34 @@ import { Meteor } from 'meteor/meteor';
 import { callbacks } from '../../../callbacks';
 import { LivechatDepartment } from '../../../models';
 
-callbacks.add('livechat.beforeCloseRoom', (room) => {
-	const { departmentId } = room;
+const concatUnique = (...arrays) => [...new Set([].concat(...arrays.filter(Array.isArray)))];
+
+callbacks.add('livechat.beforeCloseRoom', ({ room, options }) => {
+	const { departmentId, tags: roomTags } = room;
 	if (!departmentId) {
-		return room;
+		return;
 	}
 
 	const department = LivechatDepartment.findOneById(departmentId);
-	if (!department || !department.requestTagBeforeClosingChat) {
-		return room;
+	if (!department) {
+		return;
+	}
+
+	const { requestTagBeforeClosingChat, chatClosingTags } = department;
+	const extraData = {
+		tags: concatUnique(roomTags, chatClosingTags),
+	};
+
+	if (!requestTagBeforeClosingChat) {
+		return extraData;
 	}
 
-	if (room.tags && room.tags.length > 0) {
-		return room;
+	const { clientAction } = options;
+	const checkRoomTags = !clientAction || (roomTags && roomTags.length > 0);
+	const checkDepartmentTags = chatClosingTags && chatClosingTags.length > 0;
+	if (!checkRoomTags || !checkDepartmentTags) {
+		throw new Meteor.Error('error-tags-must-be-assigned-before-closing-chat', 'Tag(s) must be assigned before closing the chat', { method: 'livechat.beforeCloseRoom' });
 	}
 
-	throw new Meteor.Error('error-tags-must-be-assigned-before-closing-chat', 'Tag(s) must be assigned before closing the chat', { method: 'livechat.beforeCloseRoom' });
+	return extraData;
 }, callbacks.priority.HIGH, 'livechat-before-close-Room');
diff --git a/app/livechat/server/lib/Livechat.js b/app/livechat/server/lib/Livechat.js
index 36ee6fc697c0..ac6734708319 100644
--- a/app/livechat/server/lib/Livechat.js
+++ b/app/livechat/server/lib/Livechat.js
@@ -314,18 +314,19 @@ export const Livechat = {
 		return ret;
 	},
 
-	closeRoom({ user, visitor, room, comment }) {
+	closeRoom({ user, visitor, room, comment, options = {} }) {
 		if (!room || room.t !== 'l' || !room.open) {
 			return false;
 		}
 
-		callbacks.run('livechat.beforeCloseRoom', room);
+		const extraData = callbacks.run('livechat.beforeCloseRoom', { room, options });
 
 		const now = new Date();
 
 		const closeData = {
 			closedAt: now,
 			chatDuration: (now.getTime() - room.ts) / 1000,
+			...extraData,
 		};
 
 		if (user) {
@@ -807,6 +808,8 @@ export const Livechat = {
 			showOnRegistration: Boolean,
 			email: String,
 			showOnOfflineForm: Boolean,
+			requestTagBeforeClosingChat: Match.Optional(Boolean),
+			chatClosingTags: Match.Optional([String]),
 		};
 
 		// The Livechat Form department support addition/custom fields, so those fields need to be added before validating
@@ -825,6 +828,11 @@ export const Livechat = {
 			}),
 		]));
 
+		const { requestTagBeforeClosingChat, chatClosingTags } = departmentData;
+		if (requestTagBeforeClosingChat && (!chatClosingTags || chatClosingTags.length === 0)) {
+			throw new Meteor.Error('error-validating-department-chat-closing-tags', 'At least one closing tag is required when the department requires tag(s) on closing conversations.', { method: 'livechat:saveDepartment' });
+		}
+
 		if (_id) {
 			const department = LivechatDepartment.findOneById(_id);
 			if (!department) {
diff --git a/app/livechat/server/methods/closeRoom.js b/app/livechat/server/methods/closeRoom.js
index f7f2d18942d5..d4b1776da579 100644
--- a/app/livechat/server/methods/closeRoom.js
+++ b/app/livechat/server/methods/closeRoom.js
@@ -5,7 +5,7 @@ import { Subscriptions, LivechatRooms } from '../../../models';
 import { Livechat } from '../lib/Livechat';
 
 Meteor.methods({
-	'livechat:closeRoom'(roomId, comment) {
+	'livechat:closeRoom'(roomId, comment, options = {}) {
 		const userId = Meteor.userId();
 		if (!userId || !hasPermission(userId, 'close-livechat-room')) {
 			throw new Meteor.Error('error-not-authorized', 'Not authorized', { method: 'livechat:closeRoom' });
@@ -31,6 +31,7 @@ Meteor.methods({
 			user,
 			room: LivechatRooms.findOneById(roomId),
 			comment,
+			options,
 		});
 	},
 });
diff --git a/app/models/server/models/LivechatRooms.js b/app/models/server/models/LivechatRooms.js
index 91e560ea4f64..f4de7632962b 100644
--- a/app/models/server/models/LivechatRooms.js
+++ b/app/models/server/models/LivechatRooms.js
@@ -421,16 +421,19 @@ export class LivechatRooms extends Base {
 
 
 	closeByRoomId(roomId, closeInfo) {
+		const { closer, closedBy, closedAt, chatDuration, ...extraData } = closeInfo;
+
 		return this.update({
 			_id: roomId,
 			t: 'l',
 		}, {
 			$set: {
-				closer: closeInfo.closer,
-				closedBy: closeInfo.closedBy,
-				closedAt: closeInfo.closedAt,
-				'metrics.chatDuration': closeInfo.chatDuration,
+				closer,
+				closedBy,
+				closedAt,
+				'metrics.chatDuration': chatDuration,
 				'v.status': 'offline',
+				...extraData,
 			},
 			$unset: {
 				open: 1,
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index bcef536dfcfc..1932dbd50e57 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -737,6 +737,8 @@
   "Conversation": "Conversation",
   "Conversations": "Conversations",
   "Conversation_closed": "Conversation closed: __comment__.",
+  "Conversation_closing_tags": "Conversation closing tags",
+  "Conversation_closing_tags_description": "Closing tags will be automatically assigned to conversations at closing.",
   "Conversation_finished": "Conversation Finished",
   "Conversation_finished_message": "Conversation Finished Message",
   "Conversation_finished_text": "Conversation Finished Text",
@@ -1402,6 +1404,7 @@
   "error-logged-user-not-in-room": "You are not in the room `%s`",
   "error-user-registration-disabled": "User registration is disabled",
   "error-user-registration-secret": "User registration is only allowed via Secret URL",
+  "error-validating-department-chat-closing-tags": "At least one closing tag is required when the department requires tag(s) on closing conversations.",
   "error-you-are-last-owner": "You are the last owner. Please set new owner before leaving the room.",
   "error-starring-message": "Message could not be stared",
   "Error_404": "Error:404",
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index 6b18a52a876d..95d1e3091854 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -677,6 +677,8 @@
   "Conversation": "Conversa",
   "Conversations": "Conversas",
   "Conversation_closed": "Chat encerrado: __comment__.",
+  "Conversation_closing_tags": "Tags de encerramento de conversa",
+  "Conversation_closing_tags_description": "As tags de encerramento serão automaticamente atribuídas as conversas no seu encerramento.",
   "Conversation_finished": "Conversa concluída",
   "Conversation_finished_message": "Mensagem de conversa concluída",
   "Conversation_finished_text": "Texto de conversa concluída",
@@ -1303,6 +1305,7 @@
   "error-logged-user-not-in-room": "Você não está na sala `%s`",
   "error-user-registration-disabled": "O registro do usuário está desativado",
   "error-user-registration-secret": "O registro de usuário é permitido somente via URL secreta",
+  "error-validating-department-chat-closing-tags": "Pelo menos uma tag de encerramento é necessária quando o departamento exige tags no encerramento de conversas.",
   "error-you-are-last-owner": "Você é o último proprietário da sala. Por favor defina um novo proprietário antes de sair.",
   "Error_404": "Erro 404",
   "Error_changing_password": "Erro ao alterar senha",

From f1d856304a233c857ab13c38c10c89e820cd0407 Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Thu, 19 Mar 2020 18:06:28 -0300
Subject: [PATCH 031/223] [IMPROVE] Replace the Department select component by
 an Autocomplete input in Omnichannel UI (#16669)

---
 .../views/app/livechatCurrentChats.html       | 31 ++++++-----
 .../client/views/app/livechatCurrentChats.js  | 46 ++++++++++++----
 .../views/app/tabbar/visitorForward.html      | 32 +++++++----
 .../client/views/app/tabbar/visitorForward.js | 54 +++++++++++++------
 .../imports/server/rest/departments.js        | 16 +++++-
 app/livechat/server/api/lib/departments.js    | 23 ++++++++
 app/models/server/raw/LivechatDepartment.js   | 20 +++++++
 packages/rocketchat-i18n/i18n/en.i18n.json    |  1 +
 packages/rocketchat-i18n/i18n/pt-BR.i18n.json |  1 +
 9 files changed, 174 insertions(+), 50 deletions(-)

diff --git a/app/livechat/client/views/app/livechatCurrentChats.html b/app/livechat/client/views/app/livechatCurrentChats.html
index 9ab5d338a425..c45ad535ab1b 100644
--- a/app/livechat/client/views/app/livechatCurrentChats.html
+++ b/app/livechat/client/views/app/livechatCurrentChats.html
@@ -46,18 +46,25 @@
 								</label>
 							</div>
 							<div class="form-group">
-								<label class="rc-input__label">
-									<div class="rc-input__title">{{_ "Department"}}</div>
-									<div class="rc-select">
-										<select class="rc-select__element" id="department" name="department">
-											<option class="rc-select__option" value="">{{_ "Select_a_department"}}</option>
-											{{#each departments}}
-												<option class="rc-select__option" value="{{_id}}">{{name}}</option>
-											{{/each}}
-										</select>
-										{{> icon block="rc-select__arrow" icon="arrow-down" }}
-									</div>
-								</label>
+								{{> livechatAutocompleteUser
+									onClickTag=onClickTagDepartment
+									list=selectedDepartments
+									onSelect=onSelectDepartments
+									collection='CachedDepartmentList'
+									endpoint='livechat/department.autocomplete'
+									field='name'
+									sort='name'
+									label="Department"
+									placeholder="Enter_a_department_name"
+									name="department"
+									icon="queue"
+									noMatchTemplate="userSearchEmpty"
+									templateItem="popupList_item_channel"
+									template="roomSearch"
+									noMatchTemplate="roomSearchEmpty"
+									modifier=departmentModifier
+									showLabel=true
+								}}
 							</div>
 							<div class="form-group input-daterange">
 								<label class="rc-input__label">
diff --git a/app/livechat/client/views/app/livechatCurrentChats.js b/app/livechat/client/views/app/livechatCurrentChats.js
index 36110f432790..d5e017721360 100644
--- a/app/livechat/client/views/app/livechatCurrentChats.js
+++ b/app/livechat/client/views/app/livechatCurrentChats.js
@@ -84,12 +84,24 @@ Template.livechatCurrentChats.helpers({
 	tagFilters() {
 		return Template.instance().tagFilters.get();
 	},
-	departments() {
-		return Template.instance().departments.get();
-	},
 	tagId() {
 		return this;
 	},
+	departmentModifier() {
+		return (filter, text = '') => {
+			const f = filter.get();
+			return `${ f.length === 0 ? text : text.replace(new RegExp(filter.get(), 'i'), (part) => `<strong>${ part }</strong>`) }`;
+		};
+	},
+	onClickTagDepartment() {
+		return Template.instance().onClickTagDepartment;
+	},
+	selectedDepartments() {
+		return Template.instance().selectedDepartments.get();
+	},
+	onSelectDepartments() {
+		return Template.instance().onSelectDepartments;
+	},
 });
 
 Template.livechatCurrentChats.events({
@@ -302,6 +314,11 @@ Template.livechatCurrentChats.events({
 			filter.agents = [agents[0]];
 		}
 
+		const departments = instance.selectedDepartments.get();
+		if (departments && departments.length > 0) {
+			filter.department = [departments[0]];
+		}
+
 		instance.filter.set(filter);
 		instance.offset.set(0);
 		storeFilters(filter);
@@ -353,7 +370,16 @@ Template.livechatCurrentChats.onCreated(async function() {
 	this.customFilters = new ReactiveVar([]);
 	this.customFields = new ReactiveVar([]);
 	this.tagFilters = new ReactiveVar([]);
-	this.departments = new ReactiveVar([]);
+	this.selectedDepartments = new ReactiveVar([]);
+
+	this.onSelectDepartments = ({ item: department }) => {
+		department.text = department.name;
+		this.selectedDepartments.set([department]);
+	};
+
+	this.onClickTagDepartment = () => {
+		this.selectedDepartments.set([]);
+	};
 
 	const mountArrayQueryParameters = (label, items, index) => items.reduce((acc, item) => {
 		const isTheLastElement = index === items.length - 1;
@@ -368,8 +394,8 @@ Template.livechatCurrentChats.onCreated(async function() {
 		if (status) {
 			url += `&open=${ status === 'opened' }`;
 		}
-		if (department) {
-			url += `&departmentId=${ department }`;
+		if (department && Array.isArray(department) && department.length) {
+			url += `&departmentId=${ department[0]._id }`;
 		}
 		if (from) {
 			dateRange.start = `${ moment(new Date(from)).utc().format('YYYY-MM-DDTHH:mm:ss') }Z`;
@@ -407,6 +433,8 @@ Template.livechatCurrentChats.onCreated(async function() {
 			switch (key) {
 				case 'agents':
 					return this.selectedAgents.set(value);
+				case 'department':
+					return this.selectedDepartments.set(value);
 				case 'from':
 				case 'to':
 					return $(`#${ key }`).datepicker('setDate', new Date(value));
@@ -420,6 +448,7 @@ Template.livechatCurrentChats.onCreated(async function() {
 		removeStoredFilters();
 		$('#form-filters').get(0).reset();
 		this.selectedAgents.set([]);
+		this.selectedDepartments.set([]);
 		this.filter.set({});
 	};
 
@@ -449,16 +478,13 @@ Template.livechatCurrentChats.onCreated(async function() {
 		this.loadRooms(filter, offset);
 	});
 
-	const { departments } = await APIClient.v1.get('livechat/department?sort={"name": 1}');
-	this.departments.set(departments);
-
 	Meteor.call('livechat:getCustomFields', (err, customFields) => {
 		if (customFields) {
 			this.customFields.set(customFields);
 		}
 	});
 
-	setTimeout(this.loadDefaultFilters, 500);
+	this.loadDefaultFilters();
 });
 
 Template.livechatCurrentChats.onRendered(function() {
diff --git a/app/livechat/client/views/app/tabbar/visitorForward.html b/app/livechat/client/views/app/tabbar/visitorForward.html
index edcdd262f136..91831f9f3eba 100644
--- a/app/livechat/client/views/app/tabbar/visitorForward.html
+++ b/app/livechat/client/views/app/tabbar/visitorForward.html
@@ -11,22 +11,34 @@ <h3>{{_ "Forward_chat"}}</h3>
 			<form>
 				{{#if hasDepartments}}
 					<div class="input-line">
-						<label for="forwardDepartment">{{_ "Forward_to_department"}}</label>
-						<div class="rc-select">
-							<select class="rc-select__element" name="forwardDepartment" id="forwardDepartment">
-								<option class="rc-select__option" value="">{{_ "Select_a_department"}}</option>
-								{{#each departments}}
-									<option class="rc-select__option" value="{{_id}}">{{name}}</option>
-								{{/each}}
-							</select>
-							{{> icon block="rc-select__arrow" icon="arrow-down" }}
+						<label for="name">{{_ "Forward_to_department"}}</label>
+						<div class="form-group">
+							{{> livechatAutocompleteUser
+								onClickTag=onClickTagDepartment
+								list=selectedDepartments
+								onSelect=onSelectDepartments
+								collection='CachedDepartmentList'
+								endpoint='livechat/department.autocomplete'
+								field='name'
+								sort='name'
+								icon="queue"
+								label="Enter_a_department_name"
+								placeholder="Enter_a_department_name"
+								name="department"
+								noMatchTemplate="userSearchEmpty"
+								templateItem="popupList_item_channel"
+								template="roomSearch"
+								noMatchTemplate="roomSearchEmpty"
+								modifier=departmentModifier
+								conditions=departmentConditions
+							}}
 						</div>
 					</div>
-
 					<div class="form-divisor">
 						<span>{{_ "or"}}</span>
 					</div>
 				{{/if}}
+
 				<div class="input-line">
 					<label for="agent">{{_ "Forward_to_user"}}</label>
 					<div class="form-group">
diff --git a/app/livechat/client/views/app/tabbar/visitorForward.js b/app/livechat/client/views/app/tabbar/visitorForward.js
index 82af28381019..553072de6660 100644
--- a/app/livechat/client/views/app/tabbar/visitorForward.js
+++ b/app/livechat/client/views/app/tabbar/visitorForward.js
@@ -16,9 +16,6 @@ Template.visitorForward.helpers({
 	hasDepartments() {
 		return Template.instance().departments.get().filter((department) => department.enabled === true).length > 0;
 	},
-	departments() {
-		return Template.instance().departments.get().filter((department) => department.enabled === true);
-	},
 	agentName() {
 		return this.name || this.username;
 	},
@@ -43,6 +40,24 @@ Template.visitorForward.helpers({
 	onClickTagAgent() {
 		return Template.instance().onClickTagAgent;
 	},
+	departmentModifier() {
+		return (filter, text = '') => {
+			const f = filter.get();
+			return `${ f.length === 0 ? text : text.replace(new RegExp(filter.get(), 'i'), (part) => `<strong>${ part }</strong>`) }`;
+		};
+	},
+	onClickTagDepartment() {
+		return Template.instance().onClickTagDepartment;
+	},
+	selectedDepartments() {
+		return Template.instance().selectedDepartments.get();
+	},
+	onSelectDepartments() {
+		return Template.instance().onSelectDepartments;
+	},
+	departmentConditions() {
+		return { enabled: true, numAgents: { $gt: 0 } };
+	},
 });
 
 Template.visitorForward.onCreated(async function() {
@@ -50,9 +65,21 @@ Template.visitorForward.onCreated(async function() {
 	this.room = new ReactiveVar();
 	this.departments = new ReactiveVar([]);
 	this.selectedAgents = new ReactiveVar([]);
+	this.selectedDepartments = new ReactiveVar([]);
+
+	this.onSelectDepartments = ({ item: department }) => {
+		department.text = department.name;
+		this.selectedDepartments.set([department]);
+		this.selectedAgents.set([]);
+	};
+
+	this.onClickTagDepartment = () => {
+		this.selectedDepartments.set([]);
+	};
 
 	this.onSelectAgents = ({ item: agent }) => {
 		this.selectedAgents.set([agent]);
+		this.selectedDepartments.set([]);
 	};
 
 	this.onClickTagAgent = ({ username }) => {
@@ -83,8 +110,13 @@ Template.visitorForward.events({
 		const [user] = instance.selectedAgents.get();
 		if (user) {
 			transferData.userId = user._id;
-		} else if (instance.find('#forwardDepartment').value) {
-			transferData.departmentId = instance.find('#forwardDepartment').value;
+		} else if (instance.selectedDepartments.get()) {
+			const [department] = instance.selectedDepartments.get();
+			transferData.departmentId = department && department._id;
+		}
+
+		if (!transferData.userId && !transferData.departmentId) {
+			return;
 		}
 
 		Meteor.call('livechat:transfer', transferData, (error, result) => {
@@ -100,18 +132,6 @@ Template.visitorForward.events({
 		});
 	},
 
-	'change #forwardDepartment, blur #forwardDepartment'(event, instance) {
-		if (event.currentTarget.value) {
-			instance.find('#forwardUser').value = '';
-		}
-	},
-
-	'change #forwardUser, blur #forwardUser'(event, instance) {
-		if (event.currentTarget.value && instance.find('#forwardDepartment')) {
-			instance.find('#forwardDepartment').value = '';
-		}
-	},
-
 	'click .cancel'(event) {
 		event.preventDefault();
 
diff --git a/app/livechat/imports/server/rest/departments.js b/app/livechat/imports/server/rest/departments.js
index 18fa8bf89121..315fbcb30772 100644
--- a/app/livechat/imports/server/rest/departments.js
+++ b/app/livechat/imports/server/rest/departments.js
@@ -4,7 +4,7 @@ import { API } from '../../../../api';
 import { hasPermission } from '../../../../authorization';
 import { LivechatDepartment, LivechatDepartmentAgents } from '../../../../models';
 import { Livechat } from '../../../server/lib/Livechat';
-import { findDepartments, findDepartmentById } from '../../../server/api/lib/departments';
+import { findDepartments, findDepartmentById, findDepartmentsToAutocomplete } from '../../../server/api/lib/departments';
 
 API.v1.addRoute('livechat/department', { authRequired: true }, {
 	get() {
@@ -133,3 +133,17 @@ API.v1.addRoute('livechat/department/:_id', { authRequired: true }, {
 		}
 	},
 });
+
+API.v1.addRoute('livechat/department.autocomplete', { authRequired: true }, {
+	get() {
+		const { selector } = this.queryParams;
+		if (!selector) {
+			return API.v1.failure('The \'selector\' param is required');
+		}
+
+		return API.v1.success(Promise.await(findDepartmentsToAutocomplete({
+			uid: this.userId,
+			selector: JSON.parse(selector),
+		})));
+	},
+});
diff --git a/app/livechat/server/api/lib/departments.js b/app/livechat/server/api/lib/departments.js
index b404a2e200b0..b9b73947937a 100644
--- a/app/livechat/server/api/lib/departments.js
+++ b/app/livechat/server/api/lib/departments.js
@@ -44,3 +44,26 @@ export async function findDepartmentById({ userId, departmentId, includeAgents =
 
 	return result;
 }
+
+export async function findDepartmentsToAutocomplete({ uid, selector }) {
+	if (!await hasPermissionAsync(uid, 'view-livechat-departments') && !await hasPermissionAsync(uid, 'view-l-room')) {
+		return { items: [] };
+	}
+	const { exceptions = [], conditions = {} } = selector;
+
+	const options = {
+		fields: {
+			_id: 1,
+			name: 1,
+		},
+		limit: 10,
+		sort: {
+			name: 1,
+		},
+	};
+
+	const items = await LivechatDepartment.findByNameRegexWithExceptionsAndConditions(selector.term, exceptions, conditions, options).toArray();
+	return {
+		items,
+	};
+}
diff --git a/app/models/server/raw/LivechatDepartment.js b/app/models/server/raw/LivechatDepartment.js
index 1b103c034442..68ace2e34587 100644
--- a/app/models/server/raw/LivechatDepartment.js
+++ b/app/models/server/raw/LivechatDepartment.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 import { BaseRaw } from './BaseRaw';
 
 export class LivechatDepartmentRaw extends BaseRaw {
@@ -5,4 +7,22 @@ export class LivechatDepartmentRaw extends BaseRaw {
 		const query = { _id: { $in: departmentsIds } };
 		return this.find(query, options);
 	}
+
+	findByNameRegexWithExceptionsAndConditions(searchTerm, exceptions = [], conditions = {}, options = {}) {
+		if (!Array.isArray(exceptions)) {
+			exceptions = [exceptions];
+		}
+
+		const nameRegex = new RegExp(`^${ s.escapeRegExp(searchTerm).trim() }`, 'i');
+
+		const query = {
+			name: nameRegex,
+			_id: {
+				$nin: exceptions,
+			},
+			...conditions,
+		};
+
+		return this.find(query, options);
+	}
 }
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 1932dbd50e57..e08e476ce934 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1284,6 +1284,7 @@
   "End_OTR": "End OTR",
   "Enter_a_name": "Enter a name",
   "Enter_a_regex": "Enter a regex",
+  "Enter_a_department_name": "Enter a department name",
   "Enter_a_room_name": "Enter a room name",
   "Enter_a_username": "Enter a username",
   "Enter_a_tag": "Enter a tag",
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index 95d1e3091854..7911dd0ea698 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -1190,6 +1190,7 @@
   "End_OTR": "Finalizar OTR",
   "Enter_a_name": "Insira o nome aqui",
   "Enter_a_regex": "Introduza um regex",
+  "Enter_a_department_name": "Digite um nome de departmento",
   "Enter_a_room_name": "Digite um nome de sala",
   "Enter_a_username": "Nome de usuário",
   "Enter_a_tag": "Insira uma tag",

From 2c729b64cadf973685124bb58b083a267af38e68 Mon Sep 17 00:00:00 2001
From: Marcos Spessatto Defendi <marcos.defendi@ulbra.inf.br>
Date: Thu, 19 Mar 2020 19:14:47 -0300
Subject: [PATCH 032/223] [IMPROVE] Omnichannel aggregations performance
 improvements (#16755)

---
 app/livechat/imports/server/rest/rooms.js     |  76 +--
 app/livechat/server/lib/Livechat.js           |   4 +-
 app/livechat/server/lib/analytics/agents.js   |  17 +-
 .../server/lib/analytics/departments.js       |  42 +-
 app/models/server/models/LivechatRooms.js     |   6 +-
 .../server/raw/LivechatAgentActivity.js       |  56 ++
 app/models/server/raw/LivechatRooms.js        | 561 ++++++------------
 app/models/server/raw/Messages.js             |  59 ++
 app/models/server/raw/Users.js                | 163 -----
 9 files changed, 396 insertions(+), 588 deletions(-)

diff --git a/app/livechat/imports/server/rest/rooms.js b/app/livechat/imports/server/rest/rooms.js
index 905f8ff2b269..d7556006597a 100644
--- a/app/livechat/imports/server/rest/rooms.js
+++ b/app/livechat/imports/server/rest/rooms.js
@@ -4,45 +4,51 @@ import { hasPermission } from '../../../../authorization/server';
 import { API } from '../../../../api';
 import { findRooms } from '../../../server/api/lib/rooms';
 
+const validateDateParams = (property, date) => {
+	if (date) {
+		date = JSON.parse(date);
+	}
+	if (date && date.start && isNaN(Date.parse(date.start))) {
+		throw new Error(`The "${ property }.start" query parameter must be a valid date.`);
+	}
+	if (date && date.end && isNaN(Date.parse(date.end))) {
+		throw new Error(`The "${ property }.end" query parameter must be a valid date.`);
+	}
+	return date;
+};
+
 API.v1.addRoute('livechat/rooms', { authRequired: true }, {
 	get() {
-		try {
-			if (!hasPermission(this.userId, 'view-livechat-manager')) {
-				return API.v1.unauthorized();
-			}
-			const { offset, count } = this.getPaginationItems();
-			const { sort, fields } = this.parseJsonQuery();
-			const { agents, departmentId, open, tags, roomName } = this.requestParams();
-			let { createdAt, customFields, closedAt } = this.requestParams();
-			check(agents, Match.Maybe([String]));
-			check(roomName, Match.Maybe(String));
-			check(departmentId, Match.Maybe(String));
-			check(open, Match.Maybe(String));
-			check(tags, Match.Maybe([String]));
+		if (!hasPermission(this.userId, 'view-livechat-manager')) {
+			return API.v1.unauthorized();
+		}
+		const { offset, count } = this.getPaginationItems();
+		const { sort, fields } = this.parseJsonQuery();
+		const { agents, departmentId, open, tags, roomName } = this.requestParams();
+		let { createdAt, customFields, closedAt } = this.requestParams();
+		check(agents, Match.Maybe([String]));
+		check(roomName, Match.Maybe(String));
+		check(departmentId, Match.Maybe(String));
+		check(open, Match.Maybe(String));
+		check(tags, Match.Maybe([String]));
 
-			if (createdAt) {
-				createdAt = JSON.parse(createdAt);
-			}
-			if (closedAt) {
-				closedAt = JSON.parse(closedAt);
-			}
-			if (customFields) {
-				customFields = JSON.parse(customFields);
-			}
+		createdAt = validateDateParams('createdAt', createdAt);
+		closedAt = validateDateParams('closedAt', closedAt);
 
-			return API.v1.success(Promise.await(findRooms({
-				agents,
-				roomName,
-				departmentId,
-				open: open && open === 'true',
-				createdAt,
-				closedAt,
-				tags,
-				customFields,
-				options: { offset, count, sort, fields },
-			})));
-		} catch (e) {
-			return API.v1.failure(e);
+		if (customFields) {
+			customFields = JSON.parse(customFields);
 		}
+
+		return API.v1.success(Promise.await(findRooms({
+			agents,
+			roomName,
+			departmentId,
+			open: open && open === 'true',
+			createdAt,
+			closedAt,
+			tags,
+			customFields,
+			options: { offset, count, sort, fields },
+		})));
 	},
 });
diff --git a/app/livechat/server/lib/Livechat.js b/app/livechat/server/lib/Livechat.js
index ac6734708319..36cf3352fb87 100644
--- a/app/livechat/server/lib/Livechat.js
+++ b/app/livechat/server/lib/Livechat.js
@@ -322,10 +322,13 @@ export const Livechat = {
 		const extraData = callbacks.run('livechat.beforeCloseRoom', { room, options });
 
 		const now = new Date();
+		const { _id: rid, servedBy } = room;
+		const serviceTimeDuration = servedBy && (now.getTime() - servedBy.ts) / 1000;
 
 		const closeData = {
 			closedAt: now,
 			chatDuration: (now.getTime() - room.ts) / 1000,
+			...serviceTimeDuration && { serviceTimeDuration },
 			...extraData,
 		};
 
@@ -343,7 +346,6 @@ export const Livechat = {
 			};
 		}
 
-		const { _id: rid, servedBy } = room;
 		LivechatRooms.closeByRoomId(rid, closeData);
 		LivechatInquiry.removeByRoomId(rid);
 
diff --git a/app/livechat/server/lib/analytics/agents.js b/app/livechat/server/lib/analytics/agents.js
index c3d2b7a61031..734180ec52f1 100644
--- a/app/livechat/server/lib/analytics/agents.js
+++ b/app/livechat/server/lib/analytics/agents.js
@@ -1,4 +1,4 @@
-import { Users } from '../../../../models/server/raw';
+import { LivechatRooms, LivechatAgentActivity } from '../../../../models/server/raw';
 
 const findAllAverageServiceTimeAsync = async ({
 	start,
@@ -8,9 +8,10 @@ const findAllAverageServiceTimeAsync = async ({
 	if (!start || !end) {
 		throw new Error('"start" and "end" must be provided');
 	}
+	const total = await LivechatRooms.findAllAverageServiceTimeByAgents({ start, end, onlyCount: true }).toArray();
 	return {
-		agents: await Users.findAllAverageServiceTime({ start, end, options }),
-		total: (await Users.findAllAverageServiceTime({ start, end })).length,
+		agents: await LivechatRooms.findAllAverageServiceTimeByAgents({ start, end, options }).toArray(),
+		total: total.length ? total[0].total : 0,
 	};
 };
 
@@ -22,9 +23,10 @@ const findAllServiceTimeAsync = async ({
 	if (!start || !end) {
 		throw new Error('"start" and "end" must be provided');
 	}
+	const total = await LivechatRooms.findAllServiceTimeByAgent({ start, end, onlyCount: true }).toArray();
 	return {
-		agents: await Users.findAllServiceTime({ start, end, options }),
-		total: (await Users.findAllServiceTime({ start, end })).length,
+		agents: await LivechatRooms.findAllServiceTimeByAgent({ start, end, options }).toArray(),
+		total: total.length ? total[0].total : 0,
 	};
 };
 
@@ -37,9 +39,10 @@ const findAvailableServiceTimeHistoryAsync = async ({
 	if (!start || !end) {
 		throw new Error('"start" and "end" must be provided');
 	}
+	const total = await LivechatAgentActivity.findAvailableServiceTimeHistory({ start, end, fullReport, onlyCount: true }).toArray();
 	return {
-		agents: await Users.findAvailableServiceTimeHistory({ start, end, fullReport, options }),
-		total: (await Users.findAvailableServiceTimeHistory({ start, end, fullReport })).length,
+		agents: await LivechatAgentActivity.findAvailableServiceTimeHistory({ start, end, fullReport, options }).toArray(),
+		total: total.length ? total[0].total : 0,
 	};
 };
 
diff --git a/app/livechat/server/lib/analytics/departments.js b/app/livechat/server/lib/analytics/departments.js
index dced223f0c28..fbcd952955d7 100644
--- a/app/livechat/server/lib/analytics/departments.js
+++ b/app/livechat/server/lib/analytics/departments.js
@@ -1,4 +1,4 @@
-import { LivechatRooms } from '../../../../models/server/raw';
+import { LivechatRooms, Messages } from '../../../../models/server/raw';
 
 export const findAllRoomsAsync = async ({
 	start,
@@ -10,9 +10,10 @@ export const findAllRoomsAsync = async ({
 	if (!start || !end) {
 		throw new Error('"start" and "end" must be provided');
 	}
+	const total = await LivechatRooms.findAllRooms({ start, answered, end, departmentId, onlyCount: true }).toArray();
 	return {
-		departments: await LivechatRooms.findAllRooms({ start, answered, end, departmentId, options }),
-		total: (await LivechatRooms.findAllRooms({ start, answered, end, departmentId })).length,
+		departments: await LivechatRooms.findAllRooms({ start, answered, end, departmentId, options }).toArray(),
+		total: total.length ? total[0].total : 0,
 	};
 };
 
@@ -25,9 +26,10 @@ export const findAllAverageOfChatDurationTimeAsync = async ({
 	if (!start || !end) {
 		throw new Error('"start" and "end" must be provided');
 	}
+	const total = await LivechatRooms.findAllAverageOfChatDurationTime({ start, end, departmentId, onlyCount: true }).toArray();
 	return {
-		departments: await LivechatRooms.findAllAverageOfChatDurationTime({ start, end, departmentId, options }),
-		total: (await LivechatRooms.findAllAverageOfChatDurationTime({ start, end, departmentId })).length,
+		departments: await LivechatRooms.findAllAverageOfChatDurationTime({ start, end, departmentId, options }).toArray(),
+		total: total.length ? total[0].total : 0,
 	};
 };
 
@@ -40,9 +42,10 @@ export const findAllAverageServiceTimeAsync = async ({
 	if (!start || !end) {
 		throw new Error('"start" and "end" must be provided');
 	}
+	const total = await LivechatRooms.findAllAverageOfServiceTime({ start, end, departmentId, onlyCount: true }).toArray();
 	return {
-		departments: await LivechatRooms.findAllAverageOfServiceTime({ start, end, departmentId, options }),
-		total: (await LivechatRooms.findAllAverageOfServiceTime({ start, end, departmentId })).length,
+		departments: await LivechatRooms.findAllAverageOfServiceTime({ start, end, departmentId, options }).toArray(),
+		total: total.length ? total[0].total : 0,
 	};
 };
 
@@ -55,9 +58,10 @@ export const findAllServiceTimeAsync = async ({
 	if (!start || !end) {
 		throw new Error('"start" and "end" must be provided');
 	}
+	const total = await LivechatRooms.findAllServiceTime({ start, end, departmentId, onlyCount: true }).toArray();
 	return {
-		departments: await LivechatRooms.findAllServiceTime({ start, end, departmentId, options }),
-		total: (await LivechatRooms.findAllServiceTime({ start, end, departmentId })).length,
+		departments: await LivechatRooms.findAllServiceTime({ start, end, departmentId, options }).toArray(),
+		total: total.length ? total[0].total : 0,
 	};
 };
 
@@ -70,9 +74,10 @@ export const findAllAverageWaitingTimeAsync = async ({
 	if (!start || !end) {
 		throw new Error('"start" and "end" must be provided');
 	}
+	const total = await LivechatRooms.findAllAverageWaitingTime({ start, end, departmentId, onlyCount: true }).toArray();
 	return {
-		departments: await LivechatRooms.findAllAverageWaitingTime({ start, end, departmentId, options }),
-		total: (await LivechatRooms.findAllAverageWaitingTime({ start, end, departmentId })).length,
+		departments: await LivechatRooms.findAllAverageWaitingTime({ start, end, departmentId, options }).toArray(),
+		total: total.length ? total[0].total : 0,
 	};
 };
 
@@ -85,9 +90,10 @@ export const findAllNumberOfTransferredRoomsAsync = async ({
 	if (!start || !end) {
 		throw new Error('"start" and "end" must be provided');
 	}
+	const total = await Messages.findAllNumberOfTransferredRooms({ start, end, departmentId, onlyCount: true }).toArray();
 	return {
-		departments: await LivechatRooms.findAllNumberOfTransferredRooms({ start, end, departmentId, options }),
-		total: (await LivechatRooms.findAllNumberOfTransferredRooms({ start, end, departmentId })).length,
+		departments: await Messages.findAllNumberOfTransferredRooms({ start, end, departmentId, options }).toArray(),
+		total: total.length ? total[0].total : 0,
 	};
 };
 
@@ -100,9 +106,10 @@ export const findAllNumberOfAbandonedRoomsAsync = async ({
 	if (!start || !end) {
 		throw new Error('"start" and "end" must be provided');
 	}
+	const total = await(await LivechatRooms.findAllNumberOfAbandonedRooms({ start, end, departmentId, onlyCount: true })).toArray();
 	return {
-		departments: await LivechatRooms.findAllNumberOfAbandonedRooms({ start, end, departmentId, options }),
-		total: (await LivechatRooms.findAllNumberOfAbandonedRooms({ start, end, departmentId })).length,
+		departments: await(await LivechatRooms.findAllNumberOfAbandonedRooms({ start, end, departmentId, options })).toArray(),
+		total: total.length ? total[0].total : 0,
 	};
 };
 
@@ -115,9 +122,10 @@ export const findPercentageOfAbandonedRoomsAsync = async ({
 	if (!start || !end) {
 		throw new Error('"start" and "end" must be provided');
 	}
+	const total = await (await LivechatRooms.findPercentageOfAbandonedRooms({ start, end, departmentId, onlyCount: true })).toArray();
 	return {
-		departments: await LivechatRooms.findPercentageOfAbandonedRooms({ start, end, departmentId, options }),
-		total: (await LivechatRooms.findPercentageOfAbandonedRooms({ start, end, departmentId })).length,
+		departments: await(await LivechatRooms.findPercentageOfAbandonedRooms({ start, end, departmentId, options })).toArray(),
+		total: total.length ? total[0].total : 0,
 	};
 };
 
diff --git a/app/models/server/models/LivechatRooms.js b/app/models/server/models/LivechatRooms.js
index f4de7632962b..1a93ce690a0a 100644
--- a/app/models/server/models/LivechatRooms.js
+++ b/app/models/server/models/LivechatRooms.js
@@ -12,6 +12,9 @@ export class LivechatRooms extends Base {
 
 		this.tryEnsureIndex({ open: 1 }, { sparse: true });
 		this.tryEnsureIndex({ departmentId: 1 }, { sparse: true });
+		this.tryEnsureIndex({ 'metrics.chatDuration': 1 }, { sparse: true });
+		this.tryEnsureIndex({ 'metrics.serviceTimeDuration': 1 }, { sparse: true });
+		this.tryEnsureIndex({ 'metrics.visitorInactivity': 1 }, { sparse: true });
 	}
 
 	findLivechat(filter = {}, offset = 0, limit = 20) {
@@ -421,7 +424,7 @@ export class LivechatRooms extends Base {
 
 
 	closeByRoomId(roomId, closeInfo) {
-		const { closer, closedBy, closedAt, chatDuration, ...extraData } = closeInfo;
+		const { closer, closedBy, closedAt, chatDuration, serviceTimeDuration, ...extraData } = closeInfo;
 
 		return this.update({
 			_id: roomId,
@@ -432,6 +435,7 @@ export class LivechatRooms extends Base {
 				closedBy,
 				closedAt,
 				'metrics.chatDuration': chatDuration,
+				'metrics.serviceTimeDuration': serviceTimeDuration,
 				'v.status': 'offline',
 				...extraData,
 			},
diff --git a/app/models/server/raw/LivechatAgentActivity.js b/app/models/server/raw/LivechatAgentActivity.js
index 653a1b994087..7a86cf1bac8a 100644
--- a/app/models/server/raw/LivechatAgentActivity.js
+++ b/app/models/server/raw/LivechatAgentActivity.js
@@ -1,3 +1,5 @@
+import moment from 'moment';
+
 import { BaseRaw } from './BaseRaw';
 
 export class LivechatAgentActivityRaw extends BaseRaw {
@@ -64,4 +66,58 @@ export class LivechatAgentActivityRaw extends BaseRaw {
 		params.push(project);
 		return this.col.aggregate(params).toArray();
 	}
+
+	findAvailableServiceTimeHistory({ start, end, fullReport, onlyCount = false, options = {} }) {
+		const match = {
+			$match: {
+				date: {
+					$gte: parseInt(moment(start).format('YYYYMMDD')),
+					$lte: parseInt(moment(end).format('YYYYMMDD')),
+				},
+			},
+		};
+		const lookup = {
+			$lookup: {
+				from: 'users',
+				localField: 'agentId',
+				foreignField: '_id',
+				as: 'user',
+			},
+		};
+		const unwind = {
+			$unwind: {
+				path: '$user',
+			},
+		};
+		const group = {
+			$group: {
+				_id: { _id: '$user._id', username: '$user.username' },
+				serviceHistory: { $first: '$serviceHistory' },
+				availableTimeInSeconds: { $sum: '$availableTime' },
+			},
+		};
+		const project = {
+			$project: {
+				_id: 0,
+				username: '$_id.username',
+				availableTimeInSeconds: 1,
+			},
+		};
+		if (fullReport) {
+			project.$project.serviceHistory = 1;
+		}
+		const sort = { $sort: options.sort || { username: 1 } };
+		const params = [match, lookup, unwind, group, project, sort];
+		if (onlyCount) {
+			params.push({ $count: 'total' });
+			return this.col.aggregate(params);
+		}
+		if (options.offset) {
+			params.push({ $skip: options.offset });
+		}
+		if (options.count) {
+			params.push({ $limit: options.count });
+		}
+		return this.col.aggregate(params, { allowDiskUse: true });
+	}
 }
diff --git a/app/models/server/raw/LivechatRooms.js b/app/models/server/raw/LivechatRooms.js
index da9ec4282e41..e996eac6e368 100644
--- a/app/models/server/raw/LivechatRooms.js
+++ b/app/models/server/raw/LivechatRooms.js
@@ -94,7 +94,7 @@ export class LivechatRoomsRaw extends BaseRaw {
 		return this.col.aggregate(params).toArray();
 	}
 
-	async findAllNumberOfAbandonedRooms({ start, end, departmentId, options = {} }) {
+	async findAllNumberOfAbandonedRooms({ start, end, departmentId, onlyCount = false, options = {} }) {
 		const match = {
 			$match: {
 				t: 'l',
@@ -103,156 +103,98 @@ export class LivechatRoomsRaw extends BaseRaw {
 				closedAt: { $lte: new Date(end) },
 			},
 		};
-		const lookup = {
-			$lookup: {
-				from: 'rocketchat_livechat_department',
-				localField: 'departmentId',
-				foreignField: '_id',
-				as: 'departments',
-			},
-		};
-		const unwind = {
-			$unwind: {
-				path: '$departments',
-				preserveNullAndEmptyArrays: true,
-			},
-		};
 		const group = {
 			$group: {
 				_id: {
 					_id: null,
-					departmentId: '$departments._id',
-					name: '$departments.name',
+					departmentId: '$departmentId',
 				},
-				rooms: { $push: '$$ROOT' },
+				abandonedRooms: { $sum: 1 },
 			},
 		};
-		const presentationProject = {
+		const project = {
 			$project: {
 				_id: { $ifNull: ['$_id.departmentId', null] },
-				name: { $ifNull: ['$_id.name', null] },
-				abandonedRooms: { $size: '$rooms' },
+				abandonedRooms: 1,
 			},
 		};
-		const firstParams = [match, lookup, unwind];
 		if (departmentId) {
-			firstParams.push({
-				$match: {
-					'departments._id': departmentId,
-				},
-			});
+			match.$match.departmentId = departmentId;
 		}
 		const sort = { $sort: options.sort || { name: 1 } };
-		const params = [...firstParams, group, presentationProject, sort];
+		const params = [match, group, project, sort];
+		if (onlyCount) {
+			params.push({ $count: 'total' });
+			return this.col.aggregate(params);
+		}
 		if (options.offset) {
 			params.push({ $skip: options.offset });
 		}
 		if (options.count) {
 			params.push({ $limit: options.count });
 		}
-		return this.col.aggregate(params).toArray();
+		return this.col.aggregate(params);
 	}
 
-	async findPercentageOfAbandonedRooms({ start, end, departmentId, options = {} }) {
+	async findPercentageOfAbandonedRooms({ start, end, departmentId, onlyCount = false, options = {} }) {
 		const match = {
 			$match: {
 				t: 'l',
 				ts: { $gte: new Date(start), $lte: new Date(end) },
 			},
 		};
-		const lookup = {
-			$lookup: {
-				from: 'rocketchat_livechat_department',
-				localField: 'departmentId',
-				foreignField: '_id',
-				as: 'departments',
-			},
-		};
-		const departmentsUnwind = {
-			$unwind: {
-				path: '$departments',
-				preserveNullAndEmptyArrays: true,
-			},
-		};
-		const departmentsGroup = {
-			$group: {
-				_id: {
-					_id: null,
-					departmentId: '$departments._id',
-					name: '$departments.name',
-				},
-				rooms: { $push: '$$ROOT' },
-			},
-		};
-		const departmentsProject = {
-			$project: {
-				_id: '$_id.departmentId',
-				name: '$_id.name',
-				rooms: 1,
-				sizeOfRooms: { $size: '$rooms' },
-			},
-		};
-		const roomsUnwind = {
-			$unwind: {
-				path: '$rooms',
-				preserveNullAndEmptyArrays: true,
-			},
-		};
-		const roomsGroup = {
+		const group = {
 			$group: {
 				_id: {
 					_id: null,
-					departmentId: '$_id',
-					name: '$name',
-					sizeOfRooms: '$sizeOfRooms',
+					departmentId: '$departmentId',
 				},
+				rooms: { $sum: 1 },
 				abandonedChats: {
 					$sum: {
 						$cond: [{
 							$and: [
-								{ $ifNull: ['$rooms.metrics.visitorInactivity', false] },
-								{ $gte: ['$rooms.metrics.visitorInactivity', await getValue('Livechat_visitor_inactivity_timeout')] },
+								{ $ifNull: ['$metrics.visitorInactivity', false] },
+								{ $gte: ['$metrics.visitorInactivity', await getValue('Livechat_visitor_inactivity_timeout')] },
 							],
 						}, 1, 0],
 					},
 				},
 			},
 		};
-		const presentationProject = {
+		const project = {
 			$project: {
 				_id: { $ifNull: ['$_id.departmentId', null] },
-				name: { $ifNull: ['$_id.name', null] },
 				percentageOfAbandonedChats: {
 					$floor: {
 						$cond: [
-							{ $eq: ['$_id.sizeOfRooms', 0] },
+							{ $eq: ['$rooms', 0] },
 							0,
-							{ $divide: [{ $multiply: ['$abandonedChats', 100] }, '$_id.sizeOfRooms'] },
+							{ $divide: [{ $multiply: ['$abandonedChats', 100] }, '$rooms'] },
 						],
 					},
 				},
 			},
 		};
-		const firstParams = [match, lookup, departmentsUnwind];
 		if (departmentId) {
-			firstParams.push({
-				$match: {
-					'departments._id': departmentId,
-				},
-			});
+			match.$match.departmentId = departmentId;
 		}
 		const sort = { $sort: options.sort || { name: 1 } };
-		const params = [...firstParams, departmentsGroup, departmentsProject, roomsUnwind, roomsGroup, presentationProject, sort];
+		const params = [match, group, project, sort];
+		if (onlyCount) {
+			params.push({ $count: 'total' });
+			return this.col.aggregate(params);
+		}
 		if (options.offset) {
 			params.push({ $skip: options.offset });
 		}
 		if (options.count) {
 			params.push({ $limit: options.count });
 		}
-		return this.col.aggregate(params).toArray();
+		return this.col.aggregate(params);
 	}
 
-	findAllAverageOfChatDurationTime({ start, end, departmentId, options = {} }) {
+	findAllAverageOfChatDurationTime({ start, end, departmentId, onlyCount = false, options = {} }) {
 		const match = {
 			$match: {
 				t: 'l',
@@ -260,84 +202,41 @@ export class LivechatRoomsRaw extends BaseRaw {
 				closedAt: { $lte: new Date(end) },
 			},
 		};
-		const lookup = {
-			$lookup: {
-				from: 'rocketchat_livechat_department',
-				localField: 'departmentId',
-				foreignField: '_id',
-				as: 'departments',
-			},
-		};
-		const departmentsUnwind = {
-			$unwind: {
-				path: '$departments',
-				preserveNullAndEmptyArrays: true,
-			},
-		};
-		const departmentsGroup = {
-			$group: {
-				_id: {
-					_id: null,
-					departmentId: '$departments._id',
-					name: '$departments.name',
-				},
-				rooms: { $push: '$$ROOT' },
-			},
-		};
-		const departmentsProject = {
-			$project: {
-				_id: '$_id.departmentId',
-				name: '$_id.name',
-				rooms: 1,
-				sizeOfRooms: { $size: '$rooms' },
-			},
-		};
-		const roomsUnwind = {
-			$unwind: {
-				path: '$rooms',
-				preserveNullAndEmptyArrays: true,
-			},
-		};
-		const roomsGroup = {
+		const group = {
 			$group: {
 				_id: {
 					_id: null,
-					departmentId: '$_id',
-					name: '$name',
-					sizeOfRooms: '$sizeOfRooms',
-				},
-				chatsDuration: {
-					$sum: '$rooms.metrics.chatDuration',
+					departmentId: '$departmentId',
 				},
+				rooms: { $sum: 1 },
+				chatsDuration: { $sum: '$metrics.chatDuration' },
 			},
 		};
-		const presentationProject = {
+		const project = {
 			$project: {
 				_id: { $ifNull: ['$_id.departmentId', null] },
-				name: { $ifNull: ['$_id.name', null] },
-				averageChatDurationTimeInSeconds: { $ceil: { $cond: [{ $eq: ['$_id.sizeOfRooms', 0] }, 0, { $divide: ['$chatsDuration', '$_id.sizeOfRooms'] }] } },
+				averageChatDurationTimeInSeconds: { $ceil: { $cond: [{ $eq: ['$rooms', 0] }, 0, { $divide: ['$chatsDuration', '$rooms'] }] } },
 			},
 		};
-		const firstParams = [match, lookup, departmentsUnwind];
 		if (departmentId) {
-			firstParams.push({
-				$match: {
-					'departments._id': departmentId,
-				},
-			});
+			match.$match.departmentId = departmentId;
 		}
 		const sort = { $sort: options.sort || { name: 1 } };
-		const params = [...firstParams, departmentsGroup, departmentsProject, roomsUnwind, roomsGroup, presentationProject, sort];
+		const params = [match, group, project, sort];
+		if (onlyCount) {
+			params.push({ $count: 'total' });
+			return this.col.aggregate(params);
+		}
 		if (options.offset) {
 			params.push({ $skip: options.offset });
 		}
 		if (options.count) {
 			params.push({ $limit: options.count });
 		}
-		return this.col.aggregate(params).toArray();
+		return this.col.aggregate(params);
 	}
 
-	findAllAverageWaitingTime({ start, end, departmentId, options = {} }) {
+	findAllAverageWaitingTime({ start, end, departmentId, onlyCount = false, options = {} }) {
 		const match = {
 			$match: {
 				t: 'l',
@@ -345,84 +244,41 @@ export class LivechatRoomsRaw extends BaseRaw {
 				waitingResponse: { $ne: true },
 			},
 		};
-		const lookup = {
-			$lookup: {
-				from: 'rocketchat_room',
-				localField: '_id',
-				foreignField: 'departmentId',
-				as: 'rooms',
-			},
-		};
-		const departmentsUnwind = {
-			$unwind: {
-				path: '$departments',
-				preserveNullAndEmptyArrays: true,
-			},
-		};
-		const departmentsGroup = {
-			$group: {
-				_id: {
-					_id: null,
-					departmentId: '$departments._id',
-					name: '$departments.name',
-				},
-				rooms: { $push: '$$ROOT' },
-			},
-		};
-		const departmentsProject = {
-			$project: {
-				_id: '$_id.departmentId',
-				name: '$_id.name',
-				rooms: 1,
-				sizeOfRooms: { $size: '$rooms' },
-			},
-		};
-		const roomsUnwind = {
-			$unwind: {
-				path: '$rooms',
-				preserveNullAndEmptyArrays: true,
-			},
-		};
-		const roomsGroup = {
+		const group = {
 			$group: {
 				_id: {
 					_id: null,
-					departmentId: '$_id',
-					name: '$name',
-					sizeOfRooms: '$sizeOfRooms',
-				},
-				chatsFirstResponses: {
-					$sum: '$rooms.metrics.response.ft',
+					departmentId: '$departmentId',
 				},
+				rooms: { $sum: 1 },
+				chatsFirstResponses: { $sum: '$metrics.response.ft' },
 			},
 		};
-		const presentationProject = {
+		const project = {
 			$project: {
 				_id: { $ifNull: ['$_id.departmentId', null] },
-				name: { $ifNull: ['$_id.name', null] },
-				averageWaitingTimeInSeconds: { $ceil: { $cond: [{ $eq: ['$_id.sizeOfRooms', 0] }, 0, { $divide: ['$chatsFirstResponses', '$_id.sizeOfRooms'] }] } },
+				averageWaitingTimeInSeconds: { $ceil: { $cond: [{ $eq: ['$rooms', 0] }, 0, { $divide: ['$chatsFirstResponses', '$rooms'] }] } },
 			},
 		};
-		const firstParams = [match, lookup, departmentsUnwind];
 		if (departmentId) {
-			firstParams.push({
-				$match: {
-					'departments._id': departmentId,
-				},
-			});
+			match.$match.departmentId = departmentId;
 		}
 		const sort = { $sort: options.sort || { name: 1 } };
-		const params = [...firstParams, departmentsGroup, departmentsProject, roomsUnwind, roomsGroup, presentationProject, sort];
+		const params = [match, group, project, sort];
+		if (onlyCount) {
+			params.push({ $count: 'total' });
+			return this.col.aggregate(params);
+		}
 		if (options.offset) {
 			params.push({ $skip: options.offset });
 		}
 		if (options.count) {
 			params.push({ $limit: options.count });
 		}
-		return this.col.aggregate(params).toArray();
+		return this.col.aggregate(params);
 	}
 
-	findAllRooms({ start, end, answered, departmentId, options = {} }) {
+	findAllRooms({ start, end, answered, departmentId, onlyCount = false, options = {} }) {
 		const match = {
 			$match: {
 				t: 'l',
@@ -432,149 +288,81 @@ export class LivechatRoomsRaw extends BaseRaw {
 		if (answered !== undefined) {
 			match.$match.waitingResponse = { [answered ? '$ne' : '$eq']: true };
 		}
-		const lookup = {
-			$lookup: {
-				from: 'rocketchat_livechat_department',
-				localField: 'departmentId',
-				foreignField: '_id',
-				as: 'departments',
-			},
-		};
-		const departmentsUnwind = {
-			$unwind: {
-				path: '$departments',
-				preserveNullAndEmptyArrays: true,
-			},
-		};
-		const departmentsGroup = {
+		const group = {
 			$group: {
 				_id: {
 					_id: null,
-					departmentId: '$departments._id',
-					name: '$departments.name',
+					departmentId: '$departmentId',
 				},
-				rooms: { $push: '$$ROOT' },
+				rooms: { $sum: 1 },
 			},
 		};
-		const projects = [
-			{
-				$project: {
-					_id: '$_id.departmentId',
-					name: '$_id.name',
-					rooms: { $size: '$rooms' },
-				},
-			},
-			{
-				$project: {
-					_id: { $ifNull: ['$_id', null] },
-					name: { $ifNull: ['$name', null] },
-					rooms: 1,
-				},
+		const project = {
+			$project: {
+				_id: { $ifNull: ['$_id.departmentId', null] },
+				rooms: 1,
 			},
-		];
-		const firstParams = [match, lookup, departmentsUnwind];
+		};
 		if (departmentId) {
-			firstParams.push({
-				$match: {
-					'departments._id': departmentId,
-				},
-			});
+			match.$match.departmentId = departmentId;
 		}
 		const sort = { $sort: options.sort || { name: 1 } };
-		const params = [...firstParams, departmentsGroup, ...projects, sort];
+		const params = [match, group, project, sort];
+		if (onlyCount) {
+			params.push({ $count: 'total' });
+			return this.col.aggregate(params);
+		}
 		if (options.offset) {
 			params.push({ $skip: options.offset });
 		}
 		if (options.count) {
 			params.push({ $limit: options.count });
 		}
-		return this.col.aggregate(params).toArray();
+		return this.col.aggregate(params);
 	}
 
-	findAllServiceTime({ start, end, departmentId, options = {} }) {
+	findAllServiceTime({ start, end, departmentId, onlyCount = false, options = {} }) {
 		const match = {
 			$match: {
 				t: 'l',
 				ts: { $gte: new Date(start) },
 				closedAt: { $lte: new Date(end) },
+				'metrics.serviceTimeDuration': { $exists: true },
 			},
 		};
-		const lookup = {
-			$lookup: {
-				from: 'rocketchat_livechat_department',
-				localField: 'departmentId',
-				foreignField: '_id',
-				as: 'departments',
-			},
-		};
-		const departmentsUnwind = {
-			$unwind: {
-				path: '$departments',
-				preserveNullAndEmptyArrays: true,
-			},
-		};
-		const departmentsGroup = {
+		const group = {
 			$group: {
 				_id: {
 					_id: null,
-					departmentId: '$departments._id',
-					name: '$departments.name',
+					departmentId: '$departmentId',
 				},
-				rooms: { $push: '$$ROOT' },
+				rooms: { $sum: 1 },
+				serviceTimeDuration: { $sum: '$metrics.serviceTimeDuration' },
 			},
 		};
-		const departmentsProject = {
-			$project: {
-				_id: '$_id.departmentId',
-				name: '$_id.name',
-				rooms: 1,
-				sizeOfRooms: { $size: '$rooms' },
-			},
-		};
-		const roomsUnwind = {
-			$unwind: {
-				path: '$rooms',
-				preserveNullAndEmptyArrays: true,
-			},
-		};
-		const presentationProject = {
+		const project = {
 			$project: {
 				_id: { $ifNull: ['$_id.departmentId', null] },
-				name: { $ifNull: ['$_id.name', null] },
-				chats: '$_id.sizeOfRooms',
-				chatsDuration: { $ceil: '$chatsDuration' },
+				chats: '$rooms',
+				serviceTimeDuration: { $ceil: '$serviceTimeDuration' },
 			},
 		};
-		const roomsGroup = {
-			$group: {
-				_id: {
-					_id: null,
-					departmentId: '$_id',
-					name: '$name',
-					sizeOfRooms: '$sizeOfRooms',
-				},
-				chatsDuration: {
-					$sum: '$rooms.metrics.chatDuration',
-				},
-			},
-		};
-		const firstParams = [match, lookup, departmentsUnwind];
 		if (departmentId) {
-			firstParams.push({
-				$match: {
-					'departments._id': departmentId,
-				},
-			});
+			match.$match.departmentId = departmentId;
 		}
 		const sort = { $sort: options.sort || { name: 1 } };
-		const params = [...firstParams, departmentsGroup, departmentsProject, roomsUnwind, roomsGroup, presentationProject, sort];
+		const params = [match, group, project, sort];
+		if (onlyCount) {
+			params.push({ $count: 'total' });
+			return this.col.aggregate(params);
+		}
 		if (options.offset) {
 			params.push({ $skip: options.offset });
 		}
 		if (options.count) {
 			params.push({ $limit: options.count });
 		}
-		return this.col.aggregate(params).toArray();
+		return this.col.aggregate(params);
 	}
 
 	findAllNumberOfTransferredRooms({ start, end, departmentId, options = {} }) {
@@ -682,7 +470,7 @@ export class LivechatRoomsRaw extends BaseRaw {
 		if (options.count) {
 			params.push({ $limit: options.count });
 		}
-		return this.col.aggregate(params).toArray();
+		return this.col.aggregate(params, { allowDiskUse: true }).toArray();
 	}
 
 	countAllOpenChatsBetweenDate({ start, end, departmentId }) {
@@ -957,6 +745,7 @@ export class LivechatRoomsRaw extends BaseRaw {
 			$match: {
 				t: 'l',
 				ts: { $gte: new Date(start), $lte: new Date(end) },
+				'metrics.chatDuration': { $exists: true },
 			},
 		};
 		const group = {
@@ -997,7 +786,7 @@ export class LivechatRoomsRaw extends BaseRaw {
 		return this.col.aggregate([match, group, project]).toArray();
 	}
 
-	findAllAverageOfServiceTime({ start, end, departmentId, options = {} }) {
+	findAllAverageOfServiceTime({ start, end, departmentId, onlyCount = false, options = {} }) {
 		const match = {
 			$match: {
 				t: 'l',
@@ -1006,87 +795,38 @@ export class LivechatRoomsRaw extends BaseRaw {
 				'servedBy.ts': { $exists: true },
 			},
 		};
-		const lookup = {
-			$lookup: {
-				from: 'rocketchat_livechat_department',
-				localField: 'departmentId',
-				foreignField: '_id',
-				as: 'departments',
-			},
-		};
-		const departmentsUnwind = {
-			$unwind: {
-				path: '$departments',
-				preserveNullAndEmptyArrays: true,
-			},
-		};
-		const departmentsGroup = {
-			$group: {
-				_id: {
-					_id: null,
-					departmentId: '$departments._id',
-					name: '$departments.name',
-				},
-				rooms: { $push: '$$ROOT' },
-			},
-		};
-		const departmentsProject = {
-			$project: {
-				_id: '$_id.departmentId',
-				name: '$_id.name',
-				rooms: 1,
-				sizeOfRooms: { $size: '$rooms' },
-			},
-		};
-		const roomsUnwind = {
-			$unwind: {
-				path: '$rooms',
-				preserveNullAndEmptyArrays: true,
-			},
-		};
-		const serviceTimeProject = {
-			$project: {
-				name: 1,
-				sizeOfRooms: 1,
-				allServiceTime: { $divide: [{ $subtract: ['$rooms.responseBy.lastMessageTs', '$rooms.servedBy.ts'] }, 1000] },
-			},
-		};
-		const roomsGroup = {
+		const group = {
 			$group: {
 				_id: {
 					_id: null,
-					departmentId: '$_id',
-					name: '$name',
-					sizeOfRooms: '$sizeOfRooms',
-					allServiceTime: '$allServiceTime',
+					departmentId: '$departmentId',
 				},
+				rooms: { $sum: 1 },
+				allServiceTime: { $sum: { $divide: [{ $subtract: ['$responseBy.lastMessageTs', '$servedBy.ts'] }, 1000] } },
 			},
-
 		};
-		const presentationProject = {
+		const project = {
 			$project: {
 				_id: { $ifNull: ['$_id.departmentId', null] },
-				name: { $ifNull: ['$_id.name', null] },
-				averageServiceTimeInSeconds: { $ceil: { $cond: [{ $eq: ['$_id.sizeOfRooms', 0] }, 0, { $divide: ['$_id.allServiceTime', '$_id.sizeOfRooms'] }] } },
+				averageServiceTimeInSeconds: { $ceil: { $cond: [{ $eq: ['$rooms', 0] }, 0, { $divide: ['$allServiceTime', '$rooms'] }] } },
 			},
 		};
-		const firstParams = [match, lookup, departmentsUnwind];
 		if (departmentId) {
-			firstParams.push({
-				$match: {
-					'departments._id': departmentId,
-				},
-			});
+			match.$match.departmentId = departmentId;
 		}
 		const sort = { $sort: options.sort || { name: 1 } };
-		const params = [...firstParams, departmentsGroup, departmentsProject, roomsUnwind, serviceTimeProject, roomsGroup, presentationProject, sort];
+		const params = [match, group, project, sort];
+		if (onlyCount) {
+			params.push({ $count: 'total' });
+			return this.col.aggregate(params);
+		}
 		if (options.offset) {
 			params.push({ $skip: options.offset });
 		}
 		if (options.count) {
 			params.push({ $limit: options.count });
 		}
-		return this.col.aggregate(params).toArray();
+		return this.col.aggregate(params);
 	}
 
 	findByVisitorId(visitorId, options) {
@@ -1140,4 +880,97 @@ export class LivechatRoomsRaw extends BaseRaw {
 		}
 		return this.find(query, { sort: options.sort || { name: 1 }, skip: options.offset, limit: options.count });
 	}
+
+	findAllServiceTimeByAgent({ start, end, onlyCount = false, options = {} }) {
+		const match = {
+			$match: {
+				t: 'l',
+				'servedBy._id': { $exists: true },
+				'metrics.serviceTimeDuration': { $exists: true },
+				ts: {
+					$gte: start,
+					$lte: end,
+				},
+			},
+		};
+		const group = {
+			$group: {
+				_id: { _id: '$servedBy._id', username: '$servedBy.username' },
+				chats: { $sum: 1 },
+				serviceTimeDuration: { $sum: '$metrics.serviceTimeDuration' },
+			},
+		};
+		const project = {
+			$project: {
+				_id: '$_id._id',
+				username: '$_id.username',
+				chats: 1,
+				serviceTimeDuration: { $ceil: '$serviceTimeDuration' },
+			},
+		};
+		const sort = { $sort: options.sort || { username: 1 } };
+		const params = [match, group, project, sort];
+		if (onlyCount) {
+			params.push({ $count: 'total' });
+			return this.col.aggregate(params);
+		}
+		if (options.offset) {
+			params.push({ $skip: options.offset });
+		}
+		if (options.count) {
+			params.push({ $limit: options.count });
+		}
+		return this.col.aggregate(params);
+	}
+
+	findAllAverageServiceTimeByAgents({ start, end, onlyCount = false, options = {} }) {
+		const match = {
+			$match: {
+				t: 'l',
+				'servedBy._id': { $exists: true },
+				'metrics.serviceTimeDuration': { $exists: true },
+				ts: {
+					$gte: start,
+					$lte: end,
+				},
+			},
+		};
+		const group = {
+			$group: {
+				_id: { _id: '$servedBy._id', username: '$servedBy.username' },
+				chats: { $sum: 1 },
+				serviceTimeDuration: { $sum: '$metrics.serviceTimeDuration' },
+			},
+		};
+		const project = {
+			$project: {
+				_id: '$_id._id',
+				username: '$_id.username',
+				name: '$_id.name',
+				active: '$_id.active',
+				averageServiceTimeInSeconds: {
+					$ceil: {
+						$cond: [
+							{ $eq: ['$chats', 0] },
+							0,
+							{ $divide: ['$serviceTimeDuration', '$chats'] },
+						],
+					},
+				},
+			},
+		};
+		const sort = { $sort: options.sort || { username: 1 } };
+		const params = [match, group, project, sort];
+		if (onlyCount) {
+			params.push({ $count: 'total' });
+			return this.col.aggregate(params);
+		}
+		if (options.offset) {
+			params.push({ $skip: options.offset });
+		}
+		if (options.count) {
+			params.push({ $limit: options.count });
+		}
+		return this.col.aggregate(params);
+	}
 }
diff --git a/app/models/server/raw/Messages.js b/app/models/server/raw/Messages.js
index c1d4d7e7a570..fcda4e0c85ca 100644
--- a/app/models/server/raw/Messages.js
+++ b/app/models/server/raw/Messages.js
@@ -47,4 +47,63 @@ export class MessagesRaw extends BaseRaw {
 
 		return this.find(query, options);
 	}
+
+	findAllNumberOfTransferredRooms({ start, end, departmentId, onlyCount = false, options = {} }) {
+		const match = {
+			$match: {
+				t: 'livechat_transfer_history',
+				ts: { $gte: new Date(start), $lte: new Date(end) },
+			},
+		};
+		const lookup = {
+			$lookup: {
+				from: 'rocketchat_room',
+				localField: 'rid',
+				foreignField: '_id',
+				as: 'room',
+			},
+		};
+		const unwind = {
+			$unwind: {
+				path: '$room',
+				preserveNullAndEmptyArrays: true,
+			},
+		};
+		const group = {
+			$group: {
+				_id: {
+					_id: null,
+					departmentId: '$room.departmentId',
+				},
+				numberOfTransferredRooms: { $sum: 1 },
+			},
+		};
+		const project = {
+			$project: {
+				_id: { $ifNull: ['$_id.departmentId', null] },
+				numberOfTransferredRooms: 1,
+			},
+		};
+		const firstParams = [match, lookup, unwind];
+		if (departmentId) {
+			firstParams.push({
+				$match: {
+					'room.departmentId': departmentId,
+				},
+			});
+		}
+		const sort = { $sort: options.sort || { name: 1 } };
+		const params = [...firstParams, group, project, sort];
+		if (onlyCount) {
+			params.push({ $count: 'total' });
+			return this.col.aggregate(params);
+		}
+		if (options.offset) {
+			params.push({ $skip: options.offset });
+		}
+		if (options.count) {
+			params.push({ $limit: options.count });
+		}
+		return this.col.aggregate(params, { allowDiskUse: true });
+	}
 }
diff --git a/app/models/server/raw/Users.js b/app/models/server/raw/Users.js
index 1dad38cb27b1..1984357c52db 100644
--- a/app/models/server/raw/Users.js
+++ b/app/models/server/raw/Users.js
@@ -1,4 +1,3 @@
-import moment from 'moment';
 import s from 'underscore.string';
 
 import { BaseRaw } from './BaseRaw';
@@ -98,168 +97,6 @@ export class UsersRaw extends BaseRaw {
 		]).toArray();
 	}
 
-	findAllAverageServiceTime({ start, end, options = {} }) {
-		const roomsFilter = [
-			{ $gte: ['$$room.ts', new Date(start)] },
-			{ $lte: ['$$room.ts', new Date(end)] },
-		];
-		const match = { $match: { roles: { $in: ['livechat-agent'] } } };
-		const lookup = {
-			$lookup: {
-				from: 'rocketchat_room',
-				localField: '_id',
-				foreignField: 'servedBy._id',
-				as: 'rooms',
-			},
-		};
-		const projects = [
-			{
-				$project: {
-					user: '$$ROOT',
-					rooms: {
-						$filter: {
-							input: '$rooms',
-							as: 'room',
-							cond: {
-								$and: roomsFilter,
-							},
-						},
-					},
-				},
-			},
-			{
-				$project: {
-					user: '$user',
-					chats: { $size: '$rooms' },
-					chatsDuration: { $sum: '$rooms.metrics.chatDuration' },
-				},
-			},
-			{
-				$project: {
-					username: '$user.username',
-					name: '$user.name',
-					active: '$user.active',
-					averageServiceTimeInSeconds: {
-						$ceil: {
-							$cond: [
-								{ $eq: ['$chats', 0] },
-								0,
-								{ $divide: ['$chatsDuration', '$chats'] },
-							],
-						},
-					},
-				},
-			}];
-		const sort = { $sort: options.sort || { username: 1 } };
-		const params = [match, lookup, ...projects, sort];
-		if (options.offset) {
-			params.push({ $skip: options.offset });
-		}
-		if (options.count) {
-			params.push({ $limit: options.count });
-		}
-		return this.col.aggregate(params).toArray();
-	}
-
-	findAllServiceTime({ start, end, options = {} }) {
-		const roomsFilter = [
-			{ $gte: ['$$room.ts', new Date(start)] },
-			{ $lte: ['$$room.ts', new Date(end)] },
-		];
-		const match = { $match: { roles: { $in: ['livechat-agent'] } } };
-		const lookup = {
-			$lookup: {
-				from: 'rocketchat_room',
-				localField: '_id',
-				foreignField: 'servedBy._id',
-				as: 'rooms',
-			},
-		};
-		const projects = [
-			{
-				$project: {
-					user: '$$ROOT',
-					rooms: {
-						$filter: {
-							input: '$rooms',
-							as: 'room',
-							cond: {
-								$and: roomsFilter,
-							},
-						},
-					},
-				},
-			},
-			{
-				$project: {
-					username: '$user.username',
-					name: '$user.name',
-					active: '$user.active',
-					chats: { $size: '$rooms' },
-					chatsDuration: { $ceil: { $sum: '$rooms.metrics.chatDuration' } },
-				},
-			}];
-		const sort = { $sort: options.sort || { username: 1 } };
-		const params = [match, lookup, ...projects, sort];
-		if (options.offset) {
-			params.push({ $skip: options.offset });
-		}
-		if (options.count) {
-			params.push({ $limit: options.count });
-		}
-		return this.col.aggregate(params).toArray();
-	}
-
-	findAvailableServiceTimeHistory({ start, end, fullReport, options = {} }) {
-		const sessionFilter = [
-			{ $gte: ['$$session.date', parseInt(moment(start).format('YYYYMMDD'))] },
-			{ $lte: ['$$session.date', parseInt(moment(end).format('YYYYMMDD'))] },
-		];
-		const match = { $match: { roles: { $in: ['livechat-agent'] } } };
-		const lookup = {
-			$lookup: {
-				from: 'rocketchat_livechat_agent_activity',
-				localField: '_id',
-				foreignField: 'agentId',
-				as: 'sessions',
-			},
-		};
-		const sessionProject = {
-			$project: {
-				user: '$$ROOT',
-				sessions: {
-					$filter: {
-						input: '$sessions',
-						as: 'session',
-						cond: {
-							$and: sessionFilter,
-						},
-					},
-				},
-			},
-		};
-		const presentationProject = {
-			$project: {
-				username: '$user.username',
-				name: '$user.name',
-				active: '$user.active',
-				availableTimeInSeconds: { $sum: '$sessions.availableTime' },
-			},
-		};
-		if (fullReport) {
-			presentationProject.$project['sessions.serviceHistory'] = 1;
-		}
-		const sort = { $sort: options.sort || { username: 1 } };
-		const params = [match, lookup, sessionProject, presentationProject, sort];
-		if (options.offset) {
-			params.push({ $skip: options.offset });
-		}
-		if (options.count) {
-			params.push({ $limit: options.count });
-		}
-		return this.col.aggregate(params).toArray();
-	}
-
 	findActiveByUsernameOrNameRegexWithExceptionsAndConditions(searchTerm, exceptions, conditions, options) {
 		if (exceptions == null) { exceptions = []; }
 		if (conditions == null) { conditions = {}; }

From 292a7c3b30e1946f65680c62a41b6771a6acfabb Mon Sep 17 00:00:00 2001
From: Douglas Gubert <d-gubert@users.noreply.github.com>
Date: Thu, 19 Mar 2020 19:16:42 -0300
Subject: [PATCH 033/223] [NEW] Experimental Game Center (externalComponents
 implementation) (#15123)

---
 app/api/server/v1/groups.js                   |   2 +-
 app/apps/assets/stylesheets/apps.css          |  51 +++
 app/apps/client/RealAppsEngineUIHost.js       |  58 +++
 app/apps/client/gameCenter/gameCenter.html    |  69 ++++
 app/apps/client/gameCenter/gameCenter.js      | 110 +++++
 app/apps/client/gameCenter/gameContainer.html |  30 ++
 app/apps/client/gameCenter/gameContainer.js   |  65 +++
 app/apps/client/gameCenter/invitePlayers.html |  54 +++
 app/apps/client/gameCenter/invitePlayers.js   | 219 ++++++++++
 app/apps/client/gameCenter/tabBar.js          |  35 ++
 app/apps/client/index.js                      |   5 +
 app/apps/client/orchestrator.js               |  11 +-
 app/apps/server/bridges/listeners.js          |   6 +
 app/apps/server/communication/rest.js         |  26 ++
 app/apps/server/orchestrator.js               |  16 +
 app/ui-flextab/client/flexTabBar.js           |   3 +
 app/ui-master/public/README.md                |   9 +-
 app/ui-master/public/icons.svg                | 377 ++++++++++++++++++
 app/ui-master/public/icons/game.svg           |   3 +
 .../icons/{livechat.svg => omnichannel.svg}   |   4 +-
 app/ui-utils/client/index.js                  |   2 +-
 app/ui-utils/client/lib/TabBar.js             |   4 +-
 package-lock.json                             |  11 +-
 package.json                                  |   2 +-
 packages/rocketchat-i18n/i18n/en.i18n.json    |   5 +
 packages/rocketchat-i18n/i18n/pt-BR.i18n.json |   3 +
 packages/rocketchat-i18n/i18n/zh.i18n.json    |   5 +-
 private/public/icons.svg                      |   9 +-
 28 files changed, 1167 insertions(+), 27 deletions(-)
 create mode 100644 app/apps/client/RealAppsEngineUIHost.js
 create mode 100644 app/apps/client/gameCenter/gameCenter.html
 create mode 100644 app/apps/client/gameCenter/gameCenter.js
 create mode 100644 app/apps/client/gameCenter/gameContainer.html
 create mode 100644 app/apps/client/gameCenter/gameContainer.js
 create mode 100644 app/apps/client/gameCenter/invitePlayers.html
 create mode 100644 app/apps/client/gameCenter/invitePlayers.js
 create mode 100644 app/apps/client/gameCenter/tabBar.js
 create mode 100644 app/ui-master/public/icons.svg
 create mode 100644 app/ui-master/public/icons/game.svg
 rename app/ui-master/public/icons/{livechat.svg => omnichannel.svg} (96%)

diff --git a/app/api/server/v1/groups.js b/app/api/server/v1/groups.js
index 6c2b45b388b0..254c5b885346 100644
--- a/app/api/server/v1/groups.js
+++ b/app/api/server/v1/groups.js
@@ -8,7 +8,7 @@ import { normalizeMessagesForUser } from '../../../utils/server/lib/normalizeMes
 import { API } from '../api';
 
 // Returns the private group subscription IF found otherwise it will return the failure of why it didn't. Check the `statusCode` property
-function findPrivateGroupByIdOrName({ params, userId, checkedArchived = true }) {
+export function findPrivateGroupByIdOrName({ params, userId, checkedArchived = true }) {
 	if ((!params.roomId || !params.roomId.trim()) && (!params.roomName || !params.roomName.trim())) {
 		throw new Meteor.Error('error-room-param-not-provided', 'The parameter "roomId" or "roomName" is required');
 	}
diff --git a/app/apps/assets/stylesheets/apps.css b/app/apps/assets/stylesheets/apps.css
index 438b99d813ee..e9776bd9a838 100644
--- a/app/apps/assets/stylesheets/apps.css
+++ b/app/apps/assets/stylesheets/apps.css
@@ -370,6 +370,57 @@
 	}
 }
 
+.rc-game {
+	&__list {
+		.rc-table-title {
+			width: 135px;
+		}
+	}
+
+	&__container {
+		height: calc(100% - 79px);
+	}
+
+	&__close {
+		position: absolute;
+		top: -30px;
+		right: -25px;
+
+		cursor: pointer;
+
+		color: #e9ebee;
+
+		font-size: 20px;
+
+		&:hover {
+			color: white;
+		}
+	}
+
+	&__main {
+		min-width: 400px;
+		height: 100%;
+	}
+}
+
+.rc-game-modal {
+	&__container {
+		margin: -14px -14px -18px;
+	}
+
+	&__main {
+		min-height: 730px;
+	}
+}
+
+.rc-icon.game-center__invite-players-icon.game-center__invite-players-icon--plus {
+	font-size: 18px;
+
+	&:hover {
+		color: #1d74f5;
+	}
+}
+
 @keyframes play90 {
 	0% {
 		right: -798px;
diff --git a/app/apps/client/RealAppsEngineUIHost.js b/app/apps/client/RealAppsEngineUIHost.js
new file mode 100644
index 000000000000..5d5274b7afb5
--- /dev/null
+++ b/app/apps/client/RealAppsEngineUIHost.js
@@ -0,0 +1,58 @@
+import { Meteor } from 'meteor/meteor';
+import { Session } from 'meteor/session';
+import { AppsEngineUIHost } from '@rocket.chat/apps-engine/client/AppsEngineUIHost';
+
+import { Rooms } from '../../models/client';
+import { APIClient } from '../../utils/client';
+import { getUserAvatarURL } from '../../utils/lib/getUserAvatarURL';
+
+export class RealAppsEngineUIHost extends AppsEngineUIHost {
+	constructor() {
+		super();
+
+		this._baseURL = document.baseURI.slice(0, -1);
+	}
+
+	getUserAvatarUrl(username) {
+		const avatarUrl = getUserAvatarURL(username);
+
+		if (!avatarUrl.startsWith('http') && !avatarUrl.startsWith('data')) {
+			return `${ this._baseURL }${ avatarUrl }`;
+		}
+
+		return avatarUrl;
+	}
+
+	async getClientRoomInfo() {
+		const { name: slugifiedName, _id: id } = Rooms.findOne(Session.get('openedRoom'));
+
+		let cachedMembers = [];
+		try {
+			const { members } = await APIClient.get('v1/groups.members', { roomId: id });
+
+			cachedMembers = members.map(({ _id, username }) => ({
+				id: _id,
+				username,
+				avatarUrl: this.getUserAvatarUrl(username),
+			}));
+		} catch (error) {
+			console.warn(error);
+		}
+
+		return {
+			id,
+			slugifiedName,
+			members: cachedMembers,
+		};
+	}
+
+	async getClientUserInfo() {
+		const { username, _id } = Meteor.user();
+
+		return {
+			id: _id,
+			username,
+			avatarUrl: this.getUserAvatarUrl(username),
+		};
+	}
+}
diff --git a/app/apps/client/gameCenter/gameCenter.html b/app/apps/client/gameCenter/gameCenter.html
new file mode 100644
index 000000000000..2ca752b93ca1
--- /dev/null
+++ b/app/apps/client/gameCenter/gameCenter.html
@@ -0,0 +1,69 @@
+<template name="GameCenter">
+	{{#table onScroll=onTableScroll onResize=onTableResize onSort=onTableSort}}
+	<tbody class="rc-game__list">
+		<thead>
+			<tr>
+				<th class="js-sort rc-table-td--medium" data-sort="name">
+					<div class="table-fake-th">{{_ "Name"}}</div>
+				</th>
+				<th class="rc-table-td">
+					<div class="table-fake-th">{{_ "Description"}} </div>
+				</th>
+			</tr>
+		</thead>
+		{{#each games}}
+		<tr class="rc-game-center__game" data-name="{{name}}">
+			<td>
+				<div class="rc-table-wrapper">
+					{{#if icon}}
+					<div class="rc-table-avatar" style="background-image:url({{icon}})"></div>
+					{{/if}}
+					<div class="rc-table-info">
+						<span class="rc-table-title">
+							{{name}}
+						</span>
+					</div>
+				</div>
+			</td>
+			<td>
+				<div class="rc-table-wrapper">
+					<div class="rc-table-info">
+						<span class="rc-table-title">
+							{{#if summary}}
+							{{summary}}
+							{{else}}
+							{{description}}
+							{{/if}}
+						</span>
+						{{#if summary}}
+						<span class="rc-table-subtitle">
+							{{description}}
+						</span>
+						{{/if}}
+					</div>
+				</div>
+			</td>
+			<td>
+				<div class="rc-table-wrapper">
+					<div class="rc-table-info">
+							<button class="rc-tooltip game-center__invite-players js-invite" aria-label="Invite Friends">
+									{{> icon block="game-center__invite-players-icon" icon="plus"}}
+							</button>
+					</div>
+				</div>
+			</td>
+		</tr>
+		{{/each}}
+		{{#if isLoading}}
+		<tr>
+			<td colspan="3" style="position: relative;">{{> loading}}</td>
+		</tr>
+		{{/if}}
+	</tbody>
+	{{/table}}
+	<div class="rc-user-info-container flex-nav animated{{#unless showGame}} animated-hidden{{/unless}}">
+		{{#if showGame}}
+			{{> GameContainer (gameContainerOptions) }}
+		{{/if}}
+	</div>
+</template>
diff --git a/app/apps/client/gameCenter/gameCenter.js b/app/apps/client/gameCenter/gameCenter.js
new file mode 100644
index 000000000000..91e092b4f97a
--- /dev/null
+++ b/app/apps/client/gameCenter/gameCenter.js
@@ -0,0 +1,110 @@
+import toastr from 'toastr';
+import { Template } from 'meteor/templating';
+import { ReactiveVar } from 'meteor/reactive-var';
+
+import { modal } from '../../../ui-utils/client';
+import { APIClient, t } from '../../../utils/client';
+
+const getExternalComponents = async (instance) => {
+	try {
+		const { externalComponents } = await APIClient.get('apps/externalComponents');
+		instance.games.set(externalComponents);
+	} catch (e) {
+		toastr.error((e.xhr.responseJSON && e.xhr.responseJSON.error) || e.message);
+	}
+
+	instance.isLoading.set(false);
+	instance.ready.set(true);
+};
+
+const openGame = (gameManifestInfo) => {
+	const instance = Template.instance();
+	const { location = 'MODAL' } = gameManifestInfo;
+
+	if (location === 'CONTEXTUAL_BAR') {
+		instance.gameManifestInfo.set(gameManifestInfo);
+	} else if (location === 'MODAL') {
+		modal.open({
+			allowOutsideClick: false,
+			data: {
+				game: gameManifestInfo,
+			},
+			template: 'GameContainer',
+			type: 'rc-game',
+		});
+	}
+};
+
+Template.GameCenter.helpers({
+	isReady() {
+		if (Template.instance().ready != null) {
+			return Template.instance().ready.get();
+		}
+		return false;
+	},
+	games() {
+		return Template.instance().games.get();
+	},
+	isLoading() {
+		return Template.instance().isLoading.get();
+	},
+	onTableScroll() {
+		const instance = Template.instance();
+		if (instance.loading || instance.end.get()) {
+			return;
+		}
+		return function(currentTarget) {
+			if (currentTarget.offsetHeight + currentTarget.scrollTop >= currentTarget.scrollHeight - 100) {
+				return instance.page.set(instance.page.get() + 1);
+			}
+		};
+	},
+	showGame() {
+		return Template.instance().gameManifestInfo.get();
+	},
+	gameContainerOptions() {
+		const { gameManifestInfo, clearGameManifestInfo } = Template.instance();
+
+		return {
+			game: gameManifestInfo.get(),
+			showBackButton: true,
+			clearGameManifestInfo,
+		};
+	},
+});
+
+Template.GameCenter.onCreated(function() {
+	this.ready = new ReactiveVar(false);
+	this.games = new ReactiveVar([]);
+	this.isLoading = new ReactiveVar(true);
+	this.page = new ReactiveVar(0);
+	this.end = new ReactiveVar(false);
+
+	this.gameManifestInfo = new ReactiveVar(null);
+
+	this.clearGameManifestInfo = () => {
+		this.gameManifestInfo.set(null);
+	};
+
+	getExternalComponents(this);
+});
+
+Template.GameCenter.events({
+	'click .rc-game-center__game'() {
+		const gameManifestInfo = this;
+
+		openGame(gameManifestInfo);
+	},
+	'click .js-invite'(event) {
+		event.stopPropagation();
+		modal.open({
+			title: t('Invite You Friends to Join'),
+			content: 'InvitePlayers',
+			data: this,
+			confirmOnEnter: false,
+			showCancelButton: false,
+			showConfirmButton: false,
+			html: false,
+		});
+	},
+});
diff --git a/app/apps/client/gameCenter/gameContainer.html b/app/apps/client/gameCenter/gameContainer.html
new file mode 100644
index 000000000000..6bbb136df0ed
--- /dev/null
+++ b/app/apps/client/gameCenter/gameContainer.html
@@ -0,0 +1,30 @@
+<template name="GameContainer">
+	{{#if isContextualBar}}
+	<header class="contextual-bar__header">
+		<div class="contextual-bar__header-data">
+			{{#if showBackButton}}
+			<button
+				class="rc-button rc-button--nude contextual-bar__header-back-btn js-back"
+				title="{{_ 'Back_to_Game_Center'}}"
+			>
+				<i class="icon-angle-left"></i>
+			</button>
+			{{/if}}
+			<img class="rc-table-avatar contextual-bar__header-icon" src="{{ game.icon }}">
+			<h1 class="contextual-bar__header-title">{{ game.name }}</h1>
+		</div>
+		<button class="contextual-bar__header-close js-close">
+			{{> icon block="contextual-bar__header-close-icon" icon="plus"}}
+		</button>
+	</header>
+	{{/if}}
+
+	{{#if isLoading}}
+		{{> loading}}
+	{{else}}
+		<div class="rc-game__container {{#if isModal}} rc-game-modal__container {{/if}}">
+			<div class="rc-game__close">✖</div>
+			<iframe class="rc-game__main {{#if isModal}} rc-game-modal__main {{/if}}" src="{{ game.url }}"></iframe>
+		</div>
+	{{/if}}
+</template>
diff --git a/app/apps/client/gameCenter/gameContainer.js b/app/apps/client/gameCenter/gameContainer.js
new file mode 100644
index 000000000000..2d26d4e541c6
--- /dev/null
+++ b/app/apps/client/gameCenter/gameContainer.js
@@ -0,0 +1,65 @@
+import { Template } from 'meteor/templating';
+
+import { modal } from '../../../ui-utils/client';
+import { Apps } from '../orchestrator';
+import { APIClient } from '../../../utils/client';
+
+import './gameContainer.html';
+
+const getExternalComponent = async () => {
+	const { data: { game: externalComponent } } = Template.instance();
+	const realAppClientUIHost = Apps.getUIHost();
+	const currentUser = await realAppClientUIHost.getClientUserInfo();
+	const currentRoom = await realAppClientUIHost.getClientRoomInfo();
+
+	externalComponent.state = {
+		currentUser,
+		currentRoom,
+	};
+
+	return externalComponent;
+};
+
+Template.GameContainer.helpers({
+	isContextualBar() {
+		const { data: { game } } = Template.instance();
+		const { location } = game;
+
+		return location === 'CONTEXTUAL_BAR';
+	},
+	isModal() {
+		const { data: { game } } = Template.instance();
+		const { location } = game;
+
+		return location === 'MODAL';
+	},
+});
+
+Template.GameContainer.events({
+	'click .rc-game__close'() {
+		modal.cancel();
+	},
+	'click .js-back'() {
+		const { data: { clearGameManifestInfo } } = Template.instance();
+
+		clearGameManifestInfo();
+	},
+});
+
+Template.GameContainer.onCreated(async () => {
+	const externalComponent = await getExternalComponent();
+
+	APIClient.post('apps/externalComponentEvent', {
+		event: 'IPostExternalComponentOpened',
+		externalComponent,
+	});
+});
+
+Template.GameContainer.onDestroyed(async () => {
+	const externalComponent = await getExternalComponent();
+
+	APIClient.post('apps/externalComponentEvent', {
+		event: 'IPostExternalComponentClosed',
+		externalComponent,
+	});
+});
diff --git a/app/apps/client/gameCenter/invitePlayers.html b/app/apps/client/gameCenter/invitePlayers.html
new file mode 100644
index 000000000000..a74e14ce30bf
--- /dev/null
+++ b/app/apps/client/gameCenter/invitePlayers.html
@@ -0,0 +1,54 @@
+<template name="InvitePlayers">
+
+	<section class="invite-players">
+		<div class="invite-players__wrapper">
+			<form id="invite-players" class="invite-players__content">
+				<div class="invite-players__inputs">
+					{{> SearchInvitePlayers
+						onClickTag=onClickTagUser
+						deleteLastItem=deleteLastItemUser
+						list=selectedUsers
+						onSelect=onSelectUser
+						collection='UserAndRoom'
+						endpoint='users.autocomplete'
+						field='username'
+						sort='username'
+						label="Invite_Users"
+						placeholder="Username_Placeholder"
+						name="users"
+						icon="at"
+						noMatchTemplate="userSearchEmpty"
+						templateItem="popupList_item_default"
+						modifier=userModifier
+					}}
+				</div>
+				<input form="invite-players" style="background-color: #1D74F5; float: right;" class="rc-button rc-button--right rc-button--primary js-invite-players" type="submit" data-button="create" value="Invite">
+			</form>
+		</div>
+	</section>
+</template>
+
+<template name="SearchInvitePlayers">
+	<div class="rc-input" id='search-{{name}}' {{disabled}}>
+		<label class="rc-input__label">
+			<div class="rc-input__title">{{_ label}}</div>
+			<div class="rc-input__wrapper">
+				{{# if icon}}
+				<div class="rc-input__icon">
+					{{> icon block="rc-input__icon-svg" icon=icon}}
+				</div>
+				{{/if}}
+				<div class="rc-tags{{# unless icon}} rc-tags--no-icon{{/unless}}">
+					{{#each item in list}} {{> tag item}} {{/each}}
+					<input type="text" id="{{name}}" class="rc-tags__input" placeholder="{{_ placeholder}}" name="{{name}}" autocomplete="off" {{disabled}} />
+				</div>
+			</div>
+			{{#with config}}
+				{{#if autocomplete 'isShowing'}}
+					{{> popupList data=config items=items ready=(autocomplete 'isLoaded')}}
+				{{/if}}
+			{{/with}}
+		</label>
+		<div class="rc-input__description">{{ description }}</div>
+	</div>
+</template>
diff --git a/app/apps/client/gameCenter/invitePlayers.js b/app/apps/client/gameCenter/invitePlayers.js
new file mode 100644
index 000000000000..31616bbf3862
--- /dev/null
+++ b/app/apps/client/gameCenter/invitePlayers.js
@@ -0,0 +1,219 @@
+import { Meteor } from 'meteor/meteor';
+import { Random } from 'meteor/random';
+import { Template } from 'meteor/templating';
+import { ReactiveVar } from 'meteor/reactive-var';
+import { Blaze } from 'meteor/blaze';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
+
+import { AutoComplete } from '../../../meteor-autocomplete/client';
+import { roomTypes } from '../../../utils/client';
+import { ChatRoom } from '../../../models/client';
+import { call, modal } from '../../../ui-utils/client';
+
+import './invitePlayers.html';
+
+Template.InvitePlayers.helpers({
+	onSelectUser() {
+		return Template.instance().onSelectUser;
+	},
+	selectedUsers() {
+		const myUsername = Meteor.user().username;
+		const { message } = this;
+		const users = Template.instance().selectedUsers.get().map((e) => e);
+		if (message) {
+			users.unshift(message.u);
+		}
+		return users.filter(({ username }) => myUsername !== username);
+	},
+	onClickTagUser() {
+		return Template.instance().onClickTagUser;
+	},
+	deleteLastItemUser() {
+		return Template.instance().deleteLastItemUser;
+	},
+	onClickTagRoom() {
+		return Template.instance().onClickTagRoom;
+	},
+	deleteLastItemRoom() {
+		return Template.instance().deleteLastItemRoom;
+	},
+	selectedRoom() {
+		return Template.instance().selectedRoom.get();
+	},
+	onSelectRoom() {
+		return Template.instance().onSelectRoom;
+	},
+	roomCollection() {
+		return ChatRoom;
+	},
+	roomSelector() {
+		return (expression) => ({ name: { $regex: `.*${ expression }.*` } });
+	},
+	roomModifier() {
+		return (filter, text = '') => {
+			const f = filter.get();
+			return `#${ f.length === 0 ? text : text.replace(new RegExp(filter.get()), (part) => `<strong>${ part }</strong>`) }`;
+		};
+	},
+	userModifier() {
+		return (filter, text = '') => {
+			const f = filter.get();
+			return `@${ f.length === 0 ? text : text.replace(new RegExp(filter.get()), (part) => `<strong>${ part }</strong>`) }`;
+		};
+	},
+	nameSuggestion() {
+		return Template.instance().discussionName.get();
+	},
+});
+
+Template.InvitePlayers.events({
+	async 'submit #invite-players, click .js-invite-players'(e, instance) {
+		e.preventDefault();
+
+		const { data: { name } } = instance;
+		const users = instance.selectedUsers.get().map(({ username }) => username);
+		const privateGroupName = `${ name.replace(/\s/g, '-') }-${ Random.id(10) }`;
+
+		try {
+			const result = await call('createPrivateGroup', privateGroupName, users);
+
+			roomTypes.openRouteLink(result.t, result);
+
+			// setTimeout ensures the message is only sent after the
+			// user has been redirected to the new room, preventing a
+			// weird bug that made the message appear as unsent until
+			// the screen gets refreshed
+			setTimeout(() => call('sendMessage', {
+				_id: Random.id(),
+				rid: result.rid,
+				msg: TAPi18n.__('Game_Center_Play_Game_Together', { name }),
+			}), 100);
+
+			modal.close();
+		} catch (err) {
+			console.warn(err);
+		}
+	},
+});
+
+Template.InvitePlayers.onCreated(function() {
+	this.selectedUsers = new ReactiveVar([]);
+	this.onSelectUser = ({ item: user }) => {
+		if (user.username === Meteor.user().username) {
+			return;
+		}
+		const users = this.selectedUsers.get();
+		if (!users.find((u) => user.username === u.username)) {
+			this.selectedUsers.set([...users, user]);
+		}
+	};
+	this.onClickTagUser = ({ username }) => {
+		this.selectedUsers.set(this.selectedUsers.get().filter((user) => user.username !== username));
+	};
+	this.deleteLastItemUser = () => {
+		const arr = this.selectedUsers.get();
+		arr.pop();
+		this.selectedUsers.set(arr);
+	};
+});
+
+Template.SearchInvitePlayers.helpers({
+	list() {
+		return this.list;
+	},
+	items() {
+		return Template.instance().ac.filteredList();
+	},
+	config() {
+		const { filter } = Template.instance();
+		const { noMatchTemplate, templateItem, modifier } = Template.instance().data;
+		return {
+			filter: filter.get(),
+			template_item: templateItem,
+			noMatchTemplate,
+			modifier(text) {
+				return modifier(filter, text);
+			},
+		};
+	},
+	autocomplete(key) {
+		const instance = Template.instance();
+		const param = instance.ac[key];
+		return typeof param === 'function' ? param.apply(instance.ac) : param;
+	},
+});
+
+Template.SearchInvitePlayers.events({
+	'input input'(e, t) {
+		const input = e.target;
+		const position = input.selectionEnd || input.selectionStart;
+		const { length } = input.value;
+		document.activeElement === input && e && /input/i.test(e.type) && (input.selectionEnd = position + input.value.length - length);
+		t.filter.set(input.value);
+	},
+	'click .rc-popup-list__item'(e, t) {
+		t.ac.onItemClick(this, e);
+	},
+	'keydown input'(e, t) {
+		const KEYCODE_BACKSPACE = 8;
+		const KEYCODE_DELETE = 46;
+
+		t.ac.onKeyDown(e);
+		if ([KEYCODE_BACKSPACE, KEYCODE_DELETE].includes(e.keyCode) && e.target.value === '') {
+			const { deleteLastItem } = t;
+			return deleteLastItem && deleteLastItem();
+		}
+	},
+	'keyup input'(e, t) {
+		t.ac.onKeyUp(e);
+	},
+	'focus input'(e, t) {
+		t.ac.onFocus(e);
+	},
+	'blur input'(e, t) {
+		t.ac.onBlur(e);
+	},
+	'click .rc-tags__tag'({ target }, t) {
+		const { onClickTag } = t;
+		return onClickTag & onClickTag(Blaze.getData(target));
+	},
+});
+Template.SearchInvitePlayers.onRendered(function() {
+	const { name } = this.data;
+
+	this.ac.element = this.firstNode.querySelector(`[name=${ name }]`);
+	this.ac.$element = $(this.ac.element);
+});
+
+Template.SearchInvitePlayers.onCreated(function() {
+	this.filter = new ReactiveVar('');
+	this.selected = new ReactiveVar([]);
+	this.onClickTag = this.data.onClickTag;
+	this.deleteLastItem = this.data.deleteLastItem;
+
+	const { collection, endpoint, field, sort, onSelect, selector = (match) => ({ term: match }) } = this.data;
+	this.ac = new AutoComplete(
+		{
+			selector: {
+				anchor: '.rc-input__label',
+				item: '.rc-popup-list__item',
+				container: '.rc-popup-list__list',
+			},
+			onSelect,
+			position: 'fixed',
+			limit: 10,
+			inputDelay: 300,
+			rules: [
+				{
+					collection,
+					endpoint,
+					field,
+					matchAll: true,
+					doNotChangeWidth: false,
+					selector,
+					sort,
+				},
+			],
+		});
+	this.ac.tmplInst = this;
+});
diff --git a/app/apps/client/gameCenter/tabBar.js b/app/apps/client/gameCenter/tabBar.js
new file mode 100644
index 000000000000..0d5aff24c957
--- /dev/null
+++ b/app/apps/client/gameCenter/tabBar.js
@@ -0,0 +1,35 @@
+import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
+
+import { APIClient } from '../../../utils/client';
+import { TabBar, TABBAR_DEFAULT_VISIBLE_ICON_COUNT } from '../../../ui-utils/client';
+import { settings } from '../../../settings/client';
+
+import './gameCenter.html';
+
+Meteor.startup(function() {
+	Tracker.autorun(async function() {
+		if (!settings.get('Apps_Game_Center_enabled')) {
+			TabBar.size = TABBAR_DEFAULT_VISIBLE_ICON_COUNT;
+			return TabBar.removeButton('gameCenter');
+		}
+
+		const { externalComponents } = await APIClient.get('apps/externalComponents');
+
+		if (!externalComponents.length) {
+			TabBar.size = TABBAR_DEFAULT_VISIBLE_ICON_COUNT;
+			return TabBar.removeButton('gameCenter');
+		}
+
+		TabBar.size = TABBAR_DEFAULT_VISIBLE_ICON_COUNT + 1;
+
+		TabBar.addButton({
+			groups: ['channel', 'group', 'direct'],
+			id: 'gameCenter',
+			i18nTitle: 'Game_Center',
+			icon: 'game',
+			template: 'GameCenter',
+			order: -1,
+		});
+	});
+});
diff --git a/app/apps/client/index.js b/app/apps/client/index.js
index a89134a70f54..1810371eda2d 100644
--- a/app/apps/client/index.js
+++ b/app/apps/client/index.js
@@ -1,3 +1,8 @@
 import './routes';
 
+import './gameCenter/tabBar';
+import './gameCenter/gameContainer';
+import './gameCenter/gameCenter';
+import './gameCenter/invitePlayers';
+
 export { Apps } from './orchestrator';
diff --git a/app/apps/client/orchestrator.js b/app/apps/client/orchestrator.js
index f7b44912401a..2252c886ce9d 100644
--- a/app/apps/client/orchestrator.js
+++ b/app/apps/client/orchestrator.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { AppClientManager } from '@rocket.chat/apps-engine/client/AppClientManager';
 import toastr from 'toastr';
 
 import { AppWebsocketReceiver } from './communication';
@@ -7,6 +8,7 @@ import { AdminBox } from '../../ui-utils';
 import { CachedCollectionManager } from '../../ui-cached-collection';
 import { hasAtLeastOnePermission } from '../../authorization';
 import { handleI18nResources } from './i18n';
+import { RealAppsEngineUIHost } from './RealAppsEngineUIHost';
 
 const createDeferredValue = () => {
 	let resolve;
@@ -21,6 +23,8 @@ const createDeferredValue = () => {
 
 class AppClientOrchestrator {
 	constructor() {
+		this._appClientUIHost = new RealAppsEngineUIHost();
+		this._manager = new AppClientManager(this._appClientUIHost);
 		this.isLoaded = false;
 		[this.deferredIsEnabled, this.setEnabled] = createDeferredValue();
 	}
@@ -42,7 +46,9 @@ class AppClientOrchestrator {
 		this.setEnabled(isEnabled);
 	}
 
-	getWsListener = () => this.ws
+	getWsListener = () => this.ws;
+
+	getAppClientManager = () => this._manager;
 
 	registerAdminMenuItems = () => {
 		AdminBox.addOption({
@@ -179,6 +185,8 @@ class AppClientOrchestrator {
 		const categories = await APIClient.get('apps', { categories: 'true' });
 		return categories;
 	}
+
+	getUIHost = () => this._appClientUIHost;
 }
 
 export const Apps = new AppClientOrchestrator();
@@ -191,6 +199,7 @@ Meteor.startup(() => {
 				return;
 			}
 
+			Apps.getAppClientManager().initialize();
 			Apps.load(isEnabled);
 		});
 	});
diff --git a/app/apps/server/bridges/listeners.js b/app/apps/server/bridges/listeners.js
index 88bdc7c499c4..693c55271c31 100644
--- a/app/apps/server/bridges/listeners.js
+++ b/app/apps/server/bridges/listeners.js
@@ -37,6 +37,12 @@ export class AppListenerBridge {
 		// }
 	}
 
+	async externalComponentEvent(inte, externalComponent) {
+		const result = await this.orch.getManager().getListenerManager().executeListener(inte, externalComponent);
+
+		return result;
+	}
+
 	async uiKitInteractionEvent(inte, action) {
 		return this.orch.getManager().getListenerManager().executeListener(inte, action);
 
diff --git a/app/apps/server/communication/rest.js b/app/apps/server/communication/rest.js
index ccfd34fdf848..b5bdf523c21f 100644
--- a/app/apps/server/communication/rest.js
+++ b/app/apps/server/communication/rest.js
@@ -257,6 +257,14 @@ export class AppsRestApi {
 			},
 		});
 
+		this.api.addRoute('externalComponents', { authRequired: false }, {
+			get() {
+				const externalComponents = orchestrator.getProvidedComponents();
+
+				return API.v1.success({ externalComponents });
+			},
+		});
+
 		this.api.addRoute('languages', { authRequired: false }, {
 			get() {
 				const apps = manager.get().map((prl) => ({
@@ -268,6 +276,24 @@ export class AppsRestApi {
 			},
 		});
 
+		this.api.addRoute('externalComponentEvent', { authRequired: true }, {
+			post() {
+				if (!this.bodyParams.externalComponent || !['IPostExternalComponentOpened', 'IPostExternalComponentClosed'].includes(this.bodyParams.event)) {
+					return API.v1.failure({ error: 'Event and externalComponent must be provided.' });
+				}
+
+				try {
+					const { event, externalComponent } = this.bodyParams;
+					const result = Apps.getBridges().getListenerBridge().externalComponentEvent(event, externalComponent);
+
+					return API.v1.success({ result });
+				} catch (e) {
+					orchestrator.getRocketChatLogger().error(`Error triggering external components' events ${ e.response.data }`);
+					return API.v1.internalError();
+				}
+			},
+		});
+
 		this.api.addRoute('bundles/:id/apps', { authRequired: true, permissionsRequired: ['manage-apps'] }, {
 			get() {
 				const baseUrl = orchestrator.getMarketplaceUrl();
diff --git a/app/apps/server/orchestrator.js b/app/apps/server/orchestrator.js
index 1cd352251e60..502ea2537a75 100644
--- a/app/apps/server/orchestrator.js
+++ b/app/apps/server/orchestrator.js
@@ -88,6 +88,10 @@ class AppServerOrchestrator {
 		return this._manager;
 	}
 
+	getProvidedComponents() {
+		return this._manager.getExternalComponentManager().getProvidedComponents();
+	}
+
 	isInitialized() {
 		return this._isInitialized;
 	}
@@ -171,9 +175,21 @@ settings.addGroup('General', function() {
 			public: true,
 			hidden: false,
 		});
+
+		this.add('Apps_Game_Center_enabled', false, {
+			type: 'boolean',
+			enableQuery: {
+				_id: 'Apps_Framework_enabled',
+				value: true,
+			},
+			hidden: false,
+			public: true,
+			alert: 'Experimental_Feature_Alert',
+		});
 	});
 });
 
+
 settings.get('Apps_Framework_enabled', (key, isEnabled) => {
 	// In case this gets called before `Meteor.startup`
 	if (!Apps.isInitialized()) {
diff --git a/app/ui-flextab/client/flexTabBar.js b/app/ui-flextab/client/flexTabBar.js
index 59160c93d150..b1daa65d2292 100644
--- a/app/ui-flextab/client/flexTabBar.js
+++ b/app/ui-flextab/client/flexTabBar.js
@@ -59,6 +59,9 @@ const filterButtons = (button, anonymous, rid) => {
 	if (button.id === 'thread' && !settings.get('Threads_enabled')) {
 		return false;
 	}
+	if (button.id === 'gameCenter' && !settings.get('Apps_Game_Center_enabled')) {
+		return false;
+	}
 	return true;
 };
 Template.flexTabBar.helpers({
diff --git a/app/ui-master/public/README.md b/app/ui-master/public/README.md
index 660c3f89df23..4455152ef41a 100644
--- a/app/ui-master/public/README.md
+++ b/app/ui-master/public/README.md
@@ -6,12 +6,5 @@ run below commands inside `app/ui-master/public` directory
 
 ```js
 node generateSprite.js
-node generateHTML.js
+cp icons.svg ../../../private/public
 ```
-
-
-After that 2 new files named `icons.html` and `icons.svg` will be generated. You need to cut and replace these two files to following locations.
-
-- icons.html to `public/public/icons.html`
-
-- icons.svg to `private/public/icons.svg`
diff --git a/app/ui-master/public/icons.svg b/app/ui-master/public/icons.svg
new file mode 100644
index 000000000000..0d2fbfeae599
--- /dev/null
+++ b/app/ui-master/public/icons.svg
@@ -0,0 +1,377 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="display: none">
+<symbol id="icon-add-reaction" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M16.5953757,3.40462428 L18.3063584,3.40462428 C18.6894461,3.40462428 19,3.71517821 19,4.0982659 L19,4.0982659 C19,4.48135358 18.6894461,4.79190751 18.3063584,4.79190751 L16.5953757,4.79190751 L16.5953757,6.50289017 C16.5953757,6.88597786 16.2848218,7.19653179 15.9017341,7.19653179 L15.9017341,7.19653179 C15.5186464,7.19653179 15.2080925,6.88597786 15.2080925,6.50289017 L15.2080925,4.79190751 L13.4971098,4.79190751 C13.1140221,4.79190751 12.8034682,4.48135358 12.8034682,4.0982659 L12.8034682,4.0982659 C12.8034682,3.71517821 13.1140221,3.40462428 13.4971098,3.40462428 L15.2080925,3.40462428 L15.2080925,1.69364162 C15.2080925,1.31055393 15.5186464,1 15.9017341,1 L15.9017341,1 C16.2848218,1 16.5953757,1.31055393 16.5953757,1.69364162 L16.5953757,3.40462428 Z M12.017341,8.90751445 C11.5065575,8.90751445 11.0924855,8.49344254 11.0924855,7.98265896 C11.0924855,7.47187538 11.5065575,7.05780347 12.017341,7.05780347 C12.5281246,7.05780347 12.9421965,7.47187538 12.9421965,7.98265896 C12.9421965,8.49344254 12.5281246,8.90751445 12.017341,8.90751445 Z M8.31791908,8.90751445 C7.80713549,8.90751445 7.39306358,8.49344254 7.39306358,7.98265896 C7.39306358,7.47187538 7.80713549,7.05780347 8.31791908,7.05780347 C8.82870266,7.05780347 9.24277457,7.47187538 9.24277457,7.98265896 C9.24277457,8.49344254 8.82870266,8.90751445 8.31791908,8.90751445 Z M10.1676301,2.66473988 L10.1676301,4.05202312 C9.61809223,4.08150564 9.2125803,4.12425249 8.95109428,4.18026366 C6.34285047,4.73895811 4.38728324,7.05729042 4.38728324,9.83236994 C4.38728324,13.0247673 6.97523266,15.6127168 10.1676301,15.6127168 C12.9433379,15.6127168 15.2620917,13.6562638 15.8201156,11.0471339 C15.8759626,10.786012 15.9185831,10.3810907 15.9479769,9.83236994 L17.3352601,9.83236994 C17.3079241,10.4226104 17.2681043,10.8593182 17.2158007,11.1424932 C16.6001927,14.4754291 13.678734,17 10.1676301,17 C6.20905728,17 3,13.7909427 3,9.83236994 C3,6.33988881 5.49786142,3.43081447 8.80454201,2.79418918 C9.09873901,2.73754831 9.55310169,2.69439855 10.1676301,2.66473988 Z M7.60608545,11.8421707 L7.60608545,11.8421707 C7.87462322,11.5736329 8.29676713,11.535532 8.60904766,11.7516475 C8.71317478,11.8236717 8.8046355,11.8792946 8.8834474,11.9184909 C9.71644214,12.3327715 10.7016538,12.3365544 11.5374284,11.9298396 C11.6220117,11.8886787 11.7206771,11.8291344 11.8334246,11.7512069 L11.8334275,11.7512111 C12.1462696,11.5349845 12.5689492,11.5732617 12.8378582,11.8421707 L12.8378582,11.8421707 C13.0797095,12.084022 13.0797095,12.4761405 12.8378582,12.7179919 C12.8163559,12.7394941 12.7932992,12.7593834 12.7688751,12.7774985 C12.5123387,12.9678207 12.2963037,13.1050136 12.1207954,13.1891112 C10.8663293,13.7902084 9.38556873,13.7614468 8.15275845,13.1028262 C8.02025806,13.0320388 7.86012034,12.926009 7.6723453,12.7847368 L7.67235924,12.7847182 C7.39618546,12.5769394 7.34074042,12.1846182 7.54851928,11.9084445 C7.56613295,11.8850329 7.58536899,11.8628871 7.60608545,11.8421707 Z"/>
+</symbol>
+<symbol id="icon-arrow-down" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M10,11.9512195 L14.4571429,7.51219512 C14.7415132,7.22898071 15.2013439,7.22898071 15.4857143,7.51219512 L15.4857143,7.51219512 C15.7685918,7.79392277 15.769524,8.25162572 15.4877964,8.53450327 C15.4871038,8.53519872 15.4864097,8.53589275 15.4857143,8.53658537 L10.7056652,13.2972034 C10.315473,13.6858094 9.68452704,13.6858094 9.29433482,13.2972034 L4.51428571,8.53658537 C4.23140816,8.25485772 4.23047597,7.79715477 4.51220362,7.51427722 C4.51289624,7.51358177 4.51359027,7.51288774 4.51428571,7.51219512 L4.51428571,7.51219512 C4.7986561,7.22898071 5.25848675,7.22898071 5.54285714,7.51219512 L7.51428571,9.47560976 L10,11.9512195 Z"/>
+</symbol>
+<symbol id="icon-at" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M13.0967742,5.87096774 L13.0967742,5.87096774 C13.5243495,5.87096774 13.8709677,6.217586 13.8709677,6.64516129 L13.8709677,10.5065287 C13.8709677,11.6078313 14.419907,12.3225806 15.1612903,12.3225806 C15.8989934,12.3225806 16.4516129,11.6008368 16.4516129,10.5065287 L16.4516129,10 C16.4516129,6.43687258 13.5631274,3.5483871 10,3.5483871 C6.43687258,3.5483871 3.5483871,6.43687258 3.5483871,10 C3.5483871,13.5631274 6.43687258,16.4516129 10,16.4516129 C10.4817307,16.4516129 10.9556963,16.3989217 11.4158431,16.2959548 C11.5128919,16.2742383 11.6279881,16.2431697 11.7611319,16.202749 L11.7611293,16.2027405 C12.1682997,16.079129 12.6028405,16.2844912 12.7658305,16.6775583 L12.7658305,16.6775583 C12.9200397,17.0494493 12.7435737,17.4759377 12.3716827,17.6301468 C12.3525522,17.6380795 12.3330923,17.6451934 12.313356,17.651469 C12.1068381,17.7171424 11.9325035,17.7662314 11.7903539,17.7987414 C11.2083359,17.9318507 10.6087006,18 10,18 C5.581722,18 2,14.418278 2,10 C2,5.581722 5.581722,2 10,2 C14.418278,2 18,5.581722 18,10 L18,10.5592861 C17.9784628,12.4073568 16.8420042,13.8709677 15.1612903,13.8709677 C14.1753389,13.8709677 13.3777659,13.3712917 12.8819488,12.5843831 C12.1732546,13.3741478 11.1446466,13.8709677 10,13.8709677 C7.86212355,13.8709677 6.12903226,12.1378765 6.12903226,10 C6.12903226,7.86212355 7.86212355,6.12903226 10,6.12903226 C10.8714368,6.12903226 11.6756177,6.41698954 12.3225806,6.90294231 L12.3225806,6.64516129 C12.3225806,6.217586 12.6691989,5.87096774 13.0967742,5.87096774 Z M10,12.3225806 C11.2827259,12.3225806 12.3225806,11.2827259 12.3225806,10 C12.3225806,8.71727413 11.2827259,7.67741935 10,7.67741935 C8.71727413,7.67741935 7.67741935,8.71727413 7.67741935,10 C7.67741935,11.2827259 8.71727413,12.3225806 10,12.3225806 Z"/>
+</symbol>
+<symbol id="icon-back" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M4.97783071,10.8395119 L8.3227205,14.2589793 C8.63824773,14.5815415 8.63824773,15.0970975 8.3227205,15.4196598 L8.3227205,15.4196598 C8.01603557,15.7331825 7.51325788,15.7387257 7.19973511,15.4320408 C7.19556273,15.4279594 7.19143548,15.4238321 7.18735411,15.4196598 L2.68401754,10.8159169 C2.30382986,10.4272526 2.30382986,9.80604448 2.68401754,9.41738015 L7.4372152,4.55820531 C7.73220276,4.25664071 8.21580384,4.25130896 8.51736845,4.54629653 C8.52138168,4.55022224 8.52535151,4.55419207 8.52927722,4.55820531 L8.52927722,4.55820531 C8.83276982,4.86846457 8.83276982,5.36435666 8.52927722,5.67461592 L5.02143506,9.26066884 L15.4154183,9.26066884 C16.8446394,9.26066884 18,10.3956904 18,11.8043355 L18,14.0715077 C18,14.5148958 17.6405629,14.874333 17.1971747,14.874333 L17.1971747,14.874333 C16.7537866,14.874333 16.3943494,14.5148958 16.3943494,14.0715077 L16.3943494,11.8043355 C16.3943494,11.2679881 15.9581951,10.8395119 15.4154183,10.8395119 L4.97783071,10.8395119 Z"/>
+</symbol>
+<symbol id="icon-ban" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M10,16.5 C8.476,16.5 7.077,15.971 5.968,15.093 L15.093,5.968 C15.971,7.077 16.5,8.476 16.5,10 C16.5,13.59 13.59,16.5 10,16.5 M3.5,10 C3.5,6.41 6.41,3.5 10,3.5 C11.524,3.5 12.923,4.029 14.032,4.907 L4.907,14.032 C4.029,12.923 3.5,11.524 3.5,10 M10,2 C5.582,2 2,5.582 2,10 C2,14.418 5.582,18 10,18 C14.418,18 18,14.418 18,10 C18,5.582 14.418,2 10,2"/>
+</symbol>
+<symbol id="icon-bell-off" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M5.08119674,11.973678 C4.83458035,12.13189 4.50640211,12.060224 4.34819013,11.8136076 C4.29335093,11.7281258 4.2642,11.6286997 4.2642,11.5271395 L4.2642,7.3337 C4.2642,4.33188017 6.85447346,1.8997 10.0452,1.8997 C11.2707438,1.8997 12.4387201,2.25936158 13.4133125,2.91774084 C13.4761269,2.96017471 13.5474409,3.01226761 13.627392,3.07408265 C13.9086495,3.29157604 13.9603663,3.69588641 13.7428986,3.97715721 C13.7164868,4.01131804 13.686705,4.04273486 13.6540032,4.07093303 C13.3456451,4.33682456 12.8943252,4.35392809 12.5667319,4.11214039 C12.4969629,4.06065159 12.4350499,4.01794718 12.3811336,3.98407589 C11.6918916,3.55108049 10.8869357,3.3167 10.0452,3.3167 C7.69428903,3.3167 5.7902,5.13411599 5.7902,7.3737 L5.7902,10.6764698 C5.7902,11.201399 5.52302222,11.6902334 5.08119674,11.973678 Z M15.870038,14.5503 L14.3017,11.5323 L14.3017,9.02154706 C14.3017,8.70150083 14.4410881,8.39732397 14.6835037,8.18836396 L14.9994094,7.91605608 C15.2090356,7.73536024 15.5254541,7.75881289 15.7061499,7.96843903 C15.784565,8.0594088 15.8277,8.17551606 15.8277,8.2956178 L15.8159628,11.5532927 L17.3050267,14.34922 C17.5906021,14.885428 17.3874242,15.5516151 16.8512162,15.8371905 C16.6920454,15.9219622 16.5144737,15.9663 16.3341363,15.9663 L12.9091383,15.9663 C12.6011967,17.2063168 11.4208805,18.1003 10.0457,18.1003 C8.67135013,18.1003 7.49117283,17.2061862 7.18326181,15.9663 L7.00981682,15.9663 L6.5909615,15.9663 C6.34464863,15.9663 6.14497259,15.766624 6.14497259,15.5203111 C6.14497259,15.3905877 6.20145416,15.2672927 6.29969134,15.1825718 L6.72324991,14.8172901 C6.92296697,14.6450518 7.17791822,14.5503 7.4416471,14.5503 L15.870038,14.5503 Z M2.3859407,16.5908233 C2.09259239,16.2303878 2.13303015,15.7033225 2.47792853,15.3918549 L16.3680269,2.84811316 C16.6949074,2.55291692 17.1992003,2.57860211 17.4943965,2.90548263 C17.5079941,2.92080137 17.5079941,2.92080137 17.5210593,2.93657667 C17.8144076,3.29701218 17.7739698,3.8240775 17.4290715,4.13554514 L3.53897311,16.6792868 C3.21209259,16.9744831 2.70779973,16.9487979 2.41260349,16.6219174 C2.39900588,16.6065986 2.39900588,16.6065986 2.3859407,16.5908233 Z M10,16.6922764 C10.4602829,16.6922764 10.8701366,16.4625414 11.0928591,16.1077236 L8.90714088,16.1077236 C9.12986336,16.4625414 9.53971713,16.6922764 10,16.6922764 Z"/>
+</symbol>
+<symbol id="icon-bell" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M14.230914,11.532003 L14.230914,7.37413156 C14.230914,5.16259338 12.3382192,3.36626016 10,3.36626016 C7.66178075,3.36626016 5.76908601,5.16259338 5.76908601,7.37413156 L5.76908601,11.532003 L5.75179606,11.6019175 L4.22480908,14.5004065 L15.7765389,14.5004065 L14.230914,11.532003 Z M10,16.6922764 C10.4602829,16.6922764 10.8701366,16.4625414 11.0928591,16.1077236 L8.90714088,16.1077236 C9.12986336,16.4625414 9.53971713,16.6922764 10,16.6922764 Z M2.45998038,14.5187666 L4.13571429,11.6 L4.13571429,7.33333333 C4.13571429,4.30302287 6.76395308,1.85 10,1.85 C13.2360469,1.85 15.8642857,4.30302287 15.8642857,7.33333333 L15.8465077,11.5291668 L17.4424987,14.5494626 C17.7005284,15.0377648 17.5138556,15.6427865 17.0255533,15.9008162 C16.8815744,15.9768978 16.7211937,16.0166667 16.5583492,16.0166667 L12.9174942,16.0166667 C12.5875967,17.2589069 11.3904582,18.15 10,18.15 C8.60954177,18.15 7.41240327,17.2589069 7.08250582,16.0166667 L3.32721479,16.0166667 C2.77493004,16.0166667 2.32721479,15.5689514 2.32721479,15.0166667 C2.32721479,14.8419516 2.37298975,14.6702855 2.45998038,14.5187666 Z"/>
+</symbol>
+<symbol id="icon-bold" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M10.5122837,14.5 L7.69000006,14.5 C7.13771531,14.5 6.69000006,14.0522847 6.69000006,13.5 L6.69000006,6.5 C6.69000006,5.94771525 7.13771531,5.5 7.69000006,5.5 L10.4284899,5.5 C12.1752671,5.5 13.2259117,6.36070686 13.2259117,7.74532225 C13.2259117,8.68711019 12.510442,9.52910603 11.5951566,9.67879418 L11.5951566,9.78482328 C12.8520627,9.90956341 13.6900001,10.7765073 13.6900001,11.9490644 C13.6900001,13.533264 12.4975507,14.5 10.5122837,14.5 Z M8.13383063,6.68503119 L8.13383063,9.31081081 L9.84837943,9.31081081 C11.1246225,9.31081081 11.7885268,8.85550936 11.7885268,8.0010395 C11.7885268,7.17151767 11.1632966,6.68503119 10.093315,6.68503119 L8.13383063,6.68503119 Z M8.13383063,13.3149688 L10.2222284,13.3149688 C11.5242542,13.3149688 12.2139411,12.8035343 12.2139411,11.8492723 C12.2139411,10.9074844 11.4984715,10.4147609 10.1384347,10.4147609 L8.13383063,10.4147609 L8.13383063,13.3149688 Z"/>
+</symbol>
+<symbol id="icon-book" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M6.57142857,6.34373726 L6.57142857,5.21873994 C6.57142857,5.14842761 6.60119029,5.08397482 6.66071429,5.02538103 C6.72023828,4.96678724 6.78571429,4.93749061 6.85714286,4.93749061 L14.2857143,4.93749061 C14.3571429,4.93749061 14.4226189,4.96678724 14.4821429,5.02538103 C14.5416668,5.08397482 14.5714286,5.14842761 14.5714286,5.21873994 L14.5714286,6.34373726 C14.5714286,6.41404959 14.5416668,6.47850238 14.4821429,6.53709617 C14.4226189,6.59568996 14.3571429,6.62498659 14.2857143,6.62498659 L6.85714286,6.62498659 C6.78571429,6.62498659 6.72023828,6.59568996 6.66071429,6.53709617 C6.60119029,6.47850238 6.57142857,6.41404959 6.57142857,6.34373726 Z M14.2857143,9.43747988 L6.85714286,9.43747988 C6.78571429,9.43747988 6.72023828,9.40818326 6.66071429,9.34958947 C6.60119029,9.29099568 6.57142857,9.22654289 6.57142857,9.15623055 L6.57142857,8.03123324 C6.57142857,7.9609209 6.60119029,7.89646811 6.66071429,7.83787432 C6.72023828,7.77928053 6.78571429,7.74998391 6.85714286,7.74998391 L14.2857143,7.74998391 C14.3571429,7.74998391 14.4226189,7.77928053 14.4821429,7.83787432 C14.5416668,7.89646811 14.5714286,7.9609209 14.5714286,8.03123324 L14.5714286,9.15623055 C14.5714286,9.22654289 14.5416668,9.29099568 14.4821429,9.34958947 C14.4226189,9.40818326 14.3571429,9.43747988 14.2857143,9.43747988 Z M17.5357143,15.0624665 C17.4642857,15.2734035 17.4285714,15.6484028 17.4285714,16.1874638 C17.4285714,16.7265248 17.4642857,17.1015241 17.5357143,17.3124611 C17.6785714,17.3358987 17.7916668,17.4003515 17.875,17.50582 C17.9583332,17.6112885 18,17.7343351 18,17.8749598 L18,18.4374584 C18,18.6015207 17.9464286,18.7362858 17.8392857,18.8417543 C17.7321429,18.9472228 17.5952383,18.9999571 17.4285714,18.9999571 L4.85714286,18.9999571 C4.07142857,18.9999571 3.39880971,18.7245673 2.83928571,18.1737872 C2.27976172,17.6230071 2,16.9608994 2,16.1874638 L2,3.81249329 C2,3.03905764 2.27976172,2.37695002 2.83928571,1.82616991 C3.39880971,1.27538979 4.07142857,1 4.85714286,1 L17.4285714,1 C17.5952383,1 17.7321429,1.05273425 17.8392857,1.15820275 C17.9464286,1.26367125 18,1.39843637 18,1.56249866 L18,14.4999678 C18,14.6405925 17.9583332,14.7636391 17.875,14.8691076 C17.7916668,14.9745761 17.6785714,15.0390288 17.5357143,15.0624665 Z M16.0714286,15.0624665 L4.85714286,15.0624665 C4.54761887,15.0624665 4.27976172,15.1737945 4.05357143,15.3964501 C3.82738113,15.6191056 3.71428571,15.8827768 3.71428571,16.1874638 C3.71428571,16.4921507 3.82738113,16.755822 4.05357143,16.9784775 C4.27976172,17.2011331 4.54761887,17.3124611 4.85714286,17.3124611 L16.0714286,17.3124611 C16.0238097,17.0077742 16,16.6327754 16,16.1874638 C16,15.7421522 16.0238097,15.3671534 16.0714286,15.0624665 Z M16.2857143,2.68749598 L4.85714286,2.68749598 C4.54761887,2.68749598 4.27976172,2.79882402 4.05357143,3.02147956 C3.82738113,3.2441351 3.71428571,3.50780634 3.71428571,3.81249329 L3.71428571,13.6210637 C4.07142857,13.4570014 4.45238113,13.3749705 4.85714286,13.3749705 L16.2857143,13.3749705 L16.2857143,2.68749598 Z"/>
+</symbol>
+<symbol id="icon-calendar" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M15.5,4 C16.328125,4 17,4.671875 17,5.5 L17,16.5 C17,17.328125 16.328125,18 15.5,18 L4.5,18 C3.671875,18 3,17.328125 3,16.5 L3,5.5 C3,4.671875 3.671875,4 4.5,4 L6,4 L6,3 C6,2.44771525 6.44771525,2 7,2 C7.55228475,2 8,2.44771525 8,3 L8,4 L12,4 L12,3 C12,2.44771525 12.4477153,2 13,2 C13.5522847,2 14,2.44771525 14,3 L14,4 L15.5,4 Z M14.5,16.5 C15.0522847,16.5 15.5,16.0522847 15.5,15.5 L15.5,7 L4.5,7 L4.5,15.5 C4.5,16.0522847 4.94771525,16.5 5.5,16.5 L14.5,16.5 Z M6.3,9 L7.7,9 C7.86568542,9 8,9.13431458 8,9.3 L8,10.7 C8,10.8656854 7.86568542,11 7.7,11 L6.3,11 C6.13431458,11 6,10.8656854 6,10.7 L6,9.3 C6,9.13431458 6.13431458,9 6.3,9 Z M6.3,12 L7.7,12 C7.86568542,12 8,12.1343146 8,12.3 L8,13.7 C8,13.8656854 7.86568542,14 7.7,14 L6.3,14 C6.13431458,14 6,13.8656854 6,13.7 L6,12.3 C6,12.1343146 6.13431458,12 6.3,12 Z M9.3,9 L10.7,9 C10.8656854,9 11,9.13431458 11,9.3 L11,10.7 C11,10.8656854 10.8656854,11 10.7,11 L9.3,11 C9.13431458,11 9,10.8656854 9,10.7 L9,9.3 C9,9.13431458 9.13431458,9 9.3,9 Z M9.3,12 L10.7,12 C10.8656854,12 11,12.1343146 11,12.3 L11,13.7 C11,13.8656854 10.8656854,14 10.7,14 L9.3,14 C9.13431458,14 9,13.8656854 9,13.7 L9,12.3 C9,12.1343146 9.13431458,12 9.3,12 Z M12.3,9 L13.7,9 C13.8656854,9 14,9.13431458 14,9.3 L14,10.7 C14,10.8656854 13.8656854,11 13.7,11 L12.3,11 C12.1343146,11 12,10.8656854 12,10.7 L12,9.3 C12,9.13431458 12.1343146,9 12.3,9 Z M12.3,12 L13.7,12 C13.8656854,12 14,12.1343146 14,12.3 L14,13.7 C14,13.8656854 13.8656854,14 13.7,14 L12.3,14 C12.1343146,14 12,13.8656854 12,13.7 L12,12.3 C12,12.1343146 12.1343146,12 12.3,12 Z"/>
+</symbol>
+<symbol id="icon-card" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M3.2304,9.5 L16.7696,9.5 L16.7696,5.8066875 C16.7696,5.2281875 16.3088,4.75775 15.7432,4.75775 L4.256,4.75775 C3.6904,4.75775 3.2304,5.2281875 3.2304,5.8066875 L3.2304,9.5 Z M3.2304,11 L3.2304,14.1933125 C3.2304,14.7718125 3.6904,15.2414375 4.256,15.2414375 L15.7432,15.2414375 C16.3088,15.2414375 16.7696,14.7718125 16.7696,14.1933125 L16.7696,11 L3.2304,11 Z M15.7432,16.5 L4.256,16.5 C3.0112,16.5 2,15.4656875 2,14.1933125 L2,5.8066875 C2,4.5343125 3.0112,3.5 4.256,3.5 L15.7432,3.5 C16.988,3.5 18,4.5343125 18,5.8066875 L18,14.1933125 C18,15.4656875 16.988,16.5 15.7432,16.5 Z M14.45,14.3 C13.7596441,14.3 13.2,13.7403559 13.2,13.05 C13.2,12.3596441 13.7596441,11.8 14.45,11.8 C15.1403559,11.8 15.7,12.3596441 15.7,13.05 C15.7,13.7403559 15.1403559,14.3 14.45,14.3 Z"/>
+</symbol>
+<symbol id="icon-chat" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M3.36312881,15.7593532 C3.32888874,15.7771726 3.29959994,15.7925621 3.27370934,15.8064174 C3.73031444,16.1917386 4.92393678,16.4549204 7.10274479,16.4476544 L7.21881505,16.4476539 C8.55574002,16.4476543 9.6998097,16.021859 10.6510241,15.170268 L12.188241,15.2712054 C11.5513943,15.8887667 11.2142468,16.2130071 11.1767984,16.2439265 C10.1491488,17.09241 8.76567843,17.5637907 7.21881505,17.5637907 L7.10806092,17.5644215 L6.97721254,17.5644231 C4.30241208,17.5644231 2.62246666,17.1951018 2.10341288,16.0930165 C1.82161029,15.4951149 2.13151102,15.1455492 2.84114675,14.7722012 C3.31318797,14.5227311 3.32172914,14.5103228 3.24657386,14.3473099 C3.20302404,14.2436958 3.16526615,14.1604157 3.07972552,13.9763174 C2.74839464,13.2684751 2.62592155,12.9023078 2.62592155,12.4061039 C2.62592155,11.562445 2.83045155,10.7486059 3.21214892,10.0211892 C3.42204019,9.66099218 3.78721597,9.06536542 4.270822,8.82818513 C4.270822,8.80275057 4.53792399,10.0211892 4.53792399,10 C4.45304843,10.1183326 4.36401443,10.2496015 4.270822,10.3938065 C3.78721597,11.0991197 3.7445882,11.6631394 3.7445882,12.4061039 C3.7445882,12.6985231 3.82924269,12.9394008 4.09330148,13.5047226 C4.19543836,13.7251753 4.22995648,13.801243 4.270822,13.8994264 C4.58782821,14.5810467 4.36137367,15.1036933 3.78721597,15.5080098 C3.65916127,15.5981847 3.55361796,15.6588423 3.36312881,15.7593532 Z M16.5696621,12.3226926 C16.5350205,12.3039671 16.4951623,12.2829692 16.4468239,12.2578135 C16.2265134,12.1415693 16.1048536,12.0716493 15.9574055,11.9678178 C15.2986909,11.5039571 15.0399564,10.9068098 15.4049351,10.1218159 C15.4504792,10.0121781 15.4903754,9.92425877 15.608285,9.66976084 C15.914896,9.01333804 16.0132801,8.73339397 16.0132801,8.39198996 C16.0132801,5.80517045 13.90418,3.70028722 11.3120655,3.70028722 C8.71995111,3.70028722 6.61085101,5.80517045 6.61085101,8.39198996 C6.61085101,11.1096858 8.86296092,13.082961 11.9786225,13.082961 L12.112848,13.0829616 C14.6633683,13.0914671 16.0501708,12.7797435 16.5696621,12.3226926 Z M16.5612822,10.6280948 C16.4685253,10.8294269 16.4833349,10.8509584 17.0358533,11.1429611 C17.8499187,11.5712649 18.2032866,11.969896 17.8824254,12.6506683 C17.2857779,13.9175051 15.3458564,14.3439799 12.2581228,14.3439799 L12.1073975,14.3439799 L11.9780624,14.3432467 C8.14202747,14.3432482 5.34836876,11.8401459 5.34836876,8.39198996 C5.34836876,5.10955211 8.0234498,2.44 11.3120655,2.44 C14.6008168,2.44 17.276494,5.10968724 17.276494,8.39198996 C17.276494,8.96303774 17.1353362,9.38506819 16.7528285,10.2022436 C16.6539056,10.4151439 16.6101724,10.5116034 16.5612822,10.6280948 Z"/>
+</symbol>
+<symbol id="icon-check" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M7.85627509,13.4457483 L15.4565176,5.84550584 C15.7385629,5.56346052 16.1958487,5.56346052 16.477894,5.84550584 L16.477894,5.84550584 C16.7599394,6.12755116 16.7599394,6.58483698 16.477894,6.8668823 L8.50330091,14.8414754 C8.11277661,15.2319997 7.47961164,15.2319997 7.08908734,14.8414754 L3.74072876,11.4931169 C3.44209254,11.1944806 3.44209254,10.7102957 3.74072876,10.4116594 L3.74072876,10.4116594 C4.03936499,10.1130232 4.52354997,10.1130232 4.82218619,10.4116594 L7.85627509,13.4457483 Z"/>
+</symbol>
+<symbol id="icon-checkmark-circled" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M8.41274756,11.8558336 L13.2598877,7.11571988 C13.5555359,6.82659964 14.0290012,6.82993441 14.3205476,7.12319045 C14.6121493,7.42028697 14.6077287,7.89201411 14.3140497,8.18024003 L9.02524413,13.3708422 C8.68427798,13.7054772 8.13712493,13.7021137 7.80029854,13.3633122 L5.56150395,11.1113891 C5.26997473,10.8181503 5.26997473,10.3445269 5.56150395,10.0512882 C5.85652852,9.75796559 6.32848163,9.75934533 6.61872247,10.0512882 L8.41274756,11.8558336 Z M10,18 C5.58217143,18 2,14.4178286 2,10 C2,5.58125714 5.58217143,2 10,2 C14.4187429,2 18,5.58125714 18,10 C18,14.4178286 14.4187429,18 10,18 Z M10,16.6285714 C13.6608,16.6285714 16.6285714,13.6608 16.6285714,10 C16.6285714,6.3392 13.6608,3.37142857 10,3.37142857 C6.3392,3.37142857 3.37142857,6.3392 3.37142857,10 C3.37142857,13.6608 6.3392,16.6285714 10,16.6285714 Z"/>
+</symbol>
+<symbol id="icon-circle-cross" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M10,18 C5.58217143,18 2,14.4178286 2,10 C2,5.58125714 5.58217143,2 10,2 C14.4187429,2 18,5.58125714 18,10 C18,14.4178286 14.4187429,18 10,18 Z M9.28950527,10.0368634 L7.18453113,7.93188926 C6.95680963,7.70416776 6.95680963,7.33495825 7.18453113,7.10723675 C7.41225263,6.87951525 7.78146213,6.87951525 8.00918363,7.10723675 L10.1141578,9.21221089 L12.2191319,7.10723675 C12.4468534,6.87951525 12.8160629,6.87951525 13.0437844,7.10723675 C13.2715059,7.33495825 13.2715059,7.70416776 13.0437844,7.93188926 L10.9388103,10.0368634 L13.0437844,12.1418375 C13.2715059,12.369559 13.2715059,12.7387685 13.0437844,12.96649 C12.8160629,13.1942115 12.4468534,13.1942115 12.2191319,12.96649 L10.1141578,10.8615159 L8.00918363,12.96649 C7.78146213,13.1942115 7.41225263,13.1942115 7.18453113,12.96649 C6.95680963,12.7387685 6.95680963,12.369559 7.18453113,12.1418375 L9.28950527,10.0368634 Z M10,16.6285714 C13.6608,16.6285714 16.6285714,13.6608 16.6285714,10 C16.6285714,6.3392 13.6608,3.37142857 10,3.37142857 C6.3392,3.37142857 3.37142857,6.3392 3.37142857,10 C3.37142857,13.6608 6.3392,16.6285714 10,16.6285714 Z"/>
+</symbol>
+<symbol id="icon-circle" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M10,18 C5.58217143,18 2,14.4178286 2,10 C2,5.58125714 5.58217143,2 10,2 C14.4187429,2 18,5.58125714 18,10 C18,14.4178286 14.4187429,18 10,18 Z"/>
+</symbol>
+<symbol id="icon-circled-arrow-down" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M10,18 C5.58217143,18 2,14.4187429 2,10 C2,5.58125714 5.58217143,2 10,2 C14.4178286,2 18,5.58125714 18,10 C18,14.4187429 14.4178286,18 10,18 Z M10,16.6285714 C13.6608,16.6285714 16.6285714,13.6608 16.6285714,10 C16.6285714,6.3392 13.6608,3.37142857 10,3.37142857 C6.3392,3.37142857 3.37142857,6.3392 3.37142857,10 C3.37142857,13.6608 6.3392,16.6285714 10,16.6285714 Z M10.6990629,11.0017829 L12.26752,9.43332571 C12.5353939,9.16545183 12.9697033,9.16545183 13.2375771,9.43332571 L13.2375771,9.43332571 C13.505451,9.7011996 13.505451,10.135509 13.2375771,10.4033829 L10.7123137,12.9288202 C10.3217894,13.3193445 9.68862447,13.3193445 9.29810018,12.9288202 C9.29807119,12.9287912 9.2980422,12.9287622 9.29801322,12.9287332 L6.773289,10.403214 C6.50552765,10.1353867 6.50545201,9.70124623 6.77312,9.43332571 L6.77312,9.43332571 C7.04055621,9.16563721 7.4743605,9.16543268 7.742049,9.43286889 C7.74216085,9.43298063 7.74227266,9.43309241 7.74238443,9.43320423 L9.32763429,11.0191543 L9.32763429,6.27401143 C9.32763429,5.89530189 9.63463903,5.58829714 10.0133486,5.58829714 L10.0133486,5.58829714 C10.3920581,5.58829714 10.6990629,5.89530189 10.6990629,6.27401143 L10.6990629,11.0017829 Z"/>
+</symbol>
+<symbol id="icon-clip" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M5.15879562,13.4638624 L5.15879562,13.4638624 C4.90599039,13.2480772 4.87287013,12.8694565 5.08437038,12.6130557 L10.5580734,5.97730965 C11.4745445,4.86627574 13.0944944,4.71955997 14.1887917,5.65361162 C15.2780481,6.58336059 15.4186756,8.24043454 14.5053645,9.34763752 L8.64526707,16.4518079 C7.31075341,18.0696329 4.93412315,18.2783509 3.34272418,16.9202886 C1.75000514,15.5610997 1.54554911,13.1390247 2.88321939,11.5173729 L9.25165016,3.79695237 C11.0084462,1.66719622 14.1363767,1.39165004 16.2300793,3.17904132 C18.3256583,4.96803453 18.5993827,8.14860581 16.8423124,10.2786944 L10.8542425,17.5380051 C10.6472844,17.7888995 10.2761216,17.8245169 10.0252273,17.6175588 C10.0226788,17.6154566 10.020148,17.613333 10.0176353,17.6111882 L10.0176353,17.6111882 C9.76483006,17.395403 9.73170981,17.0167823 9.94321006,16.7603815 L15.9312799,9.50107076 C17.2661487,7.88281524 17.0580903,5.46525642 15.465561,4.10571614 C13.8746589,2.74756498 11.496974,2.9570204 10.1626826,4.57457596 L3.79425183,12.2949965 C2.87823836,13.4054756 3.01826627,15.0643071 4.10707307,15.9934691 C5.1958048,16.9225671 6.8222928,16.7797273 7.73423463,15.6741843 L13.5943321,8.57001393 C14.0858446,7.97415549 14.0099812,7.080225 13.4243447,6.58034733 C12.8338231,6.07629989 11.9639083,6.15508641 11.4691058,6.75493324 L5.99540282,13.3906793 C5.78844473,13.6415736 5.41728196,13.6771911 5.16638758,13.470233 C5.1638391,13.4681308 5.16130836,13.4660072 5.15879562,13.4638624 Z"/>
+</symbol>
+<symbol id="icon-clipboard" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M14.3902439,3.96319018 C15.2792978,3.96319018 16,4.6883139 16,5.58282209 L16,16.3803681 C16,17.2748763 15.2792978,18 14.3902439,18 L5.6097561,18 C4.72070223,18 4,17.2748763 4,16.3803681 L4,5.58282209 C4,4.6883139 4.72070223,3.96319018 5.6097561,3.96319018 L8.14897761,3.96319018 C8.14722516,3.93046164 8.14634146,3.89774204 8.14634146,3.86503067 C8.14634146,2.83651427 8.97776528,2 10,2 C11.0222347,2 11.8536585,2.83651427 11.8536585,3.86503067 C11.8536585,3.89772526 11.8527719,3.93044356 11.8510148,3.96319018 L14.3902439,3.96319018 Z M10,2.98159509 C9.51506199,2.98159509 9.12195122,3.37711758 9.12195122,3.86503067 C9.12195122,4.35294377 9.51506199,4.74846626 10,4.74846626 C10.484938,4.74846626 10.8780488,4.35294377 10.8780488,3.86503067 C10.8780488,3.37711758 10.484938,2.98159509 10,2.98159509 Z M6.92682927,5.2392638 L5.6097561,5.2392638 C5.42161484,5.2392638 5.26829268,5.39352659 5.26829268,5.58282209 L5.26829268,16.3803681 C5.26829268,16.5696636 5.42161484,16.7239264 5.6097561,16.7239264 L14.3902439,16.7239264 C14.5783852,16.7239264 14.7317073,16.5696636 14.7317073,16.3803681 L14.7317073,5.58282209 C14.7317073,5.39352659 14.5783852,5.2392638 14.3902439,5.2392638 L13.0731707,5.2392638 L13.0731707,6.02541126 C13.0731707,6.31001147 12.8438405,6.54074868 12.5609756,6.54074868 L7.43902439,6.54074868 C7.15615955,6.54074868 6.92682927,6.31001147 6.92682927,6.02541126 L6.92682927,5.2392638 Z"/>
+</symbol>
+<symbol id="icon-clock" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M10,2 C14.4193286,2 18,5.58067143 18,10 C18,14.4193286 14.4193286,18 10,18 C5.58067143,18 2,14.4193286 2,10 C2,5.58067143 5.58067143,2 10,2 Z M16.6026751,10 C16.6026751,6.34754253 13.6411141,3.39732494 10,3.39732494 C6.34754253,3.39732494 3.39732494,6.35888589 3.39732494,10 C3.39732494,13.6524575 6.35888589,16.6026751 10,16.6026751 C13.6524575,16.6026751 16.6026751,13.6411141 16.6026751,10 Z M10.7930763,10.0989393 L12.7090581,11.520615 C13.0503959,11.7738907 13.1217843,12.2559202 12.8685086,12.597258 C12.8667734,12.5995964 12.865025,12.601925 12.8632635,12.6042436 L12.8632635,12.6042436 C12.6015836,12.9486682 12.1125897,13.0207514 11.762656,12.7664855 L9.4399921,11.0788106 C9.29318621,10.9698901 9.20692368,10.7986526 9.20692368,10.6168371 L9.20692368,5.81431943 C9.20692368,5.37631548 9.56199604,5.02124312 10,5.02124312 L10,5.02124312 C10.438004,5.02124312 10.7930763,5.37631548 10.7930763,5.81431943 L10.7930763,10.0989393 Z"/>
+</symbol>
+<symbol id="icon-cloud-plus" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M15.6235888,7.44610262 C17.5394793,7.77350822 19,9.78869625 19,11.8478316 C19,14.1410109 17.1886016,16 14.9541284,16 L14.9541284,14.4747136 C16.3677747,14.4747136 17.5137615,13.2986185 17.5137615,11.8478316 C17.5137615,10.3970447 16.3677747,8.91481161 14.9541284,8.91481161 L14.2110092,8.91481161 L14.2110092,8.15216843 C14.2110092,7.1693773 13.4346956,6.37266767 12.4770642,6.37266767 C12.05549,6.37266767 11.6590957,6.52662793 11.3464227,6.802956 L10.7567986,7.32404257 L10.2767033,6.69560503 C9.71596184,5.96160282 8.86167816,5.52528636 7.93577982,5.52528636 C6.29412606,5.52528636 4.96330275,6.89107429 4.96330275,8.57585909 C4.96330275,8.9272386 5.02090075,9.2694689 5.13225047,9.5927832 L5.48243418,10.6095742 L4.22018349,10.6095742 C3,10.6095742 2.463,11.4489434 2.48623853,12.6952129 C2.50947706,13.9414824 3.26255213,14.4747136 4.22018349,14.4747136 L14.9541284,14.4747136 L14.9541284,16 L4.22018349,16 C2.44172526,16 1,14.5203964 1,12.6952129 C1,11.1191286 2.07504915,9.49459444 3.51364244,9.16408462 C3.48935799,8.97018833 3.47706422,8.77380947 3.47706422,8.57585909 C3.47706422,6.0486819 5.47329919,4 7.93577982,4 C9.08463113,4 10.1622526,4.44948022 10.9755411,5.22797721 C11.4318843,4.98079074 11.9448818,4.84738131 12.4770642,4.84738131 C14.0193943,4.84738131 15.3084723,5.96016993 15.6235888,7.44610262 Z M9.29954983,9.08011866 C9.29954983,8.73895378 9.57611861,8.462385 9.91728349,8.462385 C10.2584484,8.462385 10.5350172,8.73895378 10.5350172,9.08011866 L10.5350172,10.2224853 L11.6775315,10.2224853 C12.0187779,10.2224853 12.2954128,10.4991202 12.2954128,10.8403667 C12.2954128,11.1816131 12.0187779,11.458248 11.6775315,11.458248 L10.5350172,11.458248 L10.5350172,12.6006146 C10.5350172,12.9417795 10.2584484,13.2183483 9.91728349,13.2183483 C9.57611861,13.2183483 9.29954983,12.9417795 9.29954983,12.6006146 L9.29954983,11.458248 L8.1573309,11.458248 C7.81608445,11.458248 7.53944954,11.1816131 7.53944954,10.8403667 C7.53944954,10.4991202 7.81608445,10.2224853 8.1573309,10.2224853 L9.29954983,10.2224853 L9.29954983,9.08011866 Z"/>
+</symbol>
+<symbol id="icon-code" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M2.30568731,9.29244056 L5.12296559,6.47871347 C5.4052247,6.19681014 5.8624883,6.19683744 6.14471375,6.47877447 L6.14471375,6.47877447 C6.42655656,6.76032924 6.42679005,7.21705322 6.14523528,7.49889603 C6.14506153,7.49906996 6.14488768,7.4992438 6.14471375,7.49941756 L3.64158004,9.99999314 L6.14471375,12.5005687 C6.42655656,12.7821235 6.42679005,13.2388475 6.14523528,13.5206903 C6.14506153,13.5208642 6.14488768,13.5210381 6.14471375,13.5212118 L6.14471375,13.5212118 C5.8624883,13.8031488 5.4052247,13.8031761 5.12296559,13.5212728 L2.30568731,10.7075457 C1.91491681,10.3172678 1.91451751,9.68410293 2.30479544,9.29333243 C2.30509254,9.29303495 2.30538983,9.29273766 2.30568731,9.29244056 Z M11.8711743,3.02447532 L11.8711743,3.02447532 C12.2567387,3.12754162 12.4857488,3.52365513 12.3826825,3.90921961 C12.3826229,3.90944259 12.3825632,3.90966554 12.3825033,3.90988846 L9.01369933,16.4641414 C8.91020731,16.8498168 8.51379668,17.0786998 8.12803998,16.975511 L8.12803998,16.975511 C7.74265022,16.8724203 7.51380162,16.4764286 7.6168923,16.0910389 C7.6169372,16.090871 7.61698216,16.0907032 7.61702718,16.0905354 L10.9849573,3.53630666 C11.0884944,3.15036395 11.4851392,2.92128322 11.8711743,3.02447532 Z M13.855368,6.47915961 L13.855368,6.47915961 C14.1375934,6.19722259 14.594857,6.19719529 14.8771161,6.47909861 L17.6943098,9.2927412 C18.0850803,9.68301913 18.0854796,10.316184 17.6952017,10.7069545 C17.6948764,10.7072801 17.694551,10.7076055 17.6942253,10.7079307 L14.8771771,13.5207561 C14.5948744,13.8026356 14.1376033,13.802581 13.855368,13.5206341 L13.855368,13.5206341 C13.5735702,13.2391243 13.5733368,12.7824734 13.8548465,12.5006757 C13.8550474,12.5004745 13.8552484,12.5002736 13.8554496,12.5000727 L16.3585017,10.0003783 L13.855368,7.49980271 C13.5735252,7.21824793 13.5732917,6.76152395 13.8548464,6.47968115 C13.8550202,6.47950721 13.855194,6.47933337 13.855368,6.47915961 Z"/>
+</symbol>
+<symbol id="icon-cog" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M8.76861665,2.03647301 C8.82939512,2.01361157 8.89477454,2.00087644 8.96246329,2.00002629 L11.0325076,2.00002629 C11.2904411,1.99756405 11.5180277,2.16825397 11.5878853,2.4165596 L12.0281313,3.96370984 C12.1354473,4.00009741 12.2408804,4.03967517 12.3447609,4.0819971 C12.5103851,4.14580551 12.6740057,4.21647033 12.8352947,4.29618728 L14.2365526,3.51573988 C14.461528,3.3895581 14.743152,3.4297901 14.9237974,3.61391773 L16.3875398,5.07766008 C16.4306937,5.12191174 16.4654797,5.17180846 16.491611,5.22517005 C16.5770042,5.39049277 16.5782012,5.59151558 16.4853072,5.76144823 L15.702838,7.16232045 C15.8320801,7.42054258 15.9452672,7.69169351 16.0394547,7.96944375 L17.0033826,8.24612675 C17.0252732,8.25130193 17.0466704,8.2577188 17.0674958,8.26530117 L17.5834404,8.41211469 C17.831746,8.48197232 18.002436,8.70955888 17.9999737,8.96749242 L17.9999737,11.0375367 C17.9997485,11.0554653 17.9986896,11.0732319 17.9968295,11.0907939 C17.9942551,11.1196948 17.9894767,11.1486032 17.9824261,11.1772846 C17.9332835,11.3771948 17.781223,11.5357022 17.5835244,11.5930986 L16.040881,12.0300323 C15.9498361,12.3031385 15.8384323,12.5740276 15.7090405,12.8362032 L16.1949961,13.7134476 C16.220004,13.7539408 16.2395196,13.7968026 16.2535277,13.8409973 L16.4767924,14.2439003 C16.6006944,14.4647931 16.564365,14.7408965 16.3875398,14.9222199 L14.9729157,16.336844 C14.9300475,16.3925697 14.8767081,16.4408054 14.8146428,16.4783775 C14.6385358,16.5849863 14.4189312,16.589545 14.2385518,16.4903363 L13.0869359,15.8470914 L12.8364344,15.7082784 C12.5707614,15.8396782 12.3002129,15.9502826 12.0233519,16.0422474 L11.9052994,16.4537448 L11.5857509,17.5819469 C11.5171965,17.830699 11.2904079,18.0026194 11.0323848,18.001434 L8.96172494,18.001434 C8.70370185,18.0026194 8.47691325,17.830699 8.40835893,17.5819469 L8.02195892,16.2177183 L7.97161892,16.0422474 C7.85958883,16.0050105 7.74939342,15.9636007 7.64028839,15.9187827 C7.47617989,15.8554497 7.31567572,15.7862368 7.15882277,15.7076426 L6.38549103,16.1361768 L5.76273021,16.4840252 C5.58672373,16.583979 5.37529693,16.5816495 5.20466072,16.4875247 C5.15601363,16.4610111 5.11064601,16.4270734 5.07031235,16.3859623 L3.60656999,14.9222199 C3.5850396,14.9001418 3.56559215,14.8766585 3.54826328,14.8520408 C3.42021358,14.673411 3.40461649,14.4333583 3.51597482,14.2372698 L4.15017776,13.101842 L4.29381488,12.8426347 C4.16290119,12.5814917 4.04967779,12.311609 3.95465507,12.0304362 L2.41058539,11.5930986 C2.16537406,11.5212233 1.99771666,11.2952503 2.00002351,11.0397326 L2.00002351,8.96014741 C2.00168566,8.70793335 2.16855052,8.48665604 2.41058539,8.41570666 L3.95465507,7.96944375 C4.04894146,7.691402 4.16226732,7.41997343 4.29167878,7.16150746 L3.50966371,5.76144823 C3.42298322,5.60288218 3.4182275,5.41724603 3.4873574,5.25880397 C3.51455891,5.19275134 3.55446477,5.13109079 3.60656999,5.07766008 L5.07031235,3.61391773 C5.24048888,3.44046085 5.50027904,3.39470451 5.71790312,3.49547438 C5.73089752,3.50136024 5.74374545,3.50776509 5.7564191,3.51469284 L7.16379676,4.29095945 C7.42663325,4.16124158 7.69822718,4.0496024 7.97203296,3.95843091 L8.40835893,2.41793312 C8.46024081,2.23734412 8.5963624,2.0967791 8.76861665,2.03647301 Z M15.1846994,11.1829536 C15.2560343,11.0969513 15.3522175,11.0322984 15.4629072,10.99967 L16.8576627,10.6020701 L16.8576627,9.39033684 L16.7529516,9.36082734 C16.7321479,9.35639273 16.7114655,9.35076836 16.6909986,9.34393351 L16.4927559,9.28749947 L15.4692183,8.99904798 C15.4044329,8.98105851 15.3443995,8.95212084 15.2911969,8.91431379 C15.1842753,8.84066665 15.1038975,8.73155091 15.0666016,8.60313708 C14.9506063,8.18208767 14.7889586,7.78194763 14.5757124,7.40715248 C14.4743021,7.23426606 14.470915,7.02087909 14.5667871,6.84486121 L15.269891,5.58105421 L14.4152629,4.72642608 L13.1593519,5.42695936 C13.1126845,5.45262007 13.0633495,5.47128413 13.0128081,5.48296796 C12.8729654,5.51759737 12.723038,5.4985231 12.594305,5.42574515 C12.3453679,5.28410944 12.0852509,5.16129735 11.8152557,5.06080016 C11.6780494,5.01103819 11.5389996,4.96696656 11.398552,4.92838162 C11.338686,4.91175819 11.2828778,4.88578613 11.2327677,4.85210574 C11.1201195,4.77847293 11.035304,4.66619252 10.9966838,4.53321932 L10.6039725,3.1498043 L9.39580133,3.1498043 L9.00032996,4.53709277 C8.94365835,4.72934805 8.79037595,4.87784038 8.59641888,4.92838162 C8.1806108,5.04261394 7.78336688,5.21125348 7.40361897,5.42695936 C7.35253931,5.45504624 7.29826373,5.47475089 7.24270822,5.48609483 C7.10670406,5.51633608 6.96217181,5.49621952 6.83751348,5.42574515 L6.10566995,5.01570516 L5.579708,4.72642608 L4.72770806,5.57842602 L5.15738345,6.359654 L5.42732267,6.84486121 C5.46551842,6.91498726 5.48795925,6.99104471 5.49472333,7.06810936 C5.50629306,7.18455517 5.4820287,7.30375534 5.42193023,7.4086481 C5.25655882,7.69978388 5.1225577,7.99749769 5.01755165,8.30795236 C4.98527661,8.40410875 4.9555785,8.50146757 4.92838113,8.599972 C4.87664718,8.79163917 4.72902966,8.94284812 4.53837474,8.99904798 L3.23868655,9.36954733 L3.1436193,9.3971475 L3.1436193,10.6027325 L3.80782765,10.7955672 L4.53206363,10.99967 C4.72516237,11.0532892 4.87604443,11.2041713 4.9296636,11.39727 C5.04390561,11.813072 5.20622213,12.2166446 5.42193023,12.596381 C5.52229584,12.7695743 5.52469012,12.9826652 5.42824134,13.1580699 L5.02817791,13.8724689 L4.72268595,14.421581 L5.579708,15.278603 L6.49510256,14.7659821 L6.83751348,14.5741348 C7.01196938,14.4755079 7.22534884,14.4755079 7.39980475,14.5741348 C7.51717442,14.6409104 7.63702969,14.7035044 7.759234,14.7615491 C8.03193837,14.8887777 8.31439382,14.9911158 8.60272999,15.0703364 C8.79582873,15.1239556 8.94671078,15.2748376 9.00032996,15.4679364 L9.39161881,16.8563807 L10.6033521,16.8563807 L10.7318193,16.4057256 L10.9966838,15.4666607 C11.0308108,15.3491579 11.1010096,15.2478131 11.1946096,15.1750151 C11.2557322,15.1266807 11.327022,15.0906202 11.4048631,15.0703364 C11.5491807,15.0306892 11.6905026,14.9852475 11.8294007,14.933791 C12.0943388,14.8342821 12.349719,14.7132882 12.594305,14.5741348 C12.7687609,14.4755079 12.9821404,14.4755079 13.1565963,14.5741348 L13.4523663,14.7398499 L14.420119,15.274169 L15.2718825,14.4224055 L14.5667871,13.1550188 C14.4754387,12.9873063 14.4742034,12.7856681 14.5620121,12.6174628 C14.5655322,12.6103793 14.5692084,12.6033504 14.5730406,12.596381 C14.6360095,12.4855249 14.6949676,12.3731779 14.7497321,12.2593133 C14.8796117,11.9865318 14.9845332,11.7035651 15.0666016,11.4056682 C15.0892749,11.3221552 15.1301159,11.2464419 15.1846994,11.1829536 Z M9.10437645,6.98503323 C9.38755247,6.90067068 9.6872034,6.85534048 9.99703138,6.85534048 C10.2880631,6.85534048 10.5701152,6.89533747 10.8379678,6.97011166 C11.3444998,7.10949072 11.8224116,7.37742783 12.2189066,7.77392285 C12.5679028,8.12291907 12.8172978,8.53499358 12.9670914,8.9741421 C13.0782797,9.29507071 13.1387223,9.63926604 13.1387223,9.99703138 C13.1387223,10.4460052 13.0435327,10.8736082 12.872318,11.2606759 C12.7202639,11.6081981 12.5024601,11.9333912 12.2189066,12.2169447 C11.9883262,12.4475252 11.7302107,12.6346277 11.4549442,12.7782523 C11.0187338,13.0083232 10.5225204,13.1387223 9.99703138,13.1387223 C9.44231466,13.1387223 8.92022083,12.9934142 8.46689476,12.7389431 C8.21893494,12.6010394 7.98597996,12.4270399 7.77588475,12.2169447 C7.53372291,11.9747829 7.33951624,11.7022507 7.19326472,11.4113765 C6.97723916,10.9858096 6.85534048,10.5051041 6.85534048,9.99703138 C6.85534048,9.59056278 6.93335942,9.2016103 7.07517689,8.84439428 C7.22791067,8.4539263 7.46147997,8.08832764 7.77588475,7.77392285 C8.15866802,7.39113958 8.61733395,7.12817641 9.10437646,6.98503323 Z M11.1323752,8.13858987 C10.8024873,7.93756264 10.4140164,7.8220146 9.99703138,7.8220146 C9.60767964,7.8220146 9.24318797,7.9227555 8.92803486,8.09975898 C8.76055089,8.19493488 8.60272115,8.31417011 8.45942657,8.45746468 C8.26781214,8.64907912 8.11921873,8.86668448 8.01364637,9.09860985 C7.89046152,9.37205341 7.8220146,9.67609689 7.8220146,9.99703138 C7.8220146,10.228768 7.85770177,10.451698 7.92391499,10.6606604 C8.02667878,10.9791572 8.20518263,11.279159 8.45942657,11.5334029 C8.75939132,11.8333676 9.12305103,12.0279022 9.5056313,12.1170066 C9.66340025,12.1530318 9.82786946,12.1720482 9.99703138,12.1720482 C10.1804462,12.1720482 10.3583442,12.1496923 10.5281664,12.1075395 C10.8964276,12.0145344 11.2456122,11.8231555 11.5353648,11.5334029 C11.7569896,11.3117781 11.9210623,11.0553839 12.027583,10.7822782 C12.1209451,10.539036 12.1720482,10.274339 12.1720482,9.99703138 C12.1720482,9.61711037 12.0761284,9.26085998 11.9070315,8.95102246 C11.8096435,8.77425455 11.6857546,8.60785446 11.5353648,8.45746468 C11.4109304,8.33303025 11.2755351,8.22673864 11.1323752,8.13858987 Z"/>
+</symbol>
+<symbol id="icon-computer" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M3.5483871,5.84914695 L3.5483871,11.0397419 C3.5483871,11.7524481 4.12872635,12.3333333 4.84475733,12.3333333 L15.1552427,12.3333333 C15.8725518,12.3333333 16.4516129,11.7538488 16.4516129,11.0397419 L16.4516129,5.84914695 C16.4516129,5.1364408 15.8712736,4.55555556 15.1552427,4.55555556 L4.84475733,4.55555556 C4.12744819,4.55555556 3.5483871,5.13504012 3.5483871,5.84914695 Z M2,5.84914695 C2,4.27457375 3.27364232,3 4.84475733,3 L15.1552427,3 C16.7251518,3 18,4.27604762 18,5.84914695 L18,11.0397419 C18,12.6143151 16.7263577,13.8888889 15.1552427,13.8888889 L4.84475733,13.8888889 C3.27484823,13.8888889 2,12.6128413 2,11.0397419 L2,5.84914695 Z M6.64516129,16.2222222 L6.64516129,16.2222222 C6.64516129,15.7926674 6.99338426,15.4444444 7.42293907,15.4444444 L12.5770609,15.4444444 C13.0066157,15.4444444 13.3548387,15.7926674 13.3548387,16.2222222 L13.3548387,16.2222222 C13.3548387,16.651777 13.0066157,17 12.5770609,17 L7.42293907,17 C6.99338426,17 6.64516129,16.651777 6.64516129,16.2222222 Z"/>
+</symbol>
+<symbol id="icon-copy" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M3,3 L3,14.2571429 C3,14.8094276 3.44771525,15.2571429 4,15.2571429 L6.61290323,15.2571429 L6.61290323,17 C6.61290323,17.5522847 7.06061848,18 7.61290323,18 L16,18 C16.5522847,18 17,17.5522847 17,17 L17,10.1263643 C17,9.86322398 16.8962817,9.61068815 16.7113319,9.42350804 L12.3800548,5.04000087 C12.1921856,4.8498662 11.9360168,4.74285714 11.6687229,4.74285714 L11.1832258,4.74285714 L8.76808469,2.2973277 C8.58020168,2.10708066 8.32395462,2 8.05657107,2 L4,2 C3.44771525,2 3,2.44771525 3,3 Z M4.85483871,3.37051429 L7.70455922,3.37051429 C7.83827986,3.37051429 7.96642858,3.42407767 8.06037453,3.51923738 L9.2683871,4.74285714 L6.61290323,4.74285714 L6.61290323,13.8857143 L4.85483871,13.8857143 C4.57869633,13.8857143 4.35483871,13.6618567 4.35483871,13.3857143 L4.35483871,3.87051429 C4.35483871,3.59437191 4.57869633,3.37051429 4.85483871,3.37051429 Z M8.46774194,6.11428571 L10.6290323,6.11428571 C10.9051746,6.11428571 11.1290323,6.33814334 11.1290323,6.61428571 L11.1290323,10.1848 C11.1290323,10.4609424 11.3528899,10.6848 11.6290323,10.6848 L15.1451613,10.6848 C15.4213037,10.6848 15.6451613,10.9086576 15.6451613,11.1848 L15.6451613,16.1276571 C15.6451613,16.4037995 15.4213037,16.6276571 15.1451613,16.6276571 L8.46774194,16.6276571 C8.19159956,16.6276571 7.96774194,16.4037995 7.96774194,16.1276571 L7.96774194,6.61428571 C7.96774194,6.33814334 8.19159956,6.11428571 8.46774194,6.11428571 Z M12.6550106,7.25666381 L14.5186194,9.14309234 C14.5574335,9.18238168 14.5570482,9.24569701 14.5177589,9.28451108 C14.4990414,9.3030021 14.4737906,9.31337143 14.4474798,9.31337143 L12.583871,9.31337143 C12.5286425,9.31337143 12.483871,9.2685999 12.483871,9.21337143 L12.483871,7.3269429 C12.483871,7.27171442 12.5286425,7.2269429 12.583871,7.2269429 C12.6106035,7.2269429 12.6362232,7.23764635 12.6550106,7.25666381 Z"/>
+</symbol>
+<symbol id="icon-cross" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M10,8.74246426 L14.1136964,4.62876787 C14.4609553,4.28150896 15.0239732,4.28150896 15.3712321,4.62876787 L15.3712321,4.62876787 C15.718491,4.97602678 15.718491,5.5390447 15.3712321,5.88630361 L11.2575357,10 L15.3712321,14.1136964 C15.718491,14.4609553 15.718491,15.0239732 15.3712321,15.3712321 L15.3712321,15.3712321 C15.0239732,15.718491 14.4609553,15.718491 14.1136964,15.3712321 L10,11.2575357 L5.88630361,15.3712321 C5.5390447,15.718491 4.97602678,15.718491 4.62876787,15.3712321 L4.62876787,15.3712321 C4.28150896,15.0239732 4.28150896,14.4609553 4.62876787,14.1136964 L8.74246426,10 L4.62876787,5.88630361 C4.28150896,5.5390447 4.28150896,4.97602678 4.62876787,4.62876787 L4.62876787,4.62876787 C4.97602678,4.28150896 5.5390447,4.28150896 5.88630361,4.62876787 L10,8.74246426 Z"/>
+</symbol>
+<symbol id="icon-cube" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M2.0007076,5.69298374 C1.98838114,5.40109567 2.13715444,5.10255114 2.44282261,4.97998868 L9.75748528,2.04705978 C9.91415584,1.98424026 10.0871302,1.98431587 10.2437517,2.04727233 L17.4658592,4.95031125 C17.761783,5.02218314 18,5.30027786 18,5.65882525 L18,13.4005666 C18,13.6754848 17.8532949,13.926813 17.6210363,14.0497894 L10.3135626,17.918954 C10.1298622,18.0191489 9.90323339,18.0333686 9.69363356,17.9223895 C9.69145039,17.9212873 9.68929478,17.9201265 9.68714505,17.918954 L2.37967132,14.0497894 C2.1474127,13.926813 2.0007076,13.6754848 2.0007076,13.4005666 L2.0007076,5.69298374 Z M4.51434148,5.70181767 L10.0003538,8.20280529 L15.4796882,5.70486203 L10.000051,3.50223626 L4.51434148,5.70181767 Z M10.6860378,9.50687642 L10.6860378,16.0984854 L16.6286321,12.9519978 L16.6286321,6.76175938 L16.3206133,6.90218032 L10.6860378,9.50687642 Z M3.37207552,6.76709927 L3.37207552,12.9519978 L9.31466984,16.0984854 L9.31466984,9.5073497 L3.37207552,6.76709927 Z"/>
+</symbol>
+<symbol id="icon-customize" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M10.36492,9.22580645 C10.7019155,8.03432011 11.7973914,7.16129032 13.0967742,7.16129032 C14.396157,7.16129032 15.4916328,8.03432011 15.8286284,9.22580645 L17.2258065,9.22580645 C17.6533817,9.22580645 18,9.57242471 18,10 C18,10.4275753 17.6533817,10.7741935 17.2258065,10.7741935 L15.8286284,10.7741935 C15.4916328,11.9656799 14.396157,12.8387097 13.0967742,12.8387097 C11.7973914,12.8387097 10.7019155,11.9656799 10.36492,10.7741935 L2.77419355,10.7741935 C2.34661826,10.7741935 2,10.4275753 2,10 C2,9.57242471 2.34661826,9.22580645 2.77419355,9.22580645 L10.36492,9.22580645 Z M13.0967742,11.2903226 C13.8093997,11.2903226 14.3870968,10.7126255 14.3870968,10 C14.3870968,9.28737452 13.8093997,8.70967742 13.0967742,8.70967742 C12.3841487,8.70967742 11.8064516,9.28737452 11.8064516,10 C11.8064516,10.7126255 12.3841487,11.2903226 13.0967742,11.2903226 Z M7.93548387,12.3225806 C9.23486671,12.3225806 10.3303425,13.1956104 10.6673381,14.3870968 L17.2258065,14.3870968 C17.6533817,14.3870968 18,14.733715 18,15.1612903 C18,15.5888656 17.6533817,15.9354839 17.2258065,15.9354839 L10.6673381,15.9354839 C10.3303425,17.1269702 9.23486671,18 7.93548387,18 C6.63610103,18 5.54062523,17.1269702 5.20362967,15.9354839 L2.77419355,15.9354839 C2.34661826,15.9354839 2,15.5888656 2,15.1612903 C2,14.733715 2.34661826,14.3870968 2.77419355,14.3870968 L5.20362967,14.3870968 C5.54062523,13.1956104 6.63610103,12.3225806 7.93548387,12.3225806 Z M7.93548387,16.4516129 C8.64810935,16.4516129 9.22580645,15.8739158 9.22580645,15.1612903 C9.22580645,14.4486648 8.64810935,13.8709677 7.93548387,13.8709677 C7.22285839,13.8709677 6.64516129,14.4486648 6.64516129,15.1612903 C6.64516129,15.8739158 7.22285839,16.4516129 7.93548387,16.4516129 Z M6.90322581,2 C8.20260864,2 9.29808445,2.87302978 9.63508001,4.06451613 L17.2258065,4.06451613 C17.6533817,4.06451613 18,4.41113439 18,4.83870968 C18,5.26628497 17.6533817,5.61290323 17.2258065,5.61290323 L9.63508001,5.61290323 C9.29808445,6.80438957 8.20260864,7.67741935 6.90322581,7.67741935 C5.60384297,7.67741935 4.50836716,6.80438957 4.17137161,5.61290323 L2.77419355,5.61290323 C2.34661826,5.61290323 2,5.26628497 2,4.83870968 C2,4.41113439 2.34661826,4.06451613 2.77419355,4.06451613 L4.17137161,4.06451613 C4.50836716,2.87302978 5.60384297,2 6.90322581,2 Z M6.90322581,6.12903226 C7.61585129,6.12903226 8.19354839,5.55133516 8.19354839,4.83870968 C8.19354839,4.12608419 7.61585129,3.5483871 6.90322581,3.5483871 C6.19060032,3.5483871 5.61290323,4.12608419 5.61290323,4.83870968 C5.61290323,5.55133516 6.19060032,6.12903226 6.90322581,6.12903226 Z"/>
+</symbol>
+<symbol id="icon-discover" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M6.40211645,13.5 L4.36976532,13.5 C5.08834307,14.6534694 6.15151935,15.5700421 7.41528581,16.1057095 C6.99352323,15.3908207 6.64680853,14.5042677 6.40211645,13.5 Z M6.12601749,12 C6.043753,11.3607602 6,10.6905991 6,10 C6,9.4873059 6.02411418,8.98587614 6.07019789,8.5 L3.54187189,8.5 C3.43036499,8.98199332 3.37142857,9.4841153 3.37142857,10 C3.37142857,10.697025 3.47901938,11.3689256 3.67849919,12 L6.12601749,12 Z M6.29075852,7 C6.53582402,5.7891713 6.92480779,4.72565214 7.41528581,3.89429054 C5.97389689,4.50524604 4.79344659,5.61170376 4.08759864,7 L6.29075852,7 Z M13.7092415,7 L15.9124014,7 C15.2065534,5.61170376 14.0261031,4.50524604 12.5847142,3.89429054 C13.0751922,4.72565214 13.464176,5.7891713 13.7092415,7 Z M13.9298021,8.5 C13.9758858,8.98587614 14,9.4873059 14,10 C14,10.6905991 13.956247,11.3607602 13.8739825,12 L16.3215008,12 C16.5209806,11.3689256 16.6285714,10.697025 16.6285714,10 C16.6285714,9.4841153 16.569635,8.98199332 16.4581281,8.5 L13.9298021,8.5 Z M13.5978835,13.5 C13.3531915,14.5042677 13.0064768,15.3908207 12.5847142,16.1057095 C13.8484806,15.5700421 14.9116569,14.6534694 15.6302347,13.5 L13.5978835,13.5 Z M7.87449573,13.5 C8.31545266,15.3608884 9.10249541,16.6 10,16.6 C10.8975046,16.6 11.6845473,15.3608884 12.1255043,13.5 L7.87449573,13.5 Z M7.61266,12 L12.38734,12 C12.4605549,11.3840508 12.5,10.7290943 12.5,10.05 C12.5,9.51599804 12.4756096,8.99692139 12.4295883,8.5 L7.57041167,8.5 C7.5243904,8.99692139 7.5,9.51599804 7.5,10.05 C7.5,10.7290943 7.53944513,11.3840508 7.61266,12 Z M7.7870057,7 L12.2129943,7 C11.7942682,4.91878844 10.9603738,3.5 10,3.5 C9.03962624,3.5 8.20573179,4.91878844 7.7870057,7 Z M10,18 C5.58217143,18 2,14.4178286 2,10 C2,5.58125714 5.58217143,2 10,2 C14.4187429,2 18,5.58125714 18,10 C18,14.4178286 14.4187429,18 10,18 Z"/>
+</symbol>
+<symbol id="icon-discussion" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M3.36312881,15.7593532 C3.32888874,15.7771726 3.29959994,15.7925621 3.27370934,15.8064174 C3.73031444,16.1917386 4.92393678,16.4549204 7.10274479,16.4476544 L7.21881505,16.4476539 C8.55574002,16.4476543 9.6998097,16.021859 10.6510241,15.170268 L12.188241,15.2712054 C11.5513943,15.8887667 11.2142468,16.2130071 11.1767984,16.2439265 C10.1491488,17.09241 8.76567843,17.5637907 7.21881505,17.5637907 L7.10806092,17.5644215 L6.97721254,17.5644231 C4.30241208,17.5644231 2.62246666,17.1951018 2.10341288,16.0930165 C1.82161029,15.4951149 2.13151102,15.1455492 2.84114675,14.7722012 C3.31318797,14.5227311 3.32172914,14.5103228 3.24657386,14.3473099 C3.20302404,14.2436958 3.16526615,14.1604157 3.07972552,13.9763174 C2.74839464,13.2684751 2.62592155,12.9023078 2.62592155,12.4061039 C2.62592155,11.562445 2.83045155,10.7486059 3.21214892,10.0211892 C3.42204019,9.66099218 3.78721597,9.06536542 4.270822,8.82818513 C4.270822,8.80275057 4.53792399,10.0211892 4.53792399,10 C4.45304843,10.1183326 4.36401443,10.2496015 4.270822,10.3938065 C3.78721597,11.0991197 3.7445882,11.6631394 3.7445882,12.4061039 C3.7445882,12.6985231 3.82924269,12.9394008 4.09330148,13.5047226 C4.19543836,13.7251753 4.22995648,13.801243 4.270822,13.8994264 C4.58782821,14.5810467 4.36137367,15.1036933 3.78721597,15.5080098 C3.65916127,15.5981847 3.55361796,15.6588423 3.36312881,15.7593532 Z M16.5696621,12.3226926 C16.5350205,12.3039671 16.4951623,12.2829692 16.4468239,12.2578135 C16.2265134,12.1415693 16.1048536,12.0716493 15.9574055,11.9678178 C15.2986909,11.5039571 15.0399564,10.9068098 15.4049351,10.1218159 C15.4504792,10.0121781 15.4903754,9.92425877 15.608285,9.66976084 C15.914896,9.01333804 16.0132801,8.73339397 16.0132801,8.39198996 C16.0132801,5.80517045 13.90418,3.70028722 11.3120655,3.70028722 C8.71995111,3.70028722 6.61085101,5.80517045 6.61085101,8.39198996 C6.61085101,11.1096858 8.86296092,13.082961 11.9786225,13.082961 L12.112848,13.0829616 C14.6633683,13.0914671 16.0501708,12.7797435 16.5696621,12.3226926 Z M16.5612822,10.6280948 C16.4685253,10.8294269 16.4833349,10.8509584 17.0358533,11.1429611 C17.8499187,11.5712649 18.2032866,11.969896 17.8824254,12.6506683 C17.2857779,13.9175051 15.3458564,14.3439799 12.2581228,14.3439799 L12.1073975,14.3439799 L11.9780624,14.3432467 C8.14202747,14.3432482 5.34836876,11.8401459 5.34836876,8.39198996 C5.34836876,5.10955211 8.0234498,2.44 11.3120655,2.44 C14.6008168,2.44 17.276494,5.10968724 17.276494,8.39198996 C17.276494,8.96303774 17.1353362,9.38506819 16.7528285,10.2022436 C16.6539056,10.4151439 16.6101724,10.5116034 16.5612822,10.6280948 Z" id="path-1"/>
+</symbol>
+<symbol id="icon-download" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M13.0661854,13.8691048 L13.0661854,13.8691048 C13.3204823,14.1197896 13.3234104,14.5291581 13.0727256,14.783455 C13.0705612,14.7856506 13.0683811,14.7878308 13.0661854,14.7899952 L10.6543517,17.1675709 C10.2650167,17.5513757 9.63962467,17.5513757 9.25028971,17.1675709 L6.83845596,14.7899952 C6.58415908,14.5393104 6.58123091,14.1299419 6.83191572,13.875645 C6.83408017,13.8734494 6.83626031,13.8712692 6.83845596,13.8691048 L6.83845596,13.8691048 C7.09749077,13.6137493 7.51358056,13.6137493 7.77261537,13.8691048 L9.25137581,15.3268606 L9.25137581,10.0339893 C9.25137581,9.66917735 9.54711432,9.37343883 9.91192627,9.37343883 L9.91192627,9.37343883 C10.2767382,9.37343883 10.5724767,9.66917735 10.5724767,10.0339893 L10.5724767,15.4065019 L12.132026,13.8691048 C12.3910608,13.6137493 12.8071506,13.6137493 13.0661854,13.8691048 Z M14.9987456,5.44238699 C16.7017593,5.72193582 18,7.18117469 18,8.93932691 C18,10.897313 16.3898681,12.4845743 14.4036697,12.4845743 L12.8484335,12.4845743 C12.4888034,12.4845743 12.1972656,12.1930365 12.1972656,11.8334064 L12.1972656,11.8334064 C12.1972656,11.4737763 12.4888034,11.1822385 12.8484335,11.1822385 L14.4036697,11.1822385 C15.6602442,11.1822385 16.6788991,10.1780528 16.6788991,8.93932691 C16.6788991,7.70060103 15.6602442,6.69641529 14.4036697,6.69641529 L13.7431193,6.69641529 L13.7431193,6.0452474 C13.7431193,5.20611051 13.0530627,4.52585566 12.2018349,4.52585566 C11.8271022,4.52585566 11.4747517,4.6573116 11.1968202,4.89324889 L10.6727099,5.33816841 L10.2459585,4.80158937 C9.74752164,4.17487601 8.98815837,3.80233578 8.16513761,3.80233578 C6.70588984,3.80233578 5.52293578,4.96848696 5.52293578,6.40700734 C5.52293578,6.70702583 5.574134,6.99923245 5.67311153,7.27528801 L5.98438594,8.14345504 L4.86238532,8.14345504 C4.01115745,8.14345504 3.32110092,8.8237099 3.32110092,9.66284679 C3.32110092,10.5019837 4.01115745,11.1822385 4.86238532,11.1822385 L6.77545553,11.1822385 C7.13508563,11.1822385 7.42662342,11.4737763 7.42662342,11.8334064 L7.42662342,11.8334064 C7.42662342,12.1930365 7.13508563,12.4845743 6.77545553,12.4845743 L4.86238532,12.4845743 C3.28153356,12.4845743 2,11.2212439 2,9.66284679 C2,8.31713817 2.95559925,7.19145146 4.23434884,6.90925214 C4.21276266,6.74369761 4.20183486,6.57602338 4.20183486,6.40700734 C4.20183486,4.24922677 5.97626595,2.5 8.16513761,2.5 C9.18633879,2.5 10.1442246,2.88377985 10.8671476,3.5484842 C11.2727861,3.3374289 11.7287839,3.22351988 12.2018349,3.22351988 C13.5727949,3.22351988 14.718642,4.17365257 14.9987456,5.44238699 Z"/>
+</symbol>
+<symbol id="icon-edit-rounded" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M15.6533333,11.0020275 L16.9333333,11.0020275 L16.9333333,15.842963 C16.9333333,17.0342616 15.967595,18 14.7762963,18 L4.15703704,18 C2.96573838,18 2,17.0342616 2,15.842963 L2,5.2237037 C2,4.03240504 2.96573838,3.06666667 4.15703704,3.06666667 L9.19453663,3.06666667 L9.20692368,4.34666667 L4.15703704,4.34666667 C3.67266286,4.34666667 3.28,4.73932952 3.28,5.2237037 L3.28,15.842963 C3.28,16.3273371 3.67266286,16.72 4.15703704,16.72 L14.7762963,16.72 C15.2606705,16.72 15.6533333,16.3273371 15.6533333,15.842963 L15.6533333,11.0020275 Z M15.5435425,6.27018517 L16.4509257,5.36363291 C16.8547611,4.9589666 16.8547611,4.30086451 16.4509257,3.8961982 L16.104425,3.54969748 C15.7130537,3.15749522 15.0300235,3.15915709 14.6369903,3.55052841 L13.730438,4.4579116 L15.5435425,6.27018517 Z M8.82126233,12.9924654 L14.6627493,7.15180931 L12.8488139,5.33870481 L7.00815783,11.1801918 L6.44997186,13.0190947 C6.42543367,13.099934 6.42544628,13.1862382 6.45000809,13.2670703 C6.51851762,13.4925329 6.75682906,13.6197684 6.98229161,13.5512589 L8.82126233,12.9924654 Z M16.9860491,2.66807334 L17.3325499,3.01457406 C18.2224834,3.90533851 18.2224834,5.35366167 17.3325499,6.24525706 L9.48185723,14.0942878 L5.87570438,15.1901381 C5.71399019,15.2392804 5.54132496,15.2392932 5.37960349,15.1901749 C4.92866079,15.0532138 4.6741284,14.5766236 4.81108947,14.1256809 L5.90633539,10.5195969 L13.7561971,2.66890427 C14.1874534,2.23764798 14.7616308,2 15.3715386,2 C15.9822773,2 16.5547928,2.23764798 16.9860491,2.66807334 Z"/>
+</symbol>
+<symbol id="icon-edit" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M15.1213389,7.00412324 L12.9966071,4.88036516 L14.058973,3.81702548 C14.5195588,3.35838722 15.3199848,3.35643971 15.7786231,3.81605173 L16.1846786,4.22210727 C16.6579232,4.6963256 16.6579232,5.46753899 16.1846786,5.94175732 L15.1213389,7.00412324 Z M7.24366679,14.8817954 L5.08862298,15.5366315 C4.82440906,15.6169161 4.54513783,15.467812 4.46485323,15.203598 C4.43606986,15.1088729 4.43605509,15.0077351 4.46481077,14.9130016 L5.11893496,12.7580373 L11.9634538,5.91254469 L14.0891594,8.03727653 L7.24366679,14.8817954 Z M16.8117763,2.78289844 C16.3063979,2.27849372 15.6354812,2 14.9197718,2 C14.2050361,2 13.5321719,2.27849372 13.0267935,2.78387219 L3.82773678,11.9839026 L2.54424548,16.2097824 C2.38374422,16.7382308 2.68202437,17.2967349 3.21047284,17.4572362 C3.39999018,17.5147967 3.60233225,17.5147817 3.79184106,17.4571931 L8.01780145,16.1729935 L17.2178319,6.97491061 C18.2607227,5.93007227 18.2607227,4.23281856 17.2178319,3.18895397 L16.8117763,2.78289844 Z"/>
+</symbol>
+<symbol id="icon-emoji" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M10,18 C5.581722,18 2,14.418278 2,10 C2,5.581722 5.581722,2 10,2 C14.418278,2 18,5.581722 18,10 C18,14.418278 14.418278,18 10,18 Z M10,16.4516129 C13.5631274,16.4516129 16.4516129,13.5631274 16.4516129,10 C16.4516129,6.43687258 13.5631274,3.5483871 10,3.5483871 C6.43687258,3.5483871 3.5483871,6.43687258 3.5483871,10 C3.5483871,13.5631274 6.43687258,16.4516129 10,16.4516129 Z M12.0645161,8.96774194 C11.4944157,8.96774194 11.0322581,8.50558426 11.0322581,7.93548387 C11.0322581,7.36538348 11.4944157,6.90322581 12.0645161,6.90322581 C12.6346165,6.90322581 13.0967742,7.36538348 13.0967742,7.93548387 C13.0967742,8.50558426 12.6346165,8.96774194 12.0645161,8.96774194 Z M7.93548387,8.96774194 C7.36538348,8.96774194 6.90322581,8.50558426 6.90322581,7.93548387 C6.90322581,7.36538348 7.36538348,6.90322581 7.93548387,6.90322581 C8.50558426,6.90322581 8.96774194,7.36538348 8.96774194,7.93548387 C8.96774194,8.50558426 8.50558426,8.96774194 7.93548387,8.96774194 Z M7.1409857,12.2431969 L7.1409857,12.2431969 C7.43488531,11.9492973 7.8963105,11.9060861 8.2396673,12.1403084 C8.26877473,12.1601936 8.29613517,12.1778957 8.3217349,12.1934347 C9.30462309,12.7900475 10.5277981,12.8361524 11.547824,12.3317496 C11.6374877,12.2874109 11.7416873,12.2241686 11.8604228,12.1420228 L11.8604331,12.1420378 C12.2091473,11.9007839 12.6804816,11.9433595 12.9803191,12.2431969 L12.9803191,12.2431969 C13.2516178,12.5144956 13.2516178,12.9543577 12.9803191,13.2256564 C12.9567628,13.2492127 12.9315426,13.2710441 12.9048537,13.2909816 C12.6545958,13.4778777 12.4427846,13.6150899 12.269394,13.7025831 C10.7222715,14.4832642 8.84781495,14.3919101 7.37730075,13.4285209 C7.32894838,13.3968434 7.27536581,13.3589011 7.21655303,13.3146939 L7.21656224,13.3146816 C6.90256014,13.0786588 6.83934542,12.6327756 7.0753682,12.3187735 C7.09543885,12.2920717 7.11736562,12.266817 7.1409857,12.2431969 Z"/>
+</symbol>
+<symbol id="icon-eraser" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M10.507766,16.2409748 L17.1750714,16.2409748 C17.6306669,16.2409748 18,16.6221045 18,17.0922519 C18,17.5623993 17.6306669,17.9435291 17.1750714,17.9435291 L8.10085694,18 C7.54625212,18 7.05723068,17.7716825 6.63379263,17.3150476 L2.43394192,13.1151969 C1.66077075,12.3420258 1.65683485,11.0924035 2.42515084,10.3240875 L10.0765262,2.67271216 C10.8448422,1.90439617 12.0944644,1.90833207 12.8676356,2.68150324 L17.0674863,6.88135395 C17.8406575,7.65452511 17.8445934,8.90414735 17.0762774,9.67246334 L10.507766,16.2409748 Z M7.648591,7.20057274 L12.5484168,12.1003986 L16.0263147,8.62250066 C16.2183937,8.43042167 16.2174097,8.11801611 16.024117,7.92472332 L11.8242662,3.72487261 C11.6309735,3.53157981 11.3185679,3.53059584 11.1264889,3.72267484 L7.648591,7.20057274 Z M6.60522163,8.2439421 L3.47511352,11.3740502 C3.28303452,11.5661292 3.2840185,11.8785348 3.47731129,12.0718276 L7.677162,16.2716783 C7.87045479,16.4649711 8.18286035,16.465955 8.37493935,16.273876 L11.5050475,13.1437679 L6.60522163,8.2439421 Z"/>
+</symbol>
+<symbol id="icon-eye-off" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M6.35238084,15.3065498 L7.72916775,14.1265903 C8.45286533,14.3275492 9.21420137,14.4347826 9.99999958,14.4347826 C12.7803251,14.4347826 15.2544325,13.0923291 16.8386179,11.0057537 C16.9278243,10.8882574 17.0351425,10.7331722 17.1605724,10.5404979 C17.3750154,10.2110898 17.3765995,9.78660712 17.1646122,9.4556134 C17.043769,9.26691964 16.9398374,9.11467807 16.8528173,8.99888869 C16.4425132,8.45293561 15.9663177,7.95674277 15.434908,7.52247384 L16.612292,6.51341035 C17.4770696,7.27561203 18.216165,8.18516965 18.7922972,9.2053587 C19.0692343,9.69571101 19.0692343,10.304289 18.7922972,10.7946413 C17.0311127,13.9132391 13.7456183,16 9.99999958,16 C8.71593561,16 7.48572405,15.7547236 6.35238084,15.3065498 Z M3.29638938,13.4051322 C2.47083844,12.6598918 1.76345645,11.7787513 1.20770194,10.7946739 C0.930766021,10.3043096 0.930766021,9.69572301 1.20770194,9.2053587 C2.96888646,6.08676087 6.25438091,4 9.99999958,4 C11.2359223,4 12.4219583,4.22722969 13.5197473,4.64390126 L12.1073062,5.85433742 C11.4353766,5.68684143 10.729725,5.59759783 9.99999958,5.59759783 C7.14559137,5.59759783 4.71436027,6.98525595 3.13837526,9.04835832 C3.05887081,9.15243661 2.96392758,9.28696306 2.85354559,9.4519377 C2.63092196,9.78466633 2.62818895,10.2181002 2.84659901,10.5536097 L2.84661092,10.553602 C2.95184204,10.7152523 3.04261244,10.8471696 3.11892214,10.9493539 C3.51665242,11.4819443 3.97196332,11.9670134 4.4753327,12.3947993 L3.29638938,13.4051322 Z M9.17703173,12.8857151 L12.9772581,9.62877454 C12.9922695,9.75041115 13,9.8743028 13,10 C13,11.6568542 11.6568542,13 10,13 C9.7146166,13 9.43854032,12.9601515 9.17703173,12.8857151 Z M7.00824668,10.2241383 C7.00278123,10.1501398 7,10.0753947 7,10 C7,8.34314575 8.34314575,7 10,7 C10.2339211,7 10.461589,7.02677276 10.6801068,7.07742125 L7.00824668,10.2241383 Z M2.37325,16.4565 C2.1158086,16.1565656 2.15025599,15.7047232 2.4501904,15.4472818 L2.45061108,15.446921 L16.4311361,3.46586714 C16.7313873,3.20855741 17.1833669,3.24331175 17.44075,3.5435 C17.6980602,3.84360324 17.6633696,4.29547615 17.3632664,4.55278638 L17.3631514,4.55288497 L3.3835958,16.5339032 C3.08317284,16.7913772 2.63094678,16.7567319 2.37325,16.4565 Z"/>
+</symbol>
+<symbol id="icon-eye" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M18.7922972,9.2053587 C19.0692343,9.69571101 19.0692343,10.304289 18.7922972,10.7946413 C17.0311127,13.9132391 13.7456183,16 9.99999958,16 C6.25594341,16 2.96973021,13.9147065 1.20770194,10.7946739 C0.930766021,10.3043096 0.930766021,9.69572301 1.20770194,9.2053587 C2.96888646,6.08676087 6.25438091,4 9.99999958,4 C13.7440558,4 17.0303002,6.08529348 18.7922972,9.2053587 Z M9.99999958,14.4347826 C12.7803251,14.4347826 15.2544325,13.0923291 16.8386179,11.0057537 C16.9278243,10.8882574 17.0351425,10.7331722 17.1605724,10.5404979 C17.3750154,10.2110898 17.3765995,9.78660712 17.1646122,9.4556134 C17.043769,9.26691964 16.9398374,9.11467807 16.8528173,8.99888869 C15.3105232,6.94670287 12.8372247,5.59759783 9.99999958,5.59759783 C7.14559137,5.59759783 4.71436027,6.98525595 3.13837526,9.04835832 C3.05887081,9.15243661 2.96392758,9.28696306 2.85354559,9.4519377 C2.63092196,9.78466633 2.62818895,10.2181002 2.84659901,10.5536097 L2.84661092,10.553602 C2.95184204,10.7152523 3.04261244,10.8471696 3.11892214,10.9493539 C4.70117419,13.068107 7.1947033,14.4347826 9.99999958,14.4347826 Z M10,13 C8.34314575,13 7,11.6568542 7,10 C7,8.34314575 8.34314575,7 10,7 C11.6568542,7 13,8.34314575 13,10 C13,11.6568542 11.6568542,13 10,13 Z"/>
+</symbol>
+<symbol id="icon-facebook" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M18,2.88177778 L18,17.1146667 C18,17.6035556 17.6035556,17.9964444 17.1182222,17.9964444 L13.0391111,17.9964444 L13.0391111,11.8035556 L15.1182222,11.8035556 L15.4293333,9.38933333 L13.0355556,9.38933333 L13.0355556,7.84622222 C13.0355556,7.14666667 13.2284444,6.67111111 14.232,6.67111111 L15.5111111,6.67111111 L15.5111111,4.51111111 C14.8917323,4.44459425 14.2691594,4.41224895 13.6462222,4.41422222 C11.8035556,4.41422222 10.5395556,5.53955556 10.5395556,7.60711111 L10.5395556,9.38933333 L8.45333333,9.38933333 L8.45333333,11.8035556 L10.5395556,11.8035556 L10.5395556,18 L2.88177778,18 C2.39539318,17.9985357 2.00146429,17.6046068 2,17.1182222 L2,2.88177778 C2,2.39644444 2.39644444,2 2.88177778,2 L17.1146667,2 C17.6035556,2 18,2.39644444 18,2.88177778 Z"/>
+</symbol>
+<symbol id="icon-file-document" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M3,3 L17,3 C17.5522847,3 18,3.44771525 18,4 L18,4 C18,4.55228475 17.5522847,5 17,5 L3,5 C2.44771525,5 2,4.55228475 2,4 L2,4 C2,3.44771525 2.44771525,3 3,3 Z M3,7 L17,7 C17.5522847,7 18,7.44771525 18,8 L18,8 C18,8.55228475 17.5522847,9 17,9 L3,9 C2.44771525,9 2,8.55228475 2,8 L2,8 C2,7.44771525 2.44771525,7 3,7 Z M3,11 L17,11 C17.5522847,11 18,11.4477153 18,12 L18,12 C18,12.5522847 17.5522847,13 17,13 L3,13 C2.44771525,13 2,12.5522847 2,12 L2,12 C2,11.4477153 2.44771525,11 3,11 Z M3,15 L9,15 C9.55228475,15 10,15.4477153 10,16 L10,16 C10,16.5522847 9.55228475,17 9,17 L3,17 C2.44771525,17 2,16.5522847 2,16 L2,16 C2,15.4477153 2.44771525,15 3,15 Z"/>
+</symbol>
+<symbol id="icon-file-generic" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M4.92010385,13.6451085 L4.92010385,13.6451085 C4.65568219,13.4232324 4.62119221,13.0290102 4.84306833,12.7645885 L10.5951031,5.9095804 C11.5583751,4.76159756 13.26105,4.61000255 14.411229,5.57511735 C15.5561098,6.53578638 15.7039186,8.24796856 14.7439681,9.39199307 L8.58461673,16.7324222 C7.18195431,18.4040501 4.68395818,18.6197093 3.01129225,17.2164828 C1.33723883,15.8120924 1.12234198,13.3094679 2.52832222,11.6338859 L9.2219656,3.65671239 C11.0684749,1.45612833 14.3561374,1.17141849 16.5567578,3.01825189 C18.7593504,4.86674048 19.0470528,8.15308594 17.2002554,10.3540134 L10.9075868,17.8533238 C10.6857107,18.1177454 10.2914885,18.1522354 10.0270668,17.9303593 L10.0270668,17.9303593 C9.76264514,17.7084832 9.72815517,17.3142609 9.95003129,17.0498392 L16.2426998,9.55052894 C17.6457355,7.87845614 17.4270523,5.38049815 15.7531983,3.97574452 C14.0810546,2.57242622 11.5819499,2.78884736 10.1795212,4.46019691 L3.48587777,12.4373705 C2.52308683,13.58478 2.67026545,15.2987782 3.81467366,16.2588408 C4.95900296,17.2188371 6.66854979,17.071247 7.62706118,15.9289377 L13.7864125,8.58850856 C14.3030248,7.97283404 14.2232873,7.04917468 13.6077445,6.53267291 C12.987067,6.01186269 12.0727289,6.09326937 11.5526587,6.71306491 L5.80062389,13.568073 C5.57874777,13.8324947 5.18452552,13.8669847 4.92010385,13.6451085 Z"/>
+</symbol>
+<symbol id="icon-file-google-drive" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M17,11.5856456 L12.0961046,11.5856456 L7.52777653,4 L12.4325977,4 L17,11.5856456 Z M7.20781512,4.74508837 L9.65929989,9.01211688 L5.4524106,16.3309451 L3,12.0667058 L7.20781512,4.74508837 Z M8.66822352,12.3636119 L16.9753579,12.3636119 L14.5229473,17 L6.03466829,17 L8.66822352,12.3636119 Z"/>
+</symbol>
+<symbol id="icon-file-keynote" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M10.0846348,10.6119311 C12.0019618,10.6119311 13.9192889,10.6119311 15.836616,10.6119311 C15.8501239,10.6119311 15.8642808,10.6119311 15.8790866,10.6119311 L15.8790866,10.6119092 C16.1919556,10.6119092 16.445586,10.8655397 16.445586,11.1784086 C16.445586,11.1942214 16.4449239,11.2100273 16.4436015,11.2257847 C16.1273576,14.9940214 12.9290911,17.9965658 9.08463478,17.9965658 C5.03356017,17.9965658 1.7,14.6626082 1.7,10.6119311 C1.7,6.82462424 4.6135924,3.66443812 8.30317899,3.26897093 C8.69098612,3.22740394 9.03906262,3.50808703 9.0806296,3.89589416 C9.08330905,3.92089258 9.08465164,3.94601625 9.08465164,3.97115785 C9.08463478,3.98791546 9.08463478,4.00399864 9.08463478,4.01940741 C9.08463478,5.88358196 9.08463478,7.74775651 9.08463478,9.61193106 C9.08463478,10.1642158 9.53235003,10.6119311 10.0846348,10.6119311 Z M10.3153642,8.38464258 C10.3153649,5.67779521 10.3153652,3.75020455 10.3153652,2.60187061 C10.3153652,2.58498492 10.3153652,2.56703332 10.3153652,2.54801582 L10.3153931,2.54801582 C10.3153929,2.25658861 10.5516412,2.02034002 10.8430684,2.02033982 C10.8566249,2.02033981 10.8701764,2.02086222 10.8836927,2.02190589 C12.6338449,2.1570452 14.2871656,2.91288439 15.5371213,4.1624812 C16.7504235,5.37613189 17.4985395,6.97005636 17.6647343,8.66393046 C17.7001437,9.0248272 17.4362842,9.34609685 17.0753874,9.38150631 C17.0540801,9.38359688 17.0326834,9.38464405 17.0112738,9.38464408 L11.3153568,9.38463411 C10.7630769,9.3846348 10.3153649,8.93692402 10.3153642,8.38464407 Z"/>
+</symbol>
+<symbol id="icon-file-pdf" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M16.6011696,10.8421053 C15.8401559,10.0935673 13.6693957,10.2994152 12.5840156,10.4366472 C11.5111111,9.78167641 10.7937622,8.87719298 10.288499,7.54853801 C10.5317739,6.54424951 10.9185185,5.01598441 10.6253411,4.05536062 C10.3633528,2.42105263 8.26744639,2.58323587 7.96803119,3.68732943 C7.69356725,4.69161793 7.94307992,6.08888889 8.40467836,7.87290448 C7.78089669,9.36374269 6.85146199,11.3660819 6.19649123,12.5138402 C4.94892788,13.1563353 3.26471735,14.1481481 3.01520468,15.3957115 C2.80935673,16.3812865 4.63703704,18.8389864 7.76218324,13.4495127 C9.15945419,12.9879142 10.6814815,12.4202729 12.0288499,12.1957115 C13.2077973,12.8319688 14.5863548,13.2561404 15.5095517,13.2561404 C17.1001949,13.2561404 17.2561404,11.497076 16.6011696,10.8421053 Z M4.24405458,15.6951267 C4.56218324,14.8405458 5.77231969,13.8549708 6.14035088,13.5118908 C4.95516569,15.4019493 4.24405458,15.7387914 4.24405458,15.6951267 Z M9.33411306,3.80584795 C9.7957115,3.80584795 9.75204678,5.80818713 9.44639376,6.35087719 C9.17192982,5.48382066 9.17816764,3.80584795 9.33411306,3.80584795 Z M7.81208577,12.3267057 C8.417154,11.2725146 8.93489279,10.0187135 9.35282651,8.91461988 C9.8705653,9.85653021 10.5317739,10.611306 11.2304094,11.1290448 C9.93294347,11.397271 8.80389864,11.9461988 7.81208577,12.3267057 Z M16.0210526,12.0148148 C16.0210526,12.0148148 15.7091618,12.3890838 13.694347,11.5282651 C15.8838207,11.3660819 16.245614,11.8651072 16.0210526,12.0148148 Z"/>
+</symbol>
+<symbol id="icon-file-sheets" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M4,7 L7,7 L7,5 L4,5 L4,7 Z M4,9 L4,11 L7,11 L7,9 L4,9 Z M4,13 L4,15 L7,15 L7,13 L4,13 Z M9,15 L16,15 L16,13 L9,13 L9,15 Z M16,11 L16,9 L9,9 L9,11 L16,11 Z M16,7 L16,5 L9,5 L9,7 L16,7 Z M4,3 L16,3 C17.1045695,3 18,3.8954305 18,5 L18,15 C18,16.1045695 17.1045695,17 16,17 L4,17 C2.8954305,17 2,16.1045695 2,15 L2,5 C2,3.8954305 2.8954305,3 4,3 Z"/>
+</symbol>
+<symbol id="icon-files-audio" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M16.9948918,2.94434783 C16.9897835,2.88 16.9778643,2.81565217 16.959134,2.75478261 C16.9574313,2.74086957 16.952323,2.72521739 16.945512,2.71130435 C16.9472148,2.70956522 16.9472148,2.70956522 16.945512,2.70782609 C16.9404038,2.69043478 16.9335928,2.67130435 16.9267818,2.65391304 C16.9250791,2.65043478 16.9233763,2.64695652 16.9216736,2.64347826 C16.9114571,2.61565217 16.8978351,2.58782609 16.8842131,2.56 C16.8671856,2.52869565 16.8501581,2.4973913 16.8297251,2.46608696 C16.8144004,2.44173913 16.7973729,2.41913043 16.7803454,2.39652174 C16.7718317,2.38608696 16.7633179,2.37565217 16.7548042,2.36521739 C16.7462904,2.35304348 16.7360739,2.34086957 16.7241547,2.33043478 C16.7105327,2.31652174 16.6969107,2.3026087 16.6832887,2.28869565 C16.667964,2.27304348 16.6526393,2.25913043 16.6356118,2.24521739 C16.620287,2.23130435 16.6032595,2.21913043 16.5862321,2.20695652 C16.5777183,2.19826087 16.5692046,2.19130435 16.5606908,2.18782609 C16.5521771,2.18086957 16.5419606,2.17391304 16.5334468,2.16869565 C16.5334468,2.16869565 16.5317441,2.16521739 16.5300414,2.16695652 C16.5164194,2.15652174 16.5027974,2.14608696 16.4874726,2.13913043 C16.4857699,2.1373913 16.4823644,2.13565217 16.4806616,2.13565217 C16.4619314,2.12521739 16.4432012,2.11478261 16.4244709,2.10608696 C16.3887132,2.08695652 16.34955,2.07130435 16.3103868,2.0573913 C16.2967648,2.05217391 16.2831428,2.04869565 16.2695208,2.04347826 C16.2167356,2.02608696 16.1605449,2.01565217 16.1043542,2.00869565 C16.0924349,2.00695652 16.0788129,2.00521739 16.065191,2.00521739 C16.037947,2.00173913 16.0072975,2 15.9783508,2 C15.942593,2 15.9085381,2.00173913 15.8744831,2.00521739 C15.8455364,2.00869565 15.8182924,2.01217391 15.7910484,2.0173913 C15.7706154,2.02086957 15.7501824,2.02608696 15.7297495,2.03130435 L7.90902457,4.03304348 C7.89029433,4.03826087 7.8715641,4.04173913 7.85283386,4.04869565 C7.83069813,4.05391304 7.80856239,4.06086957 7.78812941,4.06782609 C7.78131841,4.06956522 7.77621017,4.07130435 7.77280467,4.07304348 C7.74896619,4.08173913 7.72512771,4.09217391 7.70128922,4.1026087 C7.59401605,4.15130435 7.49695938,4.2173913 7.41352469,4.29913043 C7.39479445,4.31652174 7.37606422,4.33565217 7.36073948,4.35478261 C7.34541474,4.37217391 7.33009,4.38956522 7.31646801,4.40695652 C7.30284602,4.4226087 7.28922403,4.44 7.27900754,4.45913043 C7.23984432,4.51478261 7.20578935,4.57391304 7.18024811,4.63826087 C7.16832887,4.66434783 7.15811238,4.69043478 7.14959864,4.71826087 C7.13938215,4.74434783 7.13257115,4.77217391 7.12576016,4.8 C7.11894916,4.8226087 7.11384091,4.84521739 7.11043542,4.86782609 C7.10702992,4.88695652 7.10362442,4.90782609 7.10192167,4.92695652 C7.09681343,4.96869565 7.09340793,5.01217391 7.09340793,5.05565217 L7.09340793,11.9113043 C6.77329117,11.7930435 6.42763318,11.7304348 6.0683532,11.7304348 C4.37582097,11.7304348 3,13.1373913 3,14.866087 C3,16.5947826 4.37582097,18 6.0683532,18 C7.72512771,18 9.07540744,16.6521739 9.13159815,14.9721739 C9.13500365,14.9373913 9.1367064,14.9026087 9.1367064,14.866087 L9.1367064,5.86956522 L14.9567015,4.38086957 L14.9567015,9.89913043 C14.6365848,9.78086957 14.2909268,9.71826087 13.9316468,9.71826087 C12.2391146,9.71826087 10.8632936,11.1252174 10.8632936,12.8521739 C10.8632936,14.5808696 12.2391146,15.9878261 13.9316468,15.9878261 C15.5887619,15.9878261 16.938701,14.6382609 16.9947215,12.9594783 C16.9982973,12.9241739 17,12.8885217 17,12.8521739 L17,3.04347826 C17,3.01043478 16.9982973,2.97565217 16.9948918,2.94434783 Z"/>
+</symbol>
+<symbol id="icon-files-video" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M14.8900591,8.11919475 C15.4026183,7.94519228 15.9372288,8.02000212 16.3502535,8.33339955 C16.7650937,8.64849115 17,9.15964973 17,9.72570467 L17,13.457467 C17,14.0227392 16.7648414,14.5331979 16.3501607,14.8490117 C16.0844743,15.0504997 15.7663574,15.1551197 15.4321591,15.1551197 C15.2502252,15.1551197 15.0673908,15.1245457 14.8892982,15.0639886 L13.0227273,13.6912005 L13.0227273,15 C13.0227273,15.5522847 12.575012,16 12.0227273,16 L4,16 C3.44771525,16 3,15.5522847 3,15 L3,8.18483314 C3,7.63254839 3.44771525,7.18483314 4,7.18483314 L12.0227273,7.18483314 C12.575012,7.18483314 13.0227273,7.63254839 13.0227273,8.18483314 L13.0227273,9.53782884 L14.8900591,8.11919475 Z M5.98855682,4 L10.0340114,4 C10.5862961,4 11.0340114,4.44771525 11.0340114,5 L11.0340114,5.16910759 C11.0340114,5.72139234 10.5862961,6.16910759 10.0340114,6.16910759 L5.98855682,6.16910759 C5.43627207,6.16910759 4.98855682,5.72139234 4.98855682,5.16910759 L4.98855682,5 C4.98855682,4.44771525 5.43627207,4 5.98855682,4 Z"/>
+</symbol>
+<symbol id="icon-files-zip" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M9.98571429,13.4285714 L11.2714286,13.4285714 C11.8237133,13.4285714 12.2714286,13.8762867 12.2714286,14.4285714 L12.2714286,17 C12.2714286,17.5522847 11.8237133,18 11.2714286,18 L8.7,18 C8.14771525,18 7.7,17.5522847 7.7,17 L7.7,13.4285714 L7.7,11.6428571 C7.7,11.3667148 7.92385763,11.1428571 8.2,11.1428571 L9.98571429,11.1428571 L9.98571429,13.4285714 Z M8.2,4.28571429 C7.92385763,4.28571429 7.7,4.06185666 7.7,3.78571429 L7.7,2.5 C7.7,2.22385763 7.92385763,2 8.2,2 L9.48571429,2 C9.76185666,2 9.98571429,2.22385763 9.98571429,2.5 L9.98571429,4.28571429 L8.2,4.28571429 Z M9.98571429,6.57142857 L9.98571429,4.28571429 L11.7714286,4.28571429 C12.0475709,4.28571429 12.2714286,4.50957191 12.2714286,4.78571429 L12.2714286,6.07142857 C12.2714286,6.34757095 12.0475709,6.57142857 11.7714286,6.57142857 L9.98571429,6.57142857 Z M8.2,8.85714286 C7.92385763,8.85714286 7.7,8.63328523 7.7,8.35714286 L7.7,7.07142857 C7.7,6.7952862 7.92385763,6.57142857 8.2,6.57142857 L9.98571429,6.57142857 L9.98571429,8.85714286 L8.2,8.85714286 Z M9.98571429,11.1428571 L9.98571429,8.85714286 L11.7714286,8.85714286 C12.0475709,8.85714286 12.2714286,9.08100048 12.2714286,9.35714286 L12.2714286,10.6428571 C12.2714286,10.9189995 12.0475709,11.1428571 11.7714286,11.1428571 L9.98571429,11.1428571 Z M9.34285714,16.8571429 L10.6285714,16.8571429 C10.9047138,16.8571429 11.1285714,16.6332852 11.1285714,16.3571429 L11.1285714,15.0714286 C11.1285714,14.7952862 10.9047138,14.5714286 10.6285714,14.5714286 L9.34285714,14.5714286 C9.06671477,14.5714286 8.84285714,14.7952862 8.84285714,15.0714286 L8.84285714,16.3571429 C8.84285714,16.6332852 9.06671477,16.8571429 9.34285714,16.8571429 Z"/>
+</symbol>
+<symbol id="icon-flag" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M12.6851335,6.2699585 L15.464534,8.77519774 C15.8866745,9.15569817 15.9035988,9.78865973 15.5023353,10.188957 C15.3032516,10.3875613 15.0269462,10.5 14.7379822,10.5 L5.5818516,10.5 L5.5818516,17.25 C5.5818516,17.6642136 5.22774206,18 4.7909258,18 C4.35410954,18 4,17.6642136 4,17.25 L4,3 C4,2.44771525 4.47214606,2 5.05456773,2 L15.0729612,2 C15.5849506,2 16,2.39357302 16,2.87906994 C16,3.11851309 15.8969971,3.34759529 15.7147961,3.51337364 L12.6851335,6.2699585 Z M12.9121059,3.5 L5.5818516,3.5 L5.5818516,9 L12.8684774,9 C12.9849618,9 13.079391,8.91045695 13.079391,8.8 C13.079391,8.74571612 13.0561213,8.69376406 13.0149248,8.65607214 L10.8002267,6.62977814 C10.59066,6.4380392 10.5846894,6.12150734 10.7868911,5.92278444 C10.7912564,5.91849419 10.7957024,5.91427832 10.8002267,5.91013886 L13.0585533,3.84392786 C13.14238,3.76723228 13.1447682,3.64061954 13.0638876,3.56113038 C13.0241389,3.52206556 12.9693519,3.5 12.9121059,3.5 Z"/>
+</symbol>
+<symbol id="icon-folder" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M7.325376,4.5 L4,4.5 C3.72385763,4.5 3.5,4.72385763 3.5,5 L3.5,15 C3.5,15.2761424 3.72385763,15.5 4,15.5 L16,15.5 C16.2761424,15.5 16.5,15.2761424 16.5,15 L16.5,7 C16.5,6.72385763 16.2761424,6.5 16,6.5 L9.316214,6.5 L7.700244,4.66913179 C7.60533058,4.56159644 7.46880685,4.5 7.325376,4.5 Z M9.992979,5 L17,5 C17.5522847,5 18,5.44771525 18,6 L18,16 C18,16.5522847 17.5522847,17 17,17 L3,17 C2.44771525,17 2,16.5522847 2,16 L2,4 C2,3.44771525 2.44771525,3 3,3 L7.776552,3 C8.0634137,3 8.33646216,3.12319287 8.526289,3.33826358 L9.992979,5 Z"/>
+</symbol>
+<symbol id="icon-game" viewBox="0 0 20 20" fill="currentColor">
+  <path fill-rule="evenodd" d="M10 20C15.5229 20 20 15.5228 20 10C20 4.47715 15.5229 0 10 0C4.47716 0 7.62939e-06 4.47715 7.62939e-06 10C7.62939e-06 15.5228 4.47716 20 10 20ZM16.3276 14.8957C17.203 13.7658 17.7825 12.3952 17.9499 10.9H14.9439C15.0872 12.3612 15.5759 13.7203 16.3276 14.8957ZM15.042 16.2115C13.8851 17.1517 12.4604 17.7752 10.9 17.9499V10.9H13.1367C13.2973 12.8635 13.9787 14.6807 15.042 16.2115ZM14.9439 9.1H17.9499C17.7825 7.60479 17.203 6.23416 16.3276 5.10434C15.5759 6.27969 15.0872 7.63879 14.9439 9.1ZM15.042 3.7885C13.9787 5.31935 13.2973 7.13646 13.1367 9.1H10.9V2.05006C12.4604 2.22475 13.8851 2.84826 15.042 3.7885ZM9.10001 17.9499C7.53945 17.7752 6.1146 17.1516 4.9576 16.2111C6.02095 14.6803 6.70261 12.8633 6.86331 10.9H9.10001V17.9499ZM5.05607 10.9C4.91267 12.3612 4.42373 13.72 3.67202 14.8952C2.79682 13.7654 2.21744 12.395 2.05007 10.9H5.05607ZM9.10001 9.1H6.86333C6.70272 7.13674 6.02142 5.31947 4.95804 3.7885C6.11496 2.84826 7.53965 2.22475 9.10001 2.05006V9.1ZM5.0561 9.1C4.91278 7.63858 4.42402 6.2796 3.67238 5.10437C2.79698 6.23418 2.21747 7.6048 2.05007 9.1H5.0561Z"/>
+</symbol>
+<symbol id="icon-github" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M7.26894971,14.8834111 C7.26894971,14.9490684 7.19284523,15.001959 7.09565157,15.001959 C6.98562101,15.0119899 6.90951653,14.9590994 6.90951653,14.8834111 C6.90951653,14.816842 6.98653793,14.7648633 7.08281467,14.7648633 C7.1827591,14.7539205 7.26894971,14.806811 7.26894971,14.8834111 Z M6.23466241,14.7347704 C6.21082245,14.8004277 6.27775771,14.8770278 6.37770214,14.8961778 C6.46389275,14.9299184 6.56383718,14.8961778 6.58400945,14.8305206 C6.6032648,14.7639514 6.53999722,14.6882632 6.44096971,14.6581703 C6.35386218,14.6353727 6.25758544,14.6682013 6.23466241,14.7347704 Z M7.70448736,14.6782322 C7.60821061,14.7010299 7.54219228,14.7639514 7.55136149,14.8405516 C7.56144762,14.9062088 7.64855515,14.9499803 7.74758266,14.9262707 C7.84477633,14.9034731 7.91079467,14.8405516 7.90070853,14.7739824 C7.89153932,14.7110609 7.80168102,14.6682013 7.70448736,14.6782322 Z M9.89409558,2 C5.27923034,2 1.75,5.48348178 1.75,10.0731058 C1.75,13.7417045 4.0716449,16.8813977 7.38906641,17.986628 C7.81451792,18.0623162 7.9639761,17.8015111 7.9639761,17.5863012 C7.9639761,17.3811223 7.95480689,16.2494467 7.95480689,15.5545741 C7.95480689,15.5545741 5.62582662,16.051563 5.13619061,14.5697154 C5.13619061,14.5697154 4.75750208,13.6058305 4.21193387,13.357792 C4.21193387,13.357792 3.44997221,12.8380055 4.26511531,12.8489484 C4.26511531,12.8489484 5.0930953,12.9146056 5.54880522,13.7024926 C6.27775771,14.9791613 7.49818005,14.6116631 7.97406224,14.3937175 C8.05108363,13.8648119 8.26747708,13.4973137 8.50587663,13.2784562 C6.64727702,13.0732773 4.77033898,12.8051769 4.77033898,9.62262413 C4.77033898,8.71254172 5.02340928,8.25658861 5.55614059,7.67388053 C5.46903306,7.45867066 5.18662128,6.57229781 5.6423312,5.4278555 C6.3373576,5.21264563 7.93738538,6.3215236 7.93738538,6.3215236 C8.61789979,6.13383695 9.32085186,6.03874118 10.0270492,6.03883267 C10.7329655,6.0384409 11.4356553,6.13354292 12.1157961,6.3215236 C12.1157961,6.3215236 13.7158238,5.208998 14.4117672,5.4278555 C14.8674771,6.57594544 14.5841484,7.45867066 14.4979578,7.67388053 C15.0297722,8.25932433 15.3561962,8.71618935 15.3561962,9.62262413 C15.3561962,12.8152078 13.3967352,13.0696297 11.5372187,13.2793681 C11.8434704,13.5401733 12.1029592,14.0362503 12.1029592,14.8141063 C12.1029592,15.9284557 12.092873,17.3081698 12.092873,17.5799178 C12.092873,17.7951277 12.2459989,18.0559329 12.6677827,17.9802447 C15.9952904,16.8813977 18.25,13.7417045 18.25,10.0731058 C18.25,5.48348178 14.5080439,2 9.89409558,2 Z M4.98398166,13.4106826 C4.93996944,13.4444231 4.95005557,13.5201113 5.0069047,13.5830329 C5.06008614,13.6359234 5.13619061,13.6587211 5.18020283,13.6158615 C5.22329814,13.5830329 5.213212,13.5064327 5.15636288,13.4444231 C5.10318144,13.3915326 5.02707697,13.367823 4.98398166,13.4106826 Z M4.62454849,13.1425822 C4.60070853,13.1863537 4.6337177,13.2392442 4.70065296,13.2720728 C4.7538344,13.3049015 4.81985274,13.2948705 4.84369269,13.2492752 C4.86753265,13.2055037 4.83452348,13.1526131 4.76758822,13.1197845 C4.70065296,13.0997226 4.64838844,13.1106654 4.62454849,13.1425822 Z M5.70193109,14.320765 C5.64874965,14.3636246 5.66892192,14.4630224 5.7450264,14.5259439 C5.82204779,14.6016321 5.91832453,14.6116631 5.96141984,14.5587725 C6.00451514,14.5159129 5.98525979,14.4165152 5.91832453,14.3535936 C5.84497083,14.2779054 5.7450264,14.2678744 5.70193109,14.320765 Z M5.32324257,13.834719 C5.27006113,13.8675476 5.27006113,13.9532668 5.32324257,14.0298669 C5.37642401,14.1055551 5.4662823,14.1392957 5.5093776,14.1055551 C5.56255904,14.0626955 5.56255904,13.9769764 5.5093776,13.9003762 C5.46261462,13.824688 5.37642401,13.7909475 5.32324257,13.834719 Z"/>
+</symbol>
+<symbol id="icon-gitlab" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M2.93066667,8.13558824 L9.99733333,17.2529412 L2.25244444,11.5458824 C2.03934428,11.3888873 1.94979809,11.1151413 2.02933333,10.8638235 L2.93066667,8.13558824 Z M5.28622222,2.71441176 C5.24175306,2.59079107 5.1237933,2.50826874 4.99155556,2.50826874 C4.85931781,2.50826874 4.74135805,2.59079107 4.69688889,2.71441176 L2.93066667,8.13558824 L7.05333333,8.13558824 L5.28622222,2.71441176 Z M7.05333333,8.13558824 L9.99822222,17.2529412 L12.9422222,8.13558824 L7.05333333,8.13558824 Z M17.9671111,10.8638235 L17.0657778,8.13558824 L9.99822222,17.2529412 L17.744,11.5458824 C17.956773,11.3886559 18.0459484,11.1149531 17.9662222,10.8638235 L17.9671111,10.8638235 Z M15.2977778,2.71441176 C15.2533086,2.59079107 15.1353489,2.50826874 15.0031111,2.50826874 C14.8708734,2.50826874 14.7529136,2.59079107 14.7084444,2.71441176 L12.9422222,8.13558824 L17.0648889,8.13558824 L15.2977778,2.71441176 Z"/>
+</symbol>
+<symbol id="icon-google" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M18,10.1866641 C18,14.751996 14.8225871,17.999995 10.1310019,17.999995 C7.97379233,18.0023573 5.9042462,17.1602614 4.37886773,15.6594585 C2.85348926,14.1586555 1.99760413,12.1224521 2.00000504,9.99999752 C2.00000504,5.57422112 5.63275375,2 10.1310019,2 C12.3209504,2 14.1639764,2.79111087 15.583287,4.09333268 L13.369849,6.18666537 C10.4752141,3.43999955 5.09159074,5.50311003 5.09159074,9.99999752 C5.09159074,12.7911078 7.35742853,15.0515515 10.1310019,15.0515515 C13.3508767,15.0515515 14.557878,12.7804411 14.7476012,11.6026637 L10.1310019,11.6026637 L10.1310019,8.85244232 L17.8717109,8.85244232 C17.9476002,9.26221997 18,9.65599763 18,10.187553 L18,10.1866641 Z"/>
+</symbol>
+<symbol id="icon-hand-pointer" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M14.2417329,7.77795608 C15.5093053,7.17491936 17,8.11224385 17,9.55243827 L17,12.2376252 C16.9999974,12.3876984 16.9829142,12.537282 16.9490818,12.6834766 L16.0688149,16.4874882 C15.8640008,17.3726073 15.0812798,18 14.181334,18 L8.45952151,18 C7.83900313,18 7.25183819,17.6967378 6.88839688,17.1886932 L3.36773318,12.2658589 C2.74327173,11.3928142 2.93292113,10.1753167 3.79391704,9.53856332 C4.40742498,9.08489233 5.21048892,9.0412048 5.86092997,9.39713504 L5.86092997,3.95833333 C5.86092997,2.87862304 6.73022656,2 7.79932897,2 C8.86842603,2 9.73769716,2.87861762 9.73769716,3.95833333 L9.73769716,6.53666154 C10.4505838,6.35106463 11.214621,6.59062057 11.6995587,7.16957508 C12.5709429,6.67805728 13.6757773,6.94064257 14.2417329,7.77795608 Z M4.49699968,10.5017767 C4.1443559,10.7543267 4.0493934,11.1845078 4.32907285,11.5755621 L7.85010469,16.4983942 C7.99186119,16.6965482 8.21988702,16.8148148 8.45952151,16.8148148 L14.1813648,16.8148148 C14.5329833,16.8148148 14.8351112,16.5707105 14.9162919,16.2198863 L15.7966142,12.4158704 C15.8100939,12.3575472 15.8169342,12.2975819 15.8169342,12.2376543 L15.8169342,9.55246914 C15.8169342,9.09105778 15.4938898,8.7925649 15.0598857,8.76626347 C14.6386429,8.74073539 14.3108164,8.98424317 14.306354,9.38263365 C14.3061394,9.40674968 14.3061394,9.40674968 14.3060216,9.44382653 C14.305333,9.69494305 14.1019281,9.89814815 13.8512531,9.89814815 C13.5999044,9.89814815 13.3961461,9.69403007 13.3961461,9.44223765 L13.3961461,8.88117284 C13.3961461,8.40907017 13.0689999,8.11445155 12.6409098,8.11467205 C12.2128904,8.11489252 11.885572,8.40977866 11.885572,8.88117284 L11.885572,9.44226852 C11.885572,9.69404389 11.6818275,9.89814815 11.4304958,9.89814815 C11.1791641,9.89814815 10.9754195,9.69404389 10.9754195,9.44226852 L10.9754195,8.43364198 C10.9754195,7.96151327 10.6482777,7.66689751 10.2201859,7.66712962 C9.79216869,7.66736168 9.46484551,7.96225904 9.46484551,8.43364198 L9.46484551,9.44222222 C9.46484551,9.69402316 9.26108024,9.89814815 9.00972305,9.89814815 C8.75836585,9.89814815 8.55460058,9.69402316 8.55460058,9.44222222 L8.55460058,3.95833333 C8.55460058,3.48620418 8.22746511,3.19158887 7.79938233,3.19182097 C7.37137414,3.19205304 7.04405736,3.48694996 7.04405736,3.95833333 L7.04405736,11.442948 C7.04405736,11.6259358 6.92611473,11.7879886 6.75220282,11.8439554 C6.57829131,11.899922 6.38820335,11.8370024 6.28181408,11.6882553 L5.54786469,10.6620917 C5.28463659,10.2940918 4.84633607,10.2515955 4.49699968,10.5017767 Z M8.55456977,14.1181481 L8.55456977,12.147284 C8.55456977,11.895483 8.75833504,11.691358 9.00969224,11.691358 C9.26104943,11.691358 9.4648147,11.895483 9.4648147,12.147284 L9.4648147,14.1181481 C9.4648147,14.3699491 9.26104943,14.5740741 9.00969224,14.5740741 C8.75833504,14.5740741 8.55456977,14.3699491 8.55456977,14.1181481 Z M11.430465,11.691358 C11.6818137,11.691358 11.885572,11.8954761 11.885572,12.1472685 L11.885572,14.1181636 C11.885572,14.369956 11.6818137,14.5740741 11.430465,14.5740741 C11.1791163,14.5740741 10.9753579,14.369956 10.9753579,14.1181636 L10.9753579,12.1472685 C10.9753579,11.8954761 11.1791163,11.691358 11.430465,11.691358 Z M13.3961461,12.1472685 C13.3961461,11.8954761 13.5999044,11.691358 13.8512531,11.691358 C14.1026018,11.691358 14.3063602,11.8954761 14.3063602,12.1472685 L14.3063602,14.1181636 C14.3063602,14.369956 14.1026018,14.5740741 13.8512531,14.5740741 C13.5999044,14.5740741 13.3961461,14.369956 13.3961461,14.1181636 L13.3961461,12.1472685 Z"/>
+</symbol>
+<symbol id="icon-hashtag" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M5.71428571,12.5714286 L5.71428571,7.42857143 L2.85714286,7.42857143 C2.38375593,7.42857143 2,7.0448155 2,6.57142857 L2,6.57142857 C2,6.09804164 2.38375593,5.71428571 2.85714286,5.71428571 L5.71428571,5.71428571 L5.71428571,2.85714286 C5.71428571,2.38375593 6.09804164,2 6.57142857,2 L6.57142857,2 C7.0448155,2 7.42857143,2.38375593 7.42857143,2.85714286 L7.42857143,5.71428571 L12.5714286,5.71428571 L12.5714286,2.85714286 C12.5714286,2.38375593 12.9551845,2 13.4285714,2 L13.4285714,2 C13.9019584,2 14.2857143,2.38375593 14.2857143,2.85714286 L14.2857143,5.71428571 L17.1428571,5.71428571 C17.6162441,5.71428571 18,6.09804164 18,6.57142857 L18,6.57142857 C18,7.0448155 17.6162441,7.42857143 17.1428571,7.42857143 L14.2857143,7.42857143 L14.2857143,12.5714286 L17.1428571,12.5714286 C17.6162441,12.5714286 18,12.9551845 18,13.4285714 L18,13.4285714 C18,13.9019584 17.6162441,14.2857143 17.1428571,14.2857143 L14.2857143,14.2857143 L14.2857143,17.1428571 C14.2857143,17.6162441 13.9019584,18 13.4285714,18 L13.4285714,18 C12.9551845,18 12.5714286,17.6162441 12.5714286,17.1428571 L12.5714286,14.2857143 L7.42857143,14.2857143 L7.42857143,17.1428571 C7.42857143,17.6162441 7.0448155,18 6.57142857,18 L6.57142857,18 C6.09804164,18 5.71428571,17.6162441 5.71428571,17.1428571 L5.71428571,14.2857143 L2.85714286,14.2857143 C2.38375593,14.2857143 2,13.9019584 2,13.4285714 L2,13.4285714 C2,12.9551845 2.38375593,12.5714286 2.85714286,12.5714286 L5.71428571,12.5714286 Z M7.42857143,12.5714286 L12.5714286,12.5714286 L12.5714286,7.42857143 L7.42857143,7.42857143 L7.42857143,12.5714286 Z"/>
+</symbol>
+<symbol id="icon-help" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M10.6195556,16.728 L10.6195556,14.2462222 C11.68,14.0924444 12.6062222,13.5546667 13.2702222,12.7742222 L15.3715556,14.0871111 C14.2533333,15.5528889 12.5564444,16.5511111 10.6195556,16.728 M3.25955556,10.3848889 L5.73688889,10.4711111 C5.86666667,11.6444444 6.46044444,12.6684444 7.34133333,13.3653333 L6.10133333,15.512 C4.472,14.3564444 3.37866667,12.5004444 3.25955556,10.3848889 M9.37955556,3.27111111 L9.37955556,5.75288889 C8.31911111,5.90755556 7.39288889,6.44444444 6.72888889,7.22488889 L4.62844444,5.91288889 C5.74666667,4.44711111 7.44355556,3.44888889 9.37955556,3.27111111 M16.7377778,9.57066667 L14.2586667,9.48355556 C14.1182222,8.32888889 13.5271111,7.32088889 12.6586667,6.63377778 L13.8977778,4.48711111 C15.5164444,5.63466667 16.6044444,7.47288889 16.7377778,9.57066667 M14.2284444,10.8115556 L16.6924444,10.8977778 C16.5911111,11.6586667 16.3635556,12.3777778 16.0302222,13.0373333 L13.9404444,11.7315556 C14.0693333,11.44 14.1662222,11.1324444 14.2284444,10.8115556 M10.6195556,5.75288889 L10.6195556,3.27111111 C11.4017778,3.34222222 12.1431111,3.55111111 12.8248889,3.86666667 L11.592,6.00266667 C11.2844444,5.88 10.9573333,5.80177778 10.6195556,5.75288889 M5.76711111,9.23111111 L3.30044444,9.14488889 C3.39911111,8.36888889 3.62933333,7.63466667 3.96977778,6.96266667 L6.05866667,8.26755556 C5.92444444,8.57244444 5.82755556,8.89511111 5.76711111,9.23111111 M10,13.0693333 C8.30577778,13.0693333 6.92977778,11.6924444 6.92977778,10 C6.92977778,8.30666667 8.30577778,6.92977778 10,6.92977778 C11.6933333,6.92977778 13.0702222,8.30666667 13.0702222,10 C13.0702222,11.6924444 11.6933333,13.0693333 10,13.0693333 M9.37955556,14.2462222 L9.37955556,16.728 C8.59822222,16.6568889 7.85688889,16.4488889 7.17422222,16.1324444 L8.408,13.9964444 C8.71466667,14.1191111 9.04266667,14.1973333 9.37955556,14.2462222 M10,2 C5.58933333,2 2,5.58844444 2,10 C2,14.4106667 5.58933333,18 10,18 C14.4106667,18 18,14.4106667 18,10 C18,5.58844444 14.4106667,2 10,2"/>
+</symbol>
+<symbol id="icon-hubot" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M5.42895234,7.66636423 C4.79816416,7.66835922 4.28743215,8.19014656 4.28596823,8.83408944 L4.28596823,11.1677252 C4.28792007,11.8113138 4.7985099,12.3325505 5.42895234,12.3345431 L14.5710477,12.3345431 C15.2021819,12.332546 15.7130563,11.8102077 15.7140318,11.1659106 L15.7140318,8.83318211 C15.7120799,8.18959354 15.2014901,7.66835677 14.5710477,7.66636423 L5.42895234,7.66636423 Z M14.5710477,9.70784187 L13.1427619,11.1668179 L11.4282857,11.1668179 L10,9.70874919 L8.57171425,11.1659106 L6.85634929,11.1659106 L5.42984113,9.70874919 L5.42984113,8.83318211 L6.28663482,8.83318211 L7.71492056,10.2912508 L9.14231752,8.83408944 L10.8576825,8.83408944 L12.2859682,10.2921581 L13.714254,8.83408944 L14.5710477,8.83408944 L14.5710477,9.70965651 L14.5710477,9.70784187 Z M7.71403177,13.5004537 L12.2859682,13.5004537 L12.2859682,14.6663642 L7.71403177,14.6663642 L7.71403177,13.5004537 Z M10,3 C5.58893456,3 2,6.39520415 2,10.5834089 L2,15.8331821 C2.00195185,16.4767707 2.51254167,16.9980075 3.14298411,17 L16.8570159,17 C17.4874583,16.9980075 17.9980482,16.4767707 18,15.8331821 L18,10.5834089 C18,6.39520415 14.4110654,3 9.99911121,3 L10,3 Z M16.8570159,15.8331821 L3.14298411,15.8331821 L3.14298411,10.5834089 C3.14298411,6.97861309 6.15953783,4.06156837 9.99911121,4.06156837 C13.8386846,4.06156837 16.8561271,6.97861309 16.8561271,10.5834089 L16.8561271,15.8331821 L16.8570159,15.8331821 Z"/>
+</symbol>
+<symbol id="icon-import" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M10,2 L10,2 C10.4008518,2 10.7258065,2.32495462 10.7258065,2.72580645 L10.7258065,11.5033349 L12.1862908,10.0019872 C12.4668767,9.71355074 12.9281605,9.70718658 13.2165969,9.98777246 C13.2214003,9.99244512 13.226139,9.99718382 13.2308117,10.0019872 L13.2308117,10.0019872 C13.5215499,10.3008601 13.5215499,10.7768601 13.2308117,11.075733 L10.7062335,13.6709471 C10.3211338,14.0668216 9.68802903,14.0755563 9.29215449,13.6904566 C9.28556191,13.6840434 9.27905812,13.6775396 9.27264497,13.6709471 L6.74806678,11.075733 C6.45732857,10.7768601 6.45732857,10.3008601 6.74806678,10.0019872 L6.74806678,10.0019872 C7.02865266,9.71355074 7.48993642,9.70718658 7.77837288,9.98777246 C7.78317628,9.99244512 7.78791498,9.99718382 7.79258763,10.0019872 L9.27419355,11.5250474 L9.27419355,2.72580645 C9.27419355,2.32495462 9.59914817,2 10,2 Z M13.5,5.89637306 L13.5,4.40414508 L16.5,4.40414508 C17.0522847,4.40414508 17.5,4.85186033 17.5,5.40414508 L17.5,17 C17.5,17.5522847 17.0522847,18 16.5,18 L3.5,18 C2.94771525,18 2.5,17.5522847 2.5,17 L2.5,5.40414508 C2.5,4.85186033 2.94771525,4.40414508 3.5,4.40414508 L6.5,4.40414508 L6.5,5.89637306 L3.9516129,5.89637306 L3.9516129,16.507772 L16.0483871,16.507772 L16.0483871,5.89637306 L13.5,5.89637306 Z"/>
+</symbol>
+<symbol id="icon-info-circled" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M10,18 C5.58217143,18 2,14.4178286 2,10 C2,5.58125714 5.58217143,2 10,2 C14.4187429,2 18,5.58125714 18,10 C18,14.4178286 14.4187429,18 10,18 Z M10,16.6285714 C13.6608,16.6285714 16.6285714,13.6608 16.6285714,10 C16.6285714,6.3392 13.6608,3.37142857 10,3.37142857 C6.3392,3.37142857 3.37142857,6.3392 3.37142857,10 C3.37142857,13.6608 6.3392,16.6285714 10,16.6285714 Z M10.0008229,7.38395429 C9.52905143,7.38395429 9.17339429,7.01915429 9.17339429,6.53366857 C9.17339429,6.04726857 9.52905143,5.67972571 10.0008229,5.67972571 C10.4725943,5.67972571 10.8273371,6.04726857 10.8273371,6.53366857 C10.8273371,7.01915429 10.4725943,7.38395429 10.0008229,7.38395429 Z M10.0223086,14.3197257 C9.61088,14.3197257 9.27533714,13.9850971 9.27533714,13.5736686 L9.27533714,8.87241143 C9.27533714,8.46098286 9.61088,8.12635429 10.0223086,8.12635429 C10.4337371,8.12635429 10.7683657,8.46098286 10.7683657,8.87241143 L10.7683657,13.5736686 C10.7683657,13.9850971 10.4337371,14.3197257 10.0223086,14.3197257 Z"/>
+</symbol>
+<symbol id="icon-italic" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M10,15 L10,15 C10.3751114,15 10.6791992,14.6959122 10.6791992,14.3208008 L10.6791992,8.76660156 C10.6791992,8.39149019 10.3751114,8.08740234 10,8.08740234 L10,8.08740234 C9.62488863,8.08740234 9.32080078,8.39149019 9.32080078,8.76660156 L9.32080078,14.3208008 C9.32080078,14.6959122 9.62488863,15 10,15 Z M10,6.875 C10.5078125,6.875 10.8823242,6.51318359 10.8823242,6.04345703 C10.8823242,5.56738281 10.5078125,5.20556641 10,5.20556641 C9.4921875,5.20556641 9.11767578,5.56738281 9.11767578,6.04345703 C9.11767578,6.51318359 9.4921875,6.875 10,6.875 Z"/>
+</symbol>
+<symbol id="icon-jump" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M4.0005,8.7785 L4.0005,4.9995 C4.0005,4.44721525 4.44821525,3.9995 5.0005,3.9995 L10.7535,3.9995 C11.3057847,3.9995 11.7535,4.44721525 11.7535,4.9995 L11.7535,15.2825 L14.4092596,12.7317704 C14.7055423,12.4472052 15.1735723,12.4470858 15.47,12.7315 L15.47,12.7315 C15.75137,13.0014667 15.7606142,13.4484134 15.4906475,13.7297834 C15.4840569,13.7366524 15.4773281,13.7433874 15.4704651,13.7499843 L11.7414224,17.3344438 C11.3543692,17.7064901 10.7426012,17.7065209 10.3555104,17.3345137 L6.62558631,13.7499308 C6.3444641,13.4797629 6.3355839,13.0328539 6.60575182,12.7517317 C6.61236379,12.7448517 6.61911457,12.7381064 6.626,12.7315 L6.626,12.7315 C6.92240772,12.447105 7.39042333,12.447281 7.68661714,12.7318987 L10.2525,15.1975 L10.2525,5.4425 L5.5005,5.4425 L5.5005,8.7785 C5.5005,9.19271356 5.16471356,9.5285 4.7505,9.5285 L4.7505,9.5285 C4.33628644,9.5285 4.0005,9.19271356 4.0005,8.7785 Z"/>
+</symbol>
+<symbol id="icon-key" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M16.1582671,16.1583213 L16.1582671,16.1583213 C16.3408718,15.97599 16.4075561,15.7075652 16.331507,15.4609771 L16.2480427,15.1903449 C16.1121717,14.7497844 15.8673112,14.3506398 15.5361442,14.0298862 L11.1521877,9.78378063 C10.9205531,9.5594297 10.8775438,9.20357382 11.0490584,8.93049761 C11.185944,8.71094741 11.3512733,8.26029174 11.3512733,7.35720265 C11.3512733,5.15547858 9.55931701,3.36352229 7.35759294,3.36352229 L7.2393736,3.36530003 C5.1629798,3.4230764 3.42435555,5.16258952 3.36569031,7.24342765 C3.33457996,8.33317885 3.73634794,9.36248707 4.49455166,10.1411347 C5.25186652,10.9215602 6.27050834,11.350883 7.35759294,11.350883 C7.87846912,11.350883 8.33890233,11.2335525 8.77089179,10.9926695 L8.77089179,10.9926695 C9.03733399,10.8434199 9.37055803,10.8898252 9.58608354,11.1061945 L10.810842,12.3357479 L11.5494663,12.3357479 C12.101751,12.3357479 12.5494663,12.7834631 12.5494663,13.3357479 L12.5494663,14.0761499 L12.7236843,14.249479 L13.4640863,14.249479 C14.016371,14.249479 14.4640863,14.6971942 14.4640863,15.249479 L14.4640863,15.989881 L14.5165294,16.0423241 L15.4602836,16.3317504 C15.7071147,16.4074475 15.9755713,16.3407436 16.1582671,16.1583213 Z M17.6204537,15.0143492 L17.6343436,15.0593856 C17.859277,15.7887071 17.6623661,16.5826197 17.1226881,17.1222978 L17.1226881,17.1222978 C16.5829166,17.6620692 15.7890737,17.8594125 15.0593864,17.6352187 L14.2595292,17.3894654 C13.9525826,17.2951572 13.6733908,17.1271385 13.4463333,16.900081 L13.4463333,16.900081 C13.2249409,16.6786886 13.100564,16.3784161 13.100564,16.0653199 L13.100564,15.6121124 L12.8456558,15.6121124 C12.4055691,15.6121124 11.9834849,15.4373925 11.6721544,15.1263465 L11.6721544,15.1263465 C11.3608544,14.8153311 11.185944,14.3933329 11.185944,13.9532894 L11.185944,13.6983813 L11.185944,13.6983813 C10.5833229,13.6983813 10.0054754,13.4585611 9.57994729,13.031855 L8.96022051,12.4104127 C8.46067714,12.6130744 7.92291248,12.7144053 7.35759294,12.7144053 C5.89807298,12.7144053 4.53455069,12.1384194 3.51679774,11.0922227 C2.49993365,10.046026 1.96128012,8.66650405 2.00216802,7.20609523 C2.07949946,4.41416333 4.41455361,2.07999805 7.20648551,2.0026666 L7.35759294,2 C10.3112987,2 12.7139067,4.40349693 12.7139067,7.35720265 C12.7139067,8.07540736 12.6276866,8.66561518 12.4516909,9.14382574 L16.3159639,12.8876091 C16.922775,13.4754996 17.3714516,14.2069875 17.6204537,15.0143492 Z M5.40955157,6.77303913 C5.40955157,6.0201686 6.02020334,5.40951683 6.77307386,5.40951683 C7.52683325,5.40951683 8.13659616,6.0201686 8.13659616,6.77303913 C8.13659616,7.52590965 7.52683325,8.13656142 6.77307386,8.13656142 C6.02020334,8.13656142 5.40955157,7.52590965 5.40955157,6.77303913 Z"/>
+</symbol>
+<symbol id="icon-keyboard" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M16.6666667,4.9 C17.456893,4.9 18.1,5.50291282 18.1,6.25 L18.1,13.75 C18.1,14.4970872 17.456893,15.1 16.6666667,15.1 L3.33333333,15.1 C2.543107,15.1 1.9,14.4970872 1.9,13.75 L1.9,6.25 C1.9,5.50291282 2.543107,4.9 3.33333333,4.9 L16.6666667,4.9 Z M17.0111111,13.75 L17.0111111,6.25 C17.0111111,6.07695698 16.8579126,5.93333333 16.6666667,5.93333333 L3.33333333,5.93333333 C3.14208744,5.93333333 2.98888889,6.07695698 2.98888889,6.25 L2.98888889,13.75 C2.98888889,13.923043 3.14208744,14.0666667 3.33333333,14.0666667 L16.6666667,14.0666667 C16.8579126,14.0666667 17.0111111,13.923043 17.0111111,13.75 Z M6.76666667,10.3125 C6.76666667,10.5418007 6.57125411,10.725 6.33333333,10.725 L5.66666667,10.725 C5.42874589,10.725 5.23333333,10.5418007 5.23333333,10.3125 L5.23333333,9.6875 C5.23333333,9.45819927 5.42874589,9.275 5.66666667,9.275 L6.33333333,9.275 C6.57125411,9.275 6.76666667,9.45819927 6.76666667,9.6875 L6.76666667,10.3125 Z M9.43333333,10.3125 C9.43333333,10.5418007 9.23792078,10.725 9,10.725 L8.33333333,10.725 C8.09541256,10.725 7.9,10.5418007 7.9,10.3125 L7.9,9.6875 C7.9,9.45819927 8.09541256,9.275 8.33333333,9.275 L9,9.275 C9.23792078,9.275 9.43333333,9.45819927 9.43333333,9.6875 L9.43333333,10.3125 Z M12.1,10.3125 C12.1,10.5418007 11.9045874,10.725 11.6666667,10.725 L11,10.725 C10.7620792,10.725 10.5666667,10.5418007 10.5666667,10.3125 L10.5666667,9.6875 C10.5666667,9.45819927 10.7620792,9.275 11,9.275 L11.6666667,9.275 C11.9045874,9.275 12.1,9.45819927 12.1,9.6875 L12.1,10.3125 Z M14.7666667,10.3125 C14.7666667,10.5418007 14.5712541,10.725 14.3333333,10.725 L13.6666667,10.725 C13.4287459,10.725 13.2333333,10.5418007 13.2333333,10.3125 L13.2333333,9.6875 C13.2333333,9.45819927 13.4287459,9.275 13.6666667,9.275 L14.3333333,9.275 C14.5712541,9.275 14.7666667,9.45819927 14.7666667,9.6875 L14.7666667,10.3125 Z M5.43333333,12.3958333 C5.43333333,12.6251341 5.23792078,12.8083333 5,12.8083333 L4.33333333,12.8083333 C4.09541256,12.8083333 3.9,12.6251341 3.9,12.3958333 L3.9,11.7708333 C3.9,11.5415326 4.09541256,11.3583333 4.33333333,11.3583333 L5,11.3583333 C5.23792078,11.3583333 5.43333333,11.5415326 5.43333333,11.7708333 L5.43333333,12.3958333 Z M16.1,12.3958333 C16.1,12.6251341 15.9045874,12.8083333 15.6666667,12.8083333 L15,12.8083333 C14.7620792,12.8083333 14.5666667,12.6251341 14.5666667,12.3958333 L14.5666667,11.7708333 C14.5666667,11.5415326 14.7620792,11.3583333 15,11.3583333 L15.6666667,11.3583333 C15.9045874,11.3583333 16.1,11.5415326 16.1,11.7708333 L16.1,12.3958333 Z M5.43333333,8.22916667 C5.43333333,8.45846739 5.23792078,8.64166667 5,8.64166667 L4.33333333,8.64166667 C4.09541256,8.64166667 3.9,8.45846739 3.9,8.22916667 L3.9,7.60416667 C3.9,7.37486594 4.09541256,7.19166667 4.33333333,7.19166667 L5,7.19166667 C5.23792078,7.19166667 5.43333333,7.37486594 5.43333333,7.60416667 L5.43333333,8.22916667 Z M8.1,8.22916667 C8.1,8.45846739 7.90458744,8.64166667 7.66666667,8.64166667 L7,8.64166667 C6.76207922,8.64166667 6.56666667,8.45846739 6.56666667,8.22916667 L6.56666667,7.60416667 C6.56666667,7.37486594 6.76207922,7.19166667 7,7.19166667 L7.66666667,7.19166667 C7.90458744,7.19166667 8.1,7.37486594 8.1,7.60416667 L8.1,8.22916667 Z M10.7666667,8.22916667 C10.7666667,8.45846739 10.5712541,8.64166667 10.3333333,8.64166667 L9.66666667,8.64166667 C9.42874589,8.64166667 9.23333333,8.45846739 9.23333333,8.22916667 L9.23333333,7.60416667 C9.23333333,7.37486594 9.42874589,7.19166667 9.66666667,7.19166667 L10.3333333,7.19166667 C10.5712541,7.19166667 10.7666667,7.37486594 10.7666667,7.60416667 L10.7666667,8.22916667 Z M13.4333333,8.22916667 C13.4333333,8.45846739 13.2379208,8.64166667 13,8.64166667 L12.3333333,8.64166667 C12.0954126,8.64166667 11.9,8.45846739 11.9,8.22916667 L11.9,7.60416667 C11.9,7.37486594 12.0954126,7.19166667 12.3333333,7.19166667 L13,7.19166667 C13.2379208,7.19166667 13.4333333,7.37486594 13.4333333,7.60416667 L13.4333333,8.22916667 Z M16.1,8.22916667 C16.1,8.45846739 15.9045874,8.64166667 15.6666667,8.64166667 L15,8.64166667 C14.7620792,8.64166667 14.5666667,8.45846739 14.5666667,8.22916667 L14.5666667,7.60416667 C14.5666667,7.37486594 14.7620792,7.19166667 15,7.19166667 L15.6666667,7.19166667 C15.9045874,7.19166667 16.1,7.37486594 16.1,7.60416667 L16.1,8.22916667 Z M13.4333333,12.1875 C13.4333333,12.4168007 13.2379208,12.6 13,12.6 L7,12.6 C6.76207922,12.6 6.56666667,12.4168007 6.56666667,12.1875 L6.56666667,11.9791667 C6.56666667,11.7498659 6.76207922,11.5666667 7,11.5666667 L13,11.5666667 C13.2379208,11.5666667 13.4333333,11.7498659 13.4333333,11.9791667 L13.4333333,12.1875 Z"/>
+</symbol>
+<symbol id="icon-language" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M17.7998302,10.6536852 C17.2937025,9.28855506 15.8815881,8.47356524 14.0218839,8.47356524 C13.9489367,8.47356524 13.8786912,8.474454 13.8093463,8.47800903 L13.7967381,6.827588 L16.1222758,6.43254726 C16.4017823,6.3850673 16.5898769,6.11999245 16.542397,5.84048601 C16.5410146,5.83234811 16.5394361,5.82424475 16.5376629,5.81618297 L16.5376629,5.81618297 C16.4723515,5.51924415 16.1895214,5.32258138 15.8884219,5.36474046 C15.1881921,5.46278466 14.4879622,5.56082886 13.7877323,5.65887305 L13.7805648,4.55660742 C13.7785542,4.24740304 13.526419,3.9982904 13.2172129,4.00000884 L13.2172129,4.00000884 C12.9108878,4.00171126 12.6639424,4.2514169 12.6656448,4.55774197 C12.6656541,4.55942157 12.6656711,4.56110111 12.6656957,4.56278055 L12.684518,5.84817821 C12.0245664,5.96071474 11.3646149,6.07325126 10.7046633,6.18578779 L10.7046633,6.18578779 C10.3919165,6.23911813 10.1816179,6.53588233 10.2349482,6.84862918 C10.235091,6.84946646 10.2352356,6.85030342 10.2353821,6.85114005 L10.2353821,6.85114005 C10.2904231,7.16549738 10.5891193,7.37630318 10.9037492,7.32284226 L12.7043308,7.01689316 L12.7331494,8.63087516 C12.0363926,8.80144379 11.4026525,9.16283053 10.9049657,9.67338667 C10.2855409,10.3118189 9.93554005,11.1589659 9.9260318,12.0428118 C9.9260318,13.3119562 10.7131415,14.0656218 11.8127535,14.1989353 C14.3758131,14.5082226 15.96174,11.7512996 16.4885811,10.4270523 C17.305914,11.5340857 16.7964499,13.5462816 15.2324233,14.8744161 C15.2202253,14.8847744 15.2070791,14.8957162 15.1929846,14.9072416 L15.1929795,14.9072354 C14.9842554,15.0779137 14.9534131,15.3854801 15.1240913,15.5942043 C15.1269312,15.5976771 15.1298187,15.6011107 15.1327532,15.6045039 L15.1641777,15.6407924 C15.3438064,15.8485049 15.6551506,15.8779209 15.8705031,15.7075265 C15.8705031,15.7075265 15.8705031,15.7075265 15.8705031,15.7075265 C17.6275932,14.3172561 18.3977689,12.2706217 17.7998302,10.6536852 Z M11.0472578,12.041923 C11.0472578,11.4233484 11.3129298,10.7781111 11.7587185,10.3177352 C12.0360007,10.0315652 12.3765896,9.81255726 12.7538629,9.67783045 L12.820506,13.0995434 C12.5080037,13.2035279 12.1720862,13.247077 11.8127535,13.2035279 C11.0292461,13.1066535 11.0472578,12.47297 11.0472578,12.041923 Z M13.8174515,9.47430519 C13.8858959,9.47163892 13.952539,9.46630638 14.0218839,9.46630638 C14.6477892,9.46630638 15.2322677,9.5827335 15.5492729,9.75515228 C15.8662782,9.92934857 14.7207364,11.9254959 13.7805276,12.7618159 L13.8174515,9.47430519 Z M4.36328477,7.39683057 L2.02663154,14.7785388 C1.93197459,15.077569 2.09765188,15.3967155 2.39668211,15.4913724 C2.45170301,15.5087891 2.5090572,15.5177175 2.56676875,15.5178502 L2.56676875,15.5178502 C3.02589444,15.5189051 3.43131911,15.2185905 3.56410294,14.779084 L4.15959797,12.8080312 L6.99463369,12.8080312 L7.66630803,14.8123594 C7.80789554,15.2348675 8.20364619,15.5196277 8.649247,15.5196277 L8.649247,15.5196277 C8.94953571,15.5196277 9.19296781,15.2761956 9.19296781,14.9759069 C9.19296781,14.9194184 9.18416506,14.863275 9.16687638,14.8094973 L6.78341636,7.39556659 C6.61416135,6.86908622 6.12438741,6.5120794 5.57136948,6.5120794 L5.57136948,6.5120794 C5.01885224,6.5120794 4.53002757,6.87007433 4.36328477,7.39683057 Z M4.403656,11.6819766 L5.38442093,8.17218475 C5.41414787,8.06580314 5.52448565,8.00366225 5.63086726,8.03338919 C5.69822895,8.05221252 5.7508636,8.10485764 5.76967353,8.17222307 L6.74967507,11.6819766 L4.403656,11.6819766 Z"/>
+</symbol>
+<symbol id="icon-linkedin" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M16.8568889,2 L3.13955556,2 C2.51111111,2 2,2.51822222 2,3.15377778 L2,16.8462222 C2,17.4817778 2.51111111,18 3.13955556,18 L16.8568889,18 C17.4853333,18 18,17.4817778 18,16.8462222 L18,3.15377778 C18,2.51822222 17.4853333,2 16.8568889,2 Z M6.83555556,15.7146667 L4.464,15.7146667 L4.464,8.07911111 L6.83911111,8.07911111 L6.83911111,15.7146667 L6.83555556,15.7146667 Z M5.64977778,7.03555556 C4.90955743,7.00893599 4.32322909,6.40114328 4.32322909,5.66044444 C4.32322909,4.91974561 4.90955743,4.3119529 5.64977778,4.28533333 C6.40862206,4.28680065 7.02342157,4.90160016 7.02488889,5.66044444 C7.02488889,6.42133333 6.41155556,7.03555556 5.64977778,7.03555556 Z M15.7253333,15.7146667 L13.3537778,15.7146667 L13.3537778,12 C13.3537778,11.1146667 13.336,9.97511111 12.1217778,9.97511111 C10.8862222,9.97511111 10.696,10.9395556 10.696,11.936 L10.696,15.7137778 L8.32533333,15.7137778 L8.32533333,8.07822222 L10.6,8.07822222 L10.6,9.12177778 L10.632,9.12177778 C10.9502222,8.52177778 11.7253333,7.88888889 12.8782222,7.88888889 C15.2782222,7.88888889 15.7253333,9.47111111 15.7253333,11.5288889 L15.7253333,15.7146667 Z"/>
+</symbol>
+<symbol id="icon-list-alt" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M4.51428571,4.35483871 C3.88310314,4.35483871 3.37142857,4.86032367 3.37142857,5.48387097 L3.37142857,14.516129 C3.37142857,15.1396763 3.88310314,15.6451613 4.51428571,15.6451613 L15.4857143,15.6451613 C16.1168969,15.6451613 16.6285714,15.1396763 16.6285714,14.516129 L16.6285714,5.48387097 C16.6285714,4.86032367 16.1168969,4.35483871 15.4857143,4.35483871 L4.51428571,4.35483871 Z M4.51428571,3 L15.4857143,3 C16.8743159,3 18,4.11206691 18,5.48387097 L18,14.516129 C18,15.8879331 16.8743159,17 15.4857143,17 L4.51428571,17 C3.12568406,17 2,15.8879331 2,14.516129 L2,5.48387097 C2,4.11206691 3.12568406,3 4.51428571,3 Z M9.08571429,7.96774194 C8.70700474,7.96774194 8.4,7.66445096 8.4,7.29032258 C8.4,6.9161942 8.70700474,6.61290323 9.08571429,6.61290323 L14.5714286,6.61290323 C14.9501381,6.61290323 15.2571429,6.9161942 15.2571429,7.29032258 C15.2571429,7.66445096 14.9501381,7.96774194 14.5714286,7.96774194 L9.08571429,7.96774194 Z M5.42857143,7.96774194 C5.04986189,7.96774194 4.74285714,7.66445096 4.74285714,7.29032258 C4.74285714,6.9161942 5.04986189,6.61290323 5.42857143,6.61290323 L6.34285714,6.61290323 C6.72156669,6.61290323 7.02857143,6.9161942 7.02857143,7.29032258 C7.02857143,7.66445096 6.72156669,7.96774194 6.34285714,7.96774194 L5.42857143,7.96774194 Z M9.08571429,10.6774194 C8.70700474,10.6774194 8.4,10.3741284 8.4,10 C8.4,9.62587162 8.70700474,9.32258065 9.08571429,9.32258065 L14.5714286,9.32258065 C14.9501381,9.32258065 15.2571429,9.62587162 15.2571429,10 C15.2571429,10.3741284 14.9501381,10.6774194 14.5714286,10.6774194 L9.08571429,10.6774194 Z M5.42857143,10.6774194 C5.04986189,10.6774194 4.74285714,10.3741284 4.74285714,10 C4.74285714,9.62587162 5.04986189,9.32258065 5.42857143,9.32258065 L6.34285714,9.32258065 C6.72156669,9.32258065 7.02857143,9.62587162 7.02857143,10 C7.02857143,10.3741284 6.72156669,10.6774194 6.34285714,10.6774194 L5.42857143,10.6774194 Z M5.42857143,13.3870968 C5.04986189,13.3870968 4.74285714,13.0838058 4.74285714,12.7096774 C4.74285714,12.335549 5.04986189,12.0322581 5.42857143,12.0322581 L6.34285714,12.0322581 C6.72156669,12.0322581 7.02857143,12.335549 7.02857143,12.7096774 C7.02857143,13.0838058 6.72156669,13.3870968 6.34285714,13.3870968 L5.42857143,13.3870968 Z M9.08571429,13.3870968 C8.70700474,13.3870968 8.4,13.0838058 8.4,12.7096774 C8.4,12.335549 8.70700474,12.0322581 9.08571429,12.0322581 L14.5714286,12.0322581 C14.9501381,12.0322581 15.2571429,12.335549 15.2571429,12.7096774 C15.2571429,13.0838058 14.9501381,13.3870968 14.5714286,13.3870968 L9.08571429,13.3870968 Z"/>
+</symbol>
+<symbol id="icon-list" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M6.7826087,5.75 C6.35038585,5.75 6,5.41421356 6,5 C6,4.58578644 6.35038585,4.25 6.7826087,4.25 L17.2173913,4.25 C17.6496142,4.25 18,4.58578644 18,5 C18,5.41421356 17.6496142,5.75 17.2173913,5.75 L6.7826087,5.75 Z M6.7826087,10.75 C6.35038585,10.75 6,10.4142136 6,10 C6,9.58578644 6.35038585,9.25 6.7826087,9.25 L17.2173913,9.25 C17.6496142,9.25 18,9.58578644 18,10 C18,10.4142136 17.6496142,10.75 17.2173913,10.75 L6.7826087,10.75 Z M6.7826087,15.75 C6.35038585,15.75 6,15.4142136 6,15 C6,14.5857864 6.35038585,14.25 6.7826087,14.25 L17.2173913,14.25 C17.6496142,14.25 18,14.5857864 18,15 C18,15.4142136 17.6496142,15.75 17.2173913,15.75 L6.7826087,15.75 Z M1.995652,15 L1.995652,15 C1.995652,14.5857864 2.33143844,14.25 2.745652,14.25 L3.85434765,14.25 C4.26856121,14.25 4.60434765,14.5857864 4.60434765,15 L4.60434765,15 C4.60434765,15.4142136 4.26856121,15.75 3.85434765,15.75 L2.745652,15.75 C2.33143844,15.75 1.995652,15.4142136 1.995652,15 Z M1.995652,10 L1.995652,10 C1.995652,9.58578644 2.33143844,9.25 2.745652,9.25 L3.85434765,9.25 C4.26856121,9.25 4.60434765,9.58578644 4.60434765,10 L4.60434765,10 C4.60434765,10.4142136 4.26856121,10.75 3.85434765,10.75 L2.745652,10.75 C2.33143844,10.75 1.995652,10.4142136 1.995652,10 Z M1.995652,5 L1.995652,5 C1.995652,4.58578644 2.33143844,4.25 2.745652,4.25 L3.85434765,4.25 C4.26856121,4.25 4.60434765,4.58578644 4.60434765,5 L4.60434765,5 C4.60434765,5.41421356 4.26856121,5.75 3.85434765,5.75 L2.745652,5.75 C2.33143844,5.75 1.995652,5.41421356 1.995652,5 Z"/>
+</symbol>
+<symbol id="icon-loading" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M10,2.68702533 L10,2.68702533 C10,3.06515396 9.71022961,3.38019545 9.333419,3.41173939 C9.20724273,3.42233281 9.10021136,3.43419215 9.01232745,3.44734802 C5.81995673,3.92523329 3.37142857,6.68414566 3.37142857,10.0159806 C3.37142857,13.3545008 5.82979236,16.117797 9.03155256,16.5874622 C9.11479793,16.5996735 9.21552923,16.6107219 9.33374646,16.6206074 L9.33374367,16.6206408 C9.7103617,16.6521342 10,16.9670034 10,17.3449359 L10,17.3449359 C10,17.7068101 9.70664301,18.0001671 9.34476882,18.0001671 C9.32883938,18.0001671 9.31291523,17.9995862 9.29702812,17.9984256 C9.18973641,17.9906119 9.09725269,17.9819371 9.01957518,17.9724256 C5.06413098,17.4880865 2,14.1109378 2,10.0159806 C2,5.93002254 5.05067833,2.5587214 8.99351071,2.06277065 C9.07782726,2.05216486 9.17917305,2.04254526 9.29754807,2.03391185 L9.29755023,2.03394136 C9.65823854,2.00763539 9.9719594,2.27870584 9.99826537,2.63939416 C9.99942141,2.6552449 10,2.67113248 10,2.68702533 Z"/>
+</symbol>
+<symbol id="icon-lock" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M13.5652174,16.5454545 L6.43478261,16.5454545 C6.15864023,16.5454545 5.93478261,16.3215969 5.93478261,16.0454545 L5.93478261,10.4195152 C5.93478261,10.1433728 6.15864023,9.91951515 6.43478261,9.91951515 L13.5652174,9.91951515 C13.8413598,9.91951515 14.0652174,10.1433728 14.0652174,10.4195152 L14.0652174,16.0454545 C14.0652174,16.3215969 13.8413598,16.5454545 13.5652174,16.5454545 Z M7.52930435,5.95927273 C7.52930435,4.57842424 8.63791304,3.45454545 10,3.45454545 C11.362087,3.45454545 12.4706957,4.57842424 12.4706957,5.95927273 L12.4706957,8.4649697 L7.52930435,8.4649697 L7.52930435,5.95927273 Z M13.9054783,8.4649697 L13.9054783,5.95927273 C13.9054783,3.77648485 12.1531304,2 10,2 C7.84686957,2 6.09452174,3.77648485 6.09452174,5.95927273 L6.09452174,8.4649697 L5.5,8.4649697 C4.94771525,8.4649697 4.5,8.91268495 4.5,9.4649697 L4.5,17 C4.5,17.5522847 4.94771525,18 5.5,18 L14.5,18 C15.0522847,18 15.5,17.5522847 15.5,17 L15.5,9.4649697 C15.5,8.91268495 15.0522847,8.4649697 14.5,8.4649697 L13.9054783,8.4649697 Z"/>
+</symbol>
+<symbol id="icon-magnifier" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M17.7660535,17.7660535 L17.7660535,17.7660535 C17.4541249,18.0779822 16.9483886,18.0779822 16.63646,17.7660535 L13.5969106,14.7265041 C12.3756141,15.7020179 10.8272183,16.2852177 9.14260887,16.2852177 C5.19785492,16.2852177 2,13.0873628 2,9.14260887 C2,5.19785492 5.19785492,2 9.14260887,2 C13.0873628,2 16.2852177,5.19785492 16.2852177,9.14260887 C16.2852177,10.8272183 15.7020179,12.3756141 14.7265041,13.5969106 L17.7660535,16.63646 C18.0779822,16.9483886 18.0779822,17.4541249 17.7660535,17.7660535 Z M9.14260887,14.923131 C12.3351031,14.923131 14.923131,12.3351031 14.923131,9.14260887 C14.923131,5.95011463 12.3351031,3.3620867 9.14260887,3.3620867 C5.95011463,3.3620867 3.3620867,5.95011463 3.3620867,9.14260887 C3.3620867,12.3351031 5.95011463,14.923131 9.14260887,14.923131 Z"/>
+</symbol>
+<symbol id="icon-mail" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M4.256,4.75775 C3.6904,4.75775 3.2304,5.2281875 3.2304,5.8066875 L3.2304,14.1933125 C3.2304,14.7718125 3.6904,15.2414375 4.256,15.2414375 L15.7432,15.2414375 C16.3088,15.2414375 16.7696,14.7718125 16.7696,14.1933125 L16.7696,5.8066875 C16.7696,5.2281875 16.3088,4.75775 15.7432,4.75775 L4.256,4.75775 Z M15.7432,16.5 L4.256,16.5 C3.0112,16.5 2,15.4656875 2,14.1933125 L2,5.8066875 C2,4.5343125 3.0112,3.5 4.256,3.5 L15.7432,3.5 C16.988,3.5 18,4.5343125 18,5.8066875 L18,14.1933125 C18,15.4656875 16.988,16.5 15.7432,16.5 Z M9.4885457,11.272831 L5.29549282,8.41246282 C5.00871798,8.21683409 4.93110888,7.827753 5.12088,7.53706875 L5.12088,7.53706875 C5.30576018,7.25387626 5.68520805,7.17417839 5.96840054,7.35905857 C5.97185996,7.36131703 5.97529644,7.36361044 5.97870945,7.36593844 L10.05208,10.1443813 L14.1264026,7.36577341 C14.405586,7.17537578 14.7862567,7.24735092 14.9766544,7.52653438 C14.9790325,7.53002151 14.9813745,7.53353316 14.98368,7.53706875 L14.98368,7.53706875 C15.1732579,7.82779753 15.0955662,8.21674938 14.8088477,8.41233965 L10.6156143,11.272831 C10.2757034,11.5047074 9.82845656,11.5047074 9.4885457,11.272831 Z"/>
+</symbol>
+<symbol id="icon-map-pin" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M9.961429,5.428571 C11.2028894,5.428571 12.211429,6.437774 12.211429,7.678571 C12.211429,8.919368 11.2028894,9.928571 9.961429,9.928571 C8.71996856,9.928571 7.711429,8.919368 7.711429,7.678571 C7.711429,6.437774 8.71996856,5.428571 9.961429,5.428571 Z M9.961429,8.70144448 C10.5260857,8.70144448 10.9848692,8.24308136 10.9848692,7.678571 C10.9848692,7.11486478 10.5260857,6.65569752 9.961429,6.65569752 C9.39677233,6.65569752 8.93798878,7.11486478 8.93798878,7.678571 C8.93798878,8.24308136 9.39677233,8.70144448 9.961429,8.70144448 Z M10.4445937,17.841934 C10.1868097,18.0526887 9.81319031,18.0526887 9.55540629,17.841934 C9.50701769,17.8023733 9.42233487,17.7304274 9.30650786,17.6277817 C9.1169783,17.459821 8.90671729,17.2646073 8.68087055,17.0437945 C8.03747753,16.4147419 7.39461774,15.7038484 6.7935332,14.9236361 C5.05257997,12.6638657 4,10.2861964 4,7.88161172 C4,4.63244233 6.68714408,2 10,2 C13.3128559,2 16,4.63244233 16,7.88161172 C16,10.2861964 14.94742,12.6638657 13.2064668,14.9236361 C12.6053823,15.7038484 11.9625225,16.4147419 11.3191294,17.0437945 C11.0932827,17.2646073 10.8830217,17.459821 10.6934921,17.6277817 C10.5776651,17.7304274 10.4929823,17.8023733 10.4445937,17.841934 Z M10.3383291,16.0704368 C10.93803,15.4841025 11.5382641,14.8203457 12.0974006,14.0945824 C13.6713645,12.0515653 14.6077348,9.93640165 14.6077348,7.88161172 C14.6077348,5.39155128 12.5456342,3.37142857 10,3.37142857 C7.45436575,3.37142857 5.39226519,5.39155128 5.39226519,7.88161172 C5.39226519,9.93640165 6.3286355,12.0515653 7.90259939,14.0945824 C8.46173585,14.8203457 9.06196998,15.4841025 9.66167088,16.0704368 C9.84893326,16.2535253 10.1510706,16.2535291 10.3383377,16.0704452 Z"/>
+</symbol>
+<symbol id="icon-menu" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M8.7,15.25 C8.7,14.5596441 9.25964406,14 9.95,14 C10.6403559,14 11.2,14.5596441 11.2,15.25 C11.2,15.9403559 10.6403559,16.5 9.95,16.5 C9.25964406,16.5 8.7,15.9403559 8.7,15.25 Z M8.7,10.25 C8.7,9.55964406 9.25964406,9 9.95,9 C10.6403559,9 11.2,9.55964406 11.2,10.25 C11.2,10.9403559 10.6403559,11.5 9.95,11.5 C9.25964406,11.5 8.7,10.9403559 8.7,10.25 Z M8.7,5.25 C8.7,4.55964406 9.25964406,4 9.95,4 C10.6403559,4 11.2,4.55964406 11.2,5.25 C11.2,5.94035594 10.6403559,6.5 9.95,6.5 C9.25964406,6.5 8.7,5.94035594 8.7,5.25 Z"/>
+</symbol>
+<symbol id="icon-message" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M10.574127,16.136875 L10.4018915,16.136875 C6.32753412,16.136875 3.37035443,13.5559375 3.37035443,10 C3.37035443,6.615625 6.1402398,3.8621875 9.5444788,3.8621875 C12.9487178,3.8621875 15.7186032,6.615625 15.7186032,10 C15.7186032,10.553125 15.4597794,11.10625 15.1858967,11.6903125 C15.0908378,11.8946875 14.99672,12.09625 14.9242494,12.2696875 C14.2127192,13.7940625 15.6122501,14.528125 16.2080155,14.84125 C16.3002509,14.8890625 16.4188392,14.9509375 16.5148393,15.008125 C16.1233095,15.45625 14.8075434,16.1509375 10.574127,16.136875 M16.8480162,13.6365625 C16.0056623,13.193125 16.0461329,13.105 16.1797801,12.81625 C16.2560155,12.6353125 16.3416627,12.4515625 16.428251,12.2659375 C16.7388396,11.605 17.0898988,10.855 17.0898988,10 C17.0898988,5.86375 13.7044833,2.5 9.5444788,2.5 C5.38447427,2.5 2,5.86375 2,10 C2,14.3453125 5.53412149,17.4990625 10.4018915,17.4990625 L10.5675387,17.5 L10.7614213,17.5 C13.4503654,17.5 17.0033104,17.26 17.881429,15.4028125 C18.3454296,14.4221875 17.3346049,13.8915625 16.8480162,13.6365625"/>
+</symbol>
+<symbol id="icon-mic" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M10,3.5 C8.8954305,3.5 8,4.3954305 8,5.5 L8,8.5 C8,9.6045695 8.8954305,10.5 10,10.5 C11.1045695,10.5 12,9.6045695 12,8.5 L12,5.5 C12,4.3954305 11.1045695,3.5 10,3.5 Z M13,17.5 L13,17.5 C13,17.7761424 12.7761424,18 12.5,18 L7.5,18 C7.22385763,18 7,17.7761424 7,17.5 L7,17.5 C7,17.2238576 7.22385763,17 7.5,17 L9.25,17 L9.25,14.716139 C6.28686875,14.4396124 4.6068039,12.4749969 4.30015364,9.02848274 C4.29372099,8.95618468 4.28758275,8.87041985 4.28173892,8.77118824 L4.28175695,8.77118718 C4.25810647,8.3695884 4.5644941,8.02485576 4.96609288,8.00120528 C4.97738436,8.00054032 4.9886898,8.00013845 5,8 L5,8 C5.41277955,7.99494719 5.75675134,8.31499417 5.78141823,8.72706702 C5.78840657,8.84343937 5.79579487,8.94198439 5.80360528,9.02270073 C6.08417964,11.9222855 7.44731661,13.25 10,13.25 C12.5473822,13.25 13.9101536,11.9277943 14.1946327,9.04074514 C14.2030058,8.95577013 14.2109047,8.85128998 14.2183292,8.72730468 L14.2183104,8.72730356 C14.2429945,8.31509415 14.5870831,7.99494551 15,8 L15,8 C15.402301,8.00492454 15.7244382,8.33504606 15.7195137,8.73734705 C15.7193751,8.74867236 15.7189723,8.75999289 15.7183058,8.77129942 C15.7126924,8.86709227 15.7067695,8.95009551 15.7005706,9.02031109 C15.39585,12.4718915 13.7154723,14.4393939 10.75,14.716139 L10.75,17 L12.5,17 C12.7761424,17 13,17.2238576 13,17.5 Z M10,2 C11.9329966,2 13.5,3.56700338 13.5,5.5 L13.5,8.5 C13.5,10.4329966 11.9329966,12 10,12 C8.06700338,12 6.5,10.4329966 6.5,8.5 L6.5,5.5 C6.5,3.56700338 8.06700338,2 10,2 Z"/>
+</symbol>
+<symbol id="icon-mobile" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M11.1165049,14.9079755 C11.1165049,15.5322382 10.6174444,16.0368098 10,16.0368098 C9.38255562,16.0368098 8.88349515,15.5322382 8.88349515,14.9079755 C8.88349515,14.2837127 9.38255562,13.7791411 10,13.7791411 C10.6174444,13.7791411 11.1165049,14.2837127 11.1165049,14.9079755 Z M15,3.6196319 L15,16.3803681 C15,17.2745695 14.2824929,18 13.3980583,18 L6.60194175,18 C5.71750708,18 5,17.2745695 5,16.3803681 L5,3.6196319 C5,2.72543047 5.71750708,2 6.60194175,2 L13.3980583,2 C14.2824929,2 15,2.72543047 15,3.6196319 Z M13.7378641,3.6196319 C13.7378641,3.43101125 13.5846187,3.27607362 13.3980583,3.27607362 L6.60194175,3.27607362 C6.41538127,3.27607362 6.26213592,3.43101125 6.26213592,3.6196319 L6.26213592,16.3803681 C6.26213592,16.5689887 6.41538127,16.7239264 6.60194175,16.7239264 L13.3980583,16.7239264 C13.5846187,16.7239264 13.7378641,16.5689887 13.7378641,16.3803681 L13.7378641,3.6196319 Z"/>
+</symbol>
+<symbol id="icon-modal-warning" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M9.98344445,7.04264254 C10.4190789,7.04264254 10.7723523,7.39520794 10.7723523,7.83027001 L10.7723523,12.3994926 C10.7723523,12.8345547 10.4190789,13.1871201 9.98344445,13.1871201 C9.54780997,13.1871201 9.19453663,12.8345547 9.19453663,12.3994926 L9.19453663,7.83027001 C9.19453663,7.39520794 9.54780997,7.04264254 9.98344445,7.04264254 Z M0.959352356,16.870054 L9.04441459,2.40226256 C9.32933111,1.8924195 9.98368057,1.7021729 10.5098756,1.97341266 C10.6984618,2.07062387 10.853564,2.21970064 10.9555854,2.40226256 L19.0406476,16.870054 C19.3644696,17.4495162 18.9313899,18.15 18.2590107,18.15 L1.74098931,18.15 C1.06861014,18.15 0.635530413,17.4495162 0.959352356,16.870054 Z M9.96597455,13.7448416 C10.4490813,13.7448416 10.8196237,14.1257886 10.8196237,14.6151726 C10.8196237,15.1078483 10.450184,15.4898784 9.96597455,15.4898784 C9.48176512,15.4898784 9.11232535,15.1078483 9.11232535,14.6151726 C9.11232535,14.1257886 9.48286785,13.7448416 9.96597455,13.7448416 Z M2.73547986,16.7123645 L17.2645201,16.7123645 L10,3.71288982 L2.73547986,16.7123645 Z"/>
+</symbol>
+<symbol id="icon-multiline" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M11.472,5.75 L11.472,5.75 C11.472,6.16421356 11.8077864,6.5 12.222,6.5 L15.558,6.5 L15.558,11.252 L5.803,11.252 L8.26860127,8.68611714 C8.55321902,8.38992333 8.55339497,7.92190772 8.269,7.6255 L8.269,7.6255 C7.99906056,7.3441584 7.55215897,7.33491512 7.27081737,7.60485457 C7.26393194,7.61146095 7.25718116,7.61820625 7.25056918,7.62508631 L3.66598633,11.3550104 C3.29397907,11.7421012 3.29400993,12.3538692 3.66605623,12.7409224 L7.25051571,16.4699651 C7.52073927,16.7510884 7.96769424,16.7599244 8.24881757,16.4897009 C8.25568054,16.483104 8.26240939,16.476369 8.269,16.4695 L8.269,16.4695 C8.55341416,16.1730723 8.55329484,15.7050423 8.26872957,15.4087596 L5.718,12.753 L16.001,12.753 C16.5532847,12.753 17.001,12.3052847 17.001,11.753 L17.001,6 C17.001,5.44771525 16.5532847,5 16.001,5 L12.222,5 C11.8077864,5 11.472,5.33578644 11.472,5.75 Z"/>
+</symbol>
+<symbol id="icon-mute" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M8.07162956,9.03236085 L6.868093,10.0641379 C6.6325462,9.59341351 6.5,9.06218567 6.5,8.5 L6.5,5.5 C6.5,3.56700338 8.06700338,2 10,2 C11.5863668,2 12.9262329,3.05539481 13.3557571,4.50234323 L12,5.66461716 L12,5.5 C12,4.3954305 11.1045695,3.5 10,3.5 C8.8954305,3.5 8,4.3954305 8,5.5 L8,8.5 C8,8.684342 8.02493988,8.86285898 8.07162956,9.03236085 Z M7.37145588,14.2427133 L8.69338552,13.1094393 C9.08788589,13.2036768 9.52319165,13.25 10,13.25 C12.5473822,13.25 13.9101536,11.9277943 14.1946327,9.04074514 C14.2030058,8.95577013 14.2109047,8.85128998 14.2183292,8.72730468 L14.2183104,8.72730356 C14.2429945,8.31509415 14.5870831,7.99494551 15,8 C15.402301,8.00492454 15.7244382,8.33504606 15.7195137,8.73734705 C15.7193751,8.74867236 15.7189723,8.75999289 15.7183058,8.77129942 C15.7126924,8.86709227 15.7067695,8.95009551 15.7005706,9.02031109 C15.39585,12.4718915 13.7154723,14.4393939 10.75,14.716139 L10.75,17 L12.5,17 C12.7761424,17 13,17.2238576 13,17.5 C13,17.7761424 12.7761424,18 12.5,18 L7.5,18 C7.22385763,18 7,17.7761424 7,17.5 C7,17.2238576 7.22385763,17 7.5,17 L9.25,17 L9.25,14.716139 C8.55228772,14.6510268 7.92571318,14.4923209 7.37145588,14.2427133 Z M4.94084799,11.7163414 C4.60618286,10.9564611 4.39181379,10.0586727 4.30015364,9.02848274 C4.29372099,8.95618468 4.28758275,8.87041985 4.28173892,8.77118824 L4.28175695,8.77118718 C4.25810647,8.3695884 4.5644941,8.02485576 4.96609288,8.00120528 C4.97738436,8.00054032 4.9886898,8.00013845 5,8 C5.41277955,7.99494719 5.75675134,8.31499417 5.78141823,8.72706702 C5.78840657,8.84343937 5.79579487,8.94198439 5.80360528,9.02270073 C5.86440242,9.65100643 5.97602995,10.2055069 6.13957636,10.6886863 L4.94084799,11.7163414 Z M13.4613488,9.02192297 C13.2093532,10.7073691 11.7556316,12 10,12 C9.9958443,12 9.99169029,11.9999928 9.98753799,11.9999783 L13.4613488,9.02192297 Z M17.7972,2.9998 C18.0667928,3.31427187 18.0304112,3.7877499 17.7159393,4.05734277 L3.07474272,16.6090606 C2.76027085,16.8786535 2.28679282,16.8422719 2.01719995,16.5278 C1.74760708,16.2133281 1.7839887,15.7398501 2.09846057,15.4702572 L16.7396572,2.91853938 C17.0541291,2.64894651 17.5276071,2.68532813 17.7972,2.9998 Z"/>
+</symbol>
+<symbol id="icon-omnichannel" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M16.628,10.954 C16.628,11.33 16.32,11.637 15.942,11.637 C15.565,11.637 15.257,11.33 15.257,10.954 L15.257,9.137 C15.257,8.761 15.565,8.454 15.942,8.454 C16.32,8.454 16.628,8.761 16.628,9.137 L16.628,10.954 Z M10.228,16.637 L9.771,16.637 C9.393,16.637 9.086,16.33 9.086,15.954 C9.086,15.578 9.393,15.272 9.771,15.272 L10.228,15.272 C10.607,15.272 10.914,15.578 10.914,15.954 C10.914,16.33 10.607,16.637 10.228,16.637 Z M4.057,11.637 C3.679,11.637 3.371,11.33 3.371,10.954 L3.371,9.137 C3.371,8.761 3.679,8.454 4.057,8.454 C4.435,8.454 4.742,8.761 4.742,9.137 L4.742,10.954 C4.742,11.33 4.435,11.637 4.057,11.637 Z M15.942,7.091 C15.662,7.091 15.396,7.147 15.152,7.249 C14.667,4.828 12.542,3 10,3 C7.458,3 5.333,4.828 4.847,7.249 C4.604,7.147 4.337,7.091 4.057,7.091 C2.922,7.091 2,8.009 2,9.137 L2,10.954 C2,12.082 2.922,13 4.057,13 C5.151,13 6.04,12.144 6.102,11.071 L6.114,11.071 L6.114,10.954 L6.114,9.137 L6.114,8.301 C6.114,6.13 7.857,4.363 10,4.363 C12.142,4.363 13.885,6.13 13.885,8.301 L13.885,9.137 L13.885,10.954 L13.885,11.995 C13.885,13.345 13.218,14.55 12.156,15.265 C11.87,14.476 11.118,13.909 10.228,13.909 L9.771,13.909 C8.637,13.909 7.714,14.826 7.714,15.954 C7.714,17.082 8.637,18 9.771,18 L10.228,18 C11.029,18 11.717,17.538 12.057,16.872 C13.729,16.159 14.902,14.645 15.189,12.853 C15.423,12.945 15.676,13 15.942,13 C17.077,13 18,12.082 18,10.954 L18,9.137 C18,8.009 17.077,7.091 15.942,7.091 Z"/>
+</symbol>
+<symbol id="icon-pause" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M10,18 C5.58217143,18 2,14.4187429 2,10 C2,5.58125714 5.58217143,2 10,2 C14.4178286,2 18,5.58125714 18,10 C18,14.4187429 14.4178286,18 10,18 Z M11.0146065,7.74166381 L11.0020833,12.2500029 C11.0009359,12.6630659 11.3348595,12.9988497 11.7479225,12.9999971 C11.748615,12.999999 11.7493075,13 11.75,13 L11.75,13 C12.1642136,13 12.5,12.6642136 12.5,12.25 L12.5,7.74166667 C12.5,7.33205548 12.1679445,7 11.7583333,7 L11.7583333,7 C11.3483893,7 11.0157452,7.33172136 11.0146065,7.74166381 Z M7.5,7.75 L7.5,12.25 C7.5,12.6642136 7.83578644,13 8.25,13 L8.25,13 C8.66421356,13 9,12.6642136 9,12.25 L9,7.75 C9,7.33578644 8.66421356,7 8.25,7 L8.25,7 C7.83578644,7 7.5,7.33578644 7.5,7.75 Z"/>
+</symbol>
+<symbol id="icon-permalink" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M10.5615959,13.5369661 C10.8614377,13.8374425 10.8642543,14.3226796 10.5667497,14.6286503 L8.2685409,16.9268589 C6.83317877,18.3588624 4.50959891,18.358811 3.07396303,16.9265337 C1.64197242,15.4911845 1.64199806,13.1676046 3.07412553,11.7321184 L6.3626967,8.44354747 C7.79863297,7.01168291 10.1217674,7.01250144 11.5618962,8.44873652 C11.8468297,8.75455932 11.8385338,9.23106215 11.5431274,9.52678116 C11.2472876,9.822934 10.7707684,9.83088531 10.4601369,9.54190764 C9.63066742,8.7145592 8.28806314,8.71453851 7.45871412,9.54176665 L4.16967211,12.8290741 C3.34245707,13.6582293 3.34240935,15.0005376 4.16934691,15.8294155 C4.99851217,16.6566405 6.34082045,16.6566682 7.1698246,15.8296041 L9.46873792,13.5298236 L9.47196244,13.5276684 C9.77670104,13.2324779 10.2619266,13.2366626 10.5615959,13.5369661 Z M16.9259063,8.26862645 L13.6363953,11.5572701 C12.2008541,12.9887407 9.87772165,12.9887096 8.44201443,11.5570732 C8.24603309,11.3610918 8.16949366,11.0754428 8.24122781,10.8077273 C8.31296195,10.5400118 8.52207155,10.3309022 8.78978704,10.2591681 C9.05747794,10.1874405 9.34313357,10.2639554 9.53890328,10.4597255 C10.3685766,11.2866611 11.7108665,11.286692 12.5403595,10.4599364 L15.8294199,7.17174346 C16.6566349,6.34258823 16.6566826,5.00027994 15.8297451,4.1714021 C15.0005779,3.34417513 13.6582696,3.34415128 12.8292412,4.17123959 L10.5304013,6.47007948 C10.3344462,6.66624196 10.0487247,6.74296275 9.78086551,6.67134189 C9.51300628,6.59972102 9.30370342,6.39063941 9.2317993,6.12285608 C9.1598923,5.85506205 9.23632156,5.56926251 9.43236841,5.37300829 L11.7322854,3.07395864 C13.1676218,1.64198086 15.4912017,1.64198086 16.9267356,3.07415623 C18.3580432,4.51021576 18.3577428,6.83343179 16.9259063,8.26862645 Z"/>
+</symbol>
+<symbol id="icon-pin" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M9.42996785,12.4576456 L5.03820001,8.06485857 L4.39915651,8.70390207 C4.25850578,8.84455279 4.0719907,8.92201261 3.87324511,8.92201261 C3.87324511,8.92201261 3.87324511,8.92201261 3.87324511,8.92201261 L3.87324511,8.92201261 C3.66536587,8.92201261 3.49356029,8.75988807 3.48151707,8.55235798 C3.48107838,8.54448527 3.48084998,8.53690545 3.48084998,8.52961748 C3.48084998,8.3318911 3.5583098,8.14843364 3.69386448,8.01084054 L8.01123013,3.6944941 C8.01123013,3.6944941 8.01123013,3.6944941 8.01123013,3.6944941 L8.01123013,3.6944941 C8.20290792,3.50281631 8.51367902,3.50281631 8.70535681,3.6944941 C8.8381036,3.82724089 8.88350188,4.02407983 8.82230421,4.20155733 C8.79466754,4.2817736 8.75532304,4.34750772 8.70429166,4.39876692 L8.06524816,5.03781042 L12.079909,9.05349046 L12.4559968,9.42040539 L12.9289094,9.19516039 C12.9851657,9.1686868 13.9802154,8.7124366 15.2534176,9.2114661 C15.3954837,9.26714868 15.5951631,9.37268051 15.852456,9.52806158 L15.8524016,9.52815155 C15.9941809,9.61377314 16.0397057,9.79811799 15.9540842,9.9398973 C15.9415573,9.96064036 15.9265625,9.97978868 15.9094277,9.99692341 L9.99822269,15.9082807 C9.88102335,16.0254801 9.69100569,16.0254801 9.57380635,15.9082807 C9.55648297,15.8909573 9.541346,15.8715779 9.52873335,15.850575 C9.36528629,15.5783991 9.25525114,15.3678629 9.19862793,15.2189665 C8.72086328,13.9626361 9.16871596,12.9864865 9.19249235,12.9356542 L9.42996785,12.4576456 Z M17.7833977,9.1706994 C15.7714808,7.15674413 13.730007,7.4033925 12.7943739,7.67348265 L10.1057028,4.9848116 C10.5154245,4.27340432 10.5001364,3.38465483 10.0618769,2.68853568 L9.71534612,2.34200491 C8.85513446,1.79978619 7.7075061,1.90272621 6.96246496,2.64776735 L2.64713773,6.96411379 C1.90209658,7.70915494 1.80017577,8.85882171 2.3423945,9.71495654 L2.68790605,10.0614873 C3.38606362,10.500766 4.27583232,10.5150349 4.98418197,10.1063325 L7.67387224,12.7960227 C7.40378208,13.7296174 7.15713371,15.7700721 9.17108898,17.7840273 L9.17108898,17.7840273 C9.45957211,18.0730728 9.92775155,18.0735287 10.216797,17.7850455 C10.2169669,17.784876 10.2171367,17.7847064 10.2173064,17.7845367 L13.4772433,14.5245997 L16.4454322,17.4927885 C16.7346597,17.7820161 17.2035551,17.7821302 17.4929234,17.4930434 L17.4929234,17.4930434 C17.7821097,17.2041384 17.7823377,16.7355028 17.4934327,16.4463165 C17.4933479,16.4462316 17.493263,16.4461467 17.4931781,16.4460618 L14.5239701,13.4768538 L17.7834681,10.2164774 C18.0722048,9.92766292 18.0721733,9.45947495 17.7833977,9.1706994 Z"/>
+</symbol>
+<symbol id="icon-play-solid" viewBox="0 0 448 512" fill="currentColor">
+  <path d="M424.4 214.7L72.4 6.6C43.8-10.3 0 6.1 0 47.9V464c0 37.5 40.7 60.1 72.4 41.3l352-208c31.4-18.5 31.5-64.1 0-82.6z"/>
+</symbol>
+<symbol id="icon-play" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M10,18 C5.58217143,18 2,14.4187429 2,10 C2,5.58125714 5.58217143,2 10,2 C14.4178286,2 18,5.58125714 18,10 C18,14.4187429 14.4178286,18 10,18 Z M8.91894653,7.07082336 C8.82337695,7.01084454 8.71283175,6.97902914 8.6,6.97902914 C8.26862915,6.97902914 8,7.24765829 8,7.57902914 L8,12.4208747 C8,12.5337065 8.0318154,12.6442517 8.09179422,12.7398213 C8.26794352,13.0204956 8.63827223,13.1052298 8.91894653,12.9290805 L12.7764174,10.5081577 C12.8529497,10.4601266 12.9176456,10.3954307 12.9656767,10.3188985 C13.141826,10.0382242 13.0570918,9.66789546 12.7764174,9.49174616 L8.91894653,7.07082336 Z"/>
+</symbol>
+<symbol id="icon-plus" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M9.2173913,3.78208696 L9.2173913,9.2173913 L3.7826087,9.2173913 C3.35038585,9.2173913 3,9.56777715 3,10 L3,10 C3,10.4322228 3.35038585,10.7826087 3.7826087,10.7826087 L9.2173913,10.7826087 L9.2173913,16.217913 C9.2173913,16.6498477 9.56754356,17 9.99947826,17 L9.99947826,17 C10.431413,17 10.7815652,16.6498477 10.7815652,16.217913 L10.7815652,10.7826087 L16.2173913,10.7826087 C16.6496142,10.7826087 17,10.4322228 17,10 L17,10 C17,9.56777715 16.6496142,9.2173913 16.2173913,9.2173913 L10.7815652,9.2173913 L10.7815652,3.78208696 C10.7815652,3.35015226 10.431413,3 9.99947826,3 L9.99947826,3 C9.56754356,3 9.2173913,3.35015226 9.2173913,3.78208696 Z"/>
+</symbol>
+<symbol id="icon-podcast" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M10,1.95 C13.896608,1.95 17.05,5.10356705 17.05,9 C17.05,11.166632 16.0752466,13.1497307 14.4396905,14.4781658 C14.3616646,14.5415402 14.2628445,14.6156881 14.1432231,14.7006337 C14.0879961,14.7398628 14.0234522,14.7639325 13.9560242,14.7704441 C13.742952,14.7910206 13.5535424,14.634972 13.5329659,14.4218999 L13.5292192,14.3831022 C13.4963668,14.0429118 13.6311483,13.7080071 13.8904975,13.4853765 C14.0815528,13.3214113 14.2299297,13.1831473 14.3354462,13.0708474 C15.3658812,11.9741689 15.95,10.5315715 15.95,9 C15.95,5.67254537 13.2076794,2.98261044 9.87503003,3.05130189 C6.6644569,3.11745551 4.06983488,5.75096688 4.05012406,8.96286936 C4.04050357,10.5303988 4.64271407,12.0068291 5.70875821,13.1173893 C5.81098305,13.2238829 5.95473284,13.3557943 6.13982416,13.5128701 C6.38175827,13.7181849 6.51787079,14.0218935 6.51011831,14.3391177 L6.50746809,14.4468654 C6.50564638,14.5214082 6.48126144,14.5936461 6.43753247,14.6540424 C6.31813058,14.8189546 6.08765197,14.8558333 5.92280013,14.7363965 C5.58892408,14.4946592 5.33965696,14.2965117 5.17461304,14.141495 C3.76582853,12.8183014 2.95,10.9804919 2.95,9 C2.95,5.103393 6.10359727,1.95 10,1.95 Z M11.95,13.1171875 C11.95,14.0277566 11.5963304,16.1856359 11.3088716,17.2546095 C11.1757748,17.7465731 10.7168743,17.95 10,17.95 C9.28313669,17.95 8.82422922,17.7465627 8.69114068,17.2545078 C8.40387709,16.1863155 8.05,14.030791 8.05,13.1171875 C8.05,12.1876528 8.75460924,11.8 10,11.8 C11.2453908,11.8 11.95,12.1876528 11.95,13.1171875 Z M11.05,13.1171875 C11.05,12.8412327 10.589751,12.6848787 9.99999336,12.684957 C9.41033132,12.6850353 8.95,12.8414581 8.95,13.1171875 C8.95,13.7858443 9.17483118,15.2969593 9.42808784,16.4653944 C9.43947589,16.5174314 9.43947589,16.5174314 9.45254137,16.5751986 C9.50956821,16.8254758 9.73212203,17.0030313 9.98880538,17.0030313 L10.0115725,17.002968 C10.2682152,17.0029681 10.4908174,16.8252654 10.5477048,16.5748639 C10.557191,16.5328663 10.557191,16.5328663 10.5656773,16.4942983 C10.8205419,15.3273734 11.05,13.7921015 11.05,13.1171875 Z M12.05,9 C12.05,10.1321767 11.1321767,11.05 10,11.05 C8.86782326,11.05 7.95,10.1321767 7.95,9 C7.95,7.86782326 8.86782326,6.95 10,6.95 C11.1321767,6.95 12.05,7.86782326 12.05,9 Z M10.95,9 C10.95,8.47620799 10.523792,8.05 10,8.05 C9.47620799,8.05 9.05,8.47620799 9.05,9 C9.05,9.52379201 9.47620799,9.95 10,9.95 C10.523792,9.95 10.95,9.52379201 10.95,9 Z M13.0855842,10.6456747 C13.1146337,10.5940653 13.1388935,10.547936 13.1583945,10.5072508 C13.3834398,10.0377359 13.5,9.52540255 13.5,9 C13.5,7.01680949 11.8470792,5.42607119 9.8621879,5.50265623 C8.05785099,5.57228941 6.59061486,7.0254926 6.50412496,8.82868827 C6.4750802,9.43403747 6.60023848,10.0264619 6.86799166,10.5611179 C6.88048805,10.5855118 6.88048805,10.5855118 6.888266,10.6003672 C6.89803953,10.6185604 6.89803953,10.6185604 6.91482622,10.6489988 C7.05728494,10.9033432 7.02518243,11.2196706 6.83453125,11.4402188 C6.69134879,11.6058544 6.44100227,11.6240562 6.27536666,11.4808738 C6.24758281,11.4568562 6.22327115,11.4290944 6.20312797,11.398383 C6.11256863,11.2602981 6.04230573,11.1425789 5.99245338,11.0453291 C5.66850559,10.4133856 5.5,9.7162776 5.5,9 C5.5,6.50447574 7.54061717,4.48007802 10.0368125,4.50015625 C12.4615655,4.51965854 14.4490059,6.48169037 14.499,8.90543654 C14.5143807,9.65041307 14.3477956,10.3770722 14.013155,11.034351 C13.9625568,11.1337328 13.890906,11.2542131 13.7983328,11.3956635 C13.6782411,11.5791526 13.4321411,11.6305504 13.2486502,11.5104636 C13.2181302,11.4904895 13.1905078,11.4664054 13.1665625,11.4388906 C12.9745221,11.2182234 12.9420958,10.9005951 13.0855842,10.6456747 Z"/>
+</symbol>
+<symbol id="icon-post" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M5.56521739,4.0483871 L5.56521739,15.9516129 C5.56521739,16.2277553 5.78907502,16.4516129 6.06521739,16.4516129 L13.9347826,16.4516129 C14.210925,16.4516129 14.4347826,16.2277553 14.4347826,15.9516129 L14.4347826,7.64129078 C14.4347826,7.37420071 14.3279362,7.11820976 14.1380569,6.93037218 L11.0115347,3.8374685 C10.8243186,3.65226549 10.5716043,3.5483871 10.3082604,3.5483871 L6.06521739,3.5483871 C5.78907502,3.5483871 5.56521739,3.77224472 5.56521739,4.0483871 Z M11.659869,2.28908141 L15.7032743,6.28900925 C15.8931536,6.47684683 16,6.73283777 16,6.99992784 L16,17 C16,17.5522847 15.5522847,18 15,18 L5,18 C4.44771525,18 4,17.5522847 4,17 L4,3 C4,2.44771525 4.44771525,2 5,2 L10.9565947,2 C11.2199386,2 11.4726529,2.10387839 11.659869,2.28908141 Z M7.69999981,13.75 L7.69999981,13.75 C7.69999981,13.3357864 8.03578625,13 8.44999981,13 L11.4499998,13 C11.8642134,13 12.1999998,13.3357864 12.1999998,13.75 L12.1999998,13.75 C12.1999998,14.1642136 11.8642134,14.5 11.4499998,14.5 L8.44999981,14.5 C8.03578625,14.5 7.69999981,14.1642136 7.69999981,13.75 Z M7.69999981,10.75 L7.69999981,10.75 C7.69999981,10.3357864 8.03578625,10 8.44999981,10 L11.4499998,10 C11.8642134,10 12.1999998,10.3357864 12.1999998,10.75 L12.1999998,10.75 C12.1999998,11.1642136 11.8642134,11.5 11.4499998,11.5 L8.44999981,11.5 C8.03578625,11.5 7.69999981,11.1642136 7.69999981,10.75 Z"/>
+</symbol>
+<symbol id="icon-queue" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M9.62955558,11.9862245 L2.37300768,7.78176062 C2.15091945,7.65409073 2.01311169,7.416206 2.0106214,7.15786528 C2.00813143,6.89955757 2.14129163,6.65901818 2.36020049,6.52732611 L9.6535239,2.10313876 C9.87914543,1.96609151 10.1606874,1.96561287 10.3865318,2.10175758 L17.6418048,6.46183753 C17.861068,6.59346187 17.9945254,6.83317285 17.993034,7.09104148 C17.9915424,7.34892982 17.8553001,7.58705548 17.6346396,7.71596732 L10.3422509,11.984796 C10.2333967,12.0486462 10.1098064,12.0822207 9.98397475,12.0820542 C9.85906302,12.0820281 9.73667568,12.0493634 9.62955558,11.9862245 Z M4.14583207,7.13619158 L9.98274047,10.5187139 L15.8592137,7.07849418 L10.0226701,3.57160306 L4.14583207,7.13619158 Z M9.62953985,14.9474539 L2.37682919,10.7442362 C2.14790798,10.6193893 2.00403308,10.3787052 2.0000834,10.1157081 C1.99613452,9.85276374 2.13265787,9.6077987 2.35762507,9.47591487 C2.58390925,9.34325898 2.86347428,9.3462907 3.08245307,9.48114182 L9.98273406,13.4790575 L16.9169172,9.41994593 C17.1397182,9.28474408 17.417234,9.28254993 17.64209,9.41422856 C17.8656422,9.5451437 18.0020715,9.78779035 17.9999762,10.0490342 C17.9978807,10.310306 17.8575468,10.5506963 17.6346396,10.6763028 L10.3424068,14.9450399 C10.2335213,15.0090441 10.109818,15.0426576 9.98388346,15.0423896 C9.85986509,15.0423479 9.73795483,15.0101211 9.62953985,14.9474539 Z M9.62953985,17.9050801 L2.37682919,13.7018624 C2.14790798,13.5770154 2.00403308,13.3363314 2.0000834,13.0733343 C1.99613452,12.8103899 2.13265787,12.5654249 2.35762507,12.433541 C2.58390925,12.3008851 2.86347428,12.3039169 3.08245307,12.438768 L9.98273408,16.4366837 L16.9223366,12.3744016 C17.2654963,12.1809876 17.6975079,12.3041991 17.8915718,12.6493519 C18.0843814,12.992274 17.9719233,13.4292844 17.6346396,13.6339289 L10.3424068,17.9026661 C10.2335213,17.9666703 10.109818,18.0002838 9.98388346,18.0000158 C9.85986509,17.9999741 9.73795483,17.9677473 9.62953985,17.9050801 Z"/>
+</symbol>
+<symbol id="icon-quote" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M8.0952381,7.71422222 C8.0952381,6.39928593 7.02927016,5.33333333 5.71428571,5.33333333 C4.39932202,5.33333333 3.33333333,6.39932202 3.33333333,7.71428571 L3.33333333,8.66666667 C3.33333333,9.45564488 3.97292655,10.0952381 4.76190476,10.0952381 C5.01622226,10.0952381 5.24838522,10.2399291 5.36040964,10.4682445 C5.7463125,11.2547477 5.71927332,12.1940215 5.30895345,13.2915646 C5.2635387,13.4130421 5.19561509,13.5710758 5.10518262,13.7656655 L5.10516725,13.7656583 C5.0586117,13.8658351 5.10208028,13.9847852 5.20225705,14.0313407 C5.26488644,14.0604467 5.3381002,14.0551845 5.39592335,14.017421 C5.67324106,13.8363086 5.88943617,13.6697674 6.04450868,13.5177975 C7.27582192,12.3111199 8.0952381,10.2392411 8.0952381,7.71422222 Z M2,8.66666667 L2,7.71428571 C2,5.66294236 3.66294236,4 5.71428571,4 C7.76564553,4 9.42857143,5.66290197 9.42857143,7.71422222 C9.42857143,12.4400033 6.81502438,16 3.42857143,16 C2.89042744,16 2.57405038,15.3952782 2.88090538,14.9531934 C3.98482067,13.3627871 4.41809104,12.1678353 4.27097871,11.3850713 C2.97982128,11.1534427 2,10.0244794 2,8.66666667 Z M12.8424073,11.3850713 C11.5512498,11.1534427 10.5714286,10.0244794 10.5714286,8.66666667 L10.5714286,7.71428571 C10.5714286,5.66294236 12.2343709,4 14.2857143,4 C16.3370741,4 18,5.66290197 18,7.71422222 C18,12.4400033 15.3864529,16 12,16 C11.461856,16 11.1454789,15.3952782 11.452334,14.9531934 C12.5562492,13.3627871 12.9895196,12.1678353 12.8424073,11.3850713 Z M16.6666667,7.71422222 C16.6666667,6.39928593 15.6006987,5.33333333 14.2857143,5.33333333 C12.9707506,5.33333333 11.9047619,6.39932202 11.9047619,7.71428571 L11.9047619,8.66666667 C11.9047619,9.45564488 12.5443551,10.0952381 13.3333333,10.0952381 C13.5876508,10.0952381 13.8198138,10.2399291 13.9318382,10.4682445 C14.3101542,11.2392851 14.2916055,12.1571483 13.904138,13.2270151 C13.8547002,13.3635217 13.7779392,13.5440692 13.673855,13.7686578 L13.6738131,13.7686384 C13.6273572,13.8688792 13.6709584,13.9878004 13.7711991,14.0342564 C13.8337008,14.0632224 13.9067089,14.0579924 13.9644435,14.0204131 C14.2348893,13.8443809 14.4461273,13.6826212 14.5981574,13.5351337 C15.8393561,12.3310224 16.6666667,10.2513752 16.6666667,7.71422222 Z"/>
+</symbol>
+<symbol id="icon-reload" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M13.1042798,11.7097994 L17,11.7097994 C17.5522847,11.7097994 18,12.1575147 18,12.7097994 L18,16.571693 C18,16.9503809 17.6930128,17.2573682 17.3143249,17.2573682 L17.3143249,17.2573682 C16.935637,17.2573682 16.6286498,16.9503809 16.6286498,16.571693 L16.6286498,14.597863 C16.3534655,14.985498 16.0563396,15.3585052 15.7144163,15.6922004 C14.1995315,17.1796583 12.1900463,17.9988115 10.0562254,17.9988115 C5.86629335,17.9988115 2.4178047,14.8785327 2.03474087,10.740712 C2.0338126,10.7303075 2.0328966,10.7195681 2.03199287,10.7084936 L2.03196661,10.7084957 C2.00250464,10.3474625 2.27129625,10.0309036 2.63232948,10.0014416 C2.65007449,9.99999355 2.66787111,9.99926861 2.6856751,9.99926861 L2.72610572,9.99924635 C3.07649085,9.99924635 3.36902567,10.2665029 3.40060568,10.615462 C3.40060568,10.615462 3.40060568,10.615462 3.40060568,10.615462 C3.71784469,14.042009 6.57939546,16.6274613 10.0562254,16.6274613 C11.8280098,16.6274613 13.4974001,15.9481858 14.7553854,14.7130564 C15.1640478,14.3126221 15.5196846,13.8609908 15.8122393,13.3700474 C15.8670933,13.2777098 15.9054911,13.1762299 15.9566882,13.0811496 L13.1042798,13.0811496 C12.7255919,13.0811496 12.4186047,12.7741624 12.4186047,12.3954745 L12.4186047,12.3954745 C12.4186047,12.0167866 12.7255919,11.7097994 13.1042798,11.7097994 Z M7.58230958,7.60333695 L7.58230958,7.60333695 C7.58230958,7.98202486 7.27532238,8.28901206 6.89663448,8.28901206 L3.00091423,8.28901206 C2.44862948,8.28901206 2.00091423,7.84129681 2.00091423,7.28901206 L2.00091423,3.42711845 C2.00091423,3.04843055 2.30790143,2.74144335 2.68658934,2.74144335 L2.68658934,2.74144335 C3.06527724,2.74144335 3.37226444,3.04843055 3.37226444,3.42711845 L3.37226444,5.40094852 C3.64836295,5.01331352 3.94548883,4.64030627 4.28558368,4.30752528 C5.80138278,2.82006742 7.81178218,2 9.94377464,2 C14.1346209,2 17.5831095,5.12027884 17.9661734,9.25901377 C17.9670069,9.26791637 17.9678287,9.27707069 17.9686385,9.28647674 L17.9686336,9.28647716 C17.9997472,9.6478419 17.7320258,9.96600846 17.3706611,9.99712208 C17.3519257,9.9987352 17.3331296,9.99954288 17.3143249,9.99954288 L17.2758135,9.99953746 C16.9259272,9.99953746 16.6334066,9.73349523 16.6003086,9.38517799 C16.6003086,9.38517799 16.6003086,9.38517799 16.6003086,9.38517799 C16.2839838,5.95680247 13.4215188,3.37135021 9.94377464,3.37135021 C8.17290441,3.37135021 6.50442832,4.05153991 5.24552883,5.28666933 C4.8377807,5.68618936 4.48214388,6.1378207 4.18867493,6.6296783 C4.13382092,6.72201588 4.09450889,6.82258157 4.04422604,6.91766185 L6.89663448,6.91766185 C7.27532238,6.91766185 7.58230958,7.22464905 7.58230958,7.60333695 Z"/>
+</symbol>
+<symbol id="icon-reply-directly" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M4.97783071,10.8395119 L8.3227205,14.2589793 C8.63824773,14.5815415 8.63824773,15.0970975 8.3227205,15.4196598 L8.3227205,15.4196598 C8.01603557,15.7331825 7.51325788,15.7387257 7.19973511,15.4320408 C7.19556273,15.4279594 7.19143548,15.4238321 7.18735411,15.4196598 L2.68401754,10.8159169 C2.30382986,10.4272526 2.30382986,9.80604448 2.68401754,9.41738015 L7.4372152,4.55820531 C7.73220276,4.25664071 8.21580384,4.25130896 8.51736845,4.54629653 C8.52138168,4.55022224 8.52535151,4.55419207 8.52927722,4.55820531 L8.52927722,4.55820531 C8.83276982,4.86846457 8.83276982,5.36435666 8.52927722,5.67461592 L5.02143506,9.26066884 L15.4154183,9.26066884 C16.8446394,9.26066884 18,10.3956904 18,11.8043355 L18,14.0715077 C18,14.5148958 17.6405629,14.874333 17.1971747,14.874333 L17.1971747,14.874333 C16.7537866,14.874333 16.3943494,14.5148958 16.3943494,14.0715077 L16.3943494,11.8043355 C16.3943494,11.2679881 15.9581951,10.8395119 15.4154183,10.8395119 L4.97783071,10.8395119 Z" id="path-1"/>
+</symbol>
+<symbol id="icon-reply" viewBox="0 0 576 512" fill="currentColor">
+  <path d="M11.093 251.65l175.998 184C211.81 461.494 256 444.239 256 408v-87.84c154.425 1.812 219.063 16.728 181.19 151.091-8.341 29.518 25.447 52.232 49.68 34.51C520.16 481.421 576 426.17 576 331.19c0-171.087-154.548-201.035-320-203.02V40.016c0-36.27-44.216-53.466-68.91-27.65L11.093 196.35c-14.791 15.47-14.791 39.83 0 55.3zm23.127-33.18l176-184C215.149 29.31 224 32.738 224 40v120c157.114 0 320 11.18 320 171.19 0 74.4-40 122.17-76.02 148.51C519.313 297.707 395.396 288 224 288v120c0 7.26-8.847 10.69-13.78 5.53l-176-184a7.978 7.978 0 0 1 0-11.06z"/>
+</symbol>
+<symbol id="icon-report" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M9.98344445,7.04264254 C10.4190789,7.04264254 10.7723523,7.39520794 10.7723523,7.83027001 L10.7723523,12.3994926 C10.7723523,12.8345547 10.4190789,13.1871201 9.98344445,13.1871201 C9.54780997,13.1871201 9.19453663,12.8345547 9.19453663,12.3994926 L9.19453663,7.83027001 C9.19453663,7.39520794 9.54780997,7.04264254 9.98344445,7.04264254 Z M0.959352356,16.870054 L9.04441459,2.40226256 C9.32933111,1.8924195 9.98368057,1.7021729 10.5098756,1.97341266 C10.6984618,2.07062387 10.853564,2.21970064 10.9555854,2.40226256 L19.0406476,16.870054 C19.3644696,17.4495162 18.9313899,18.15 18.2590107,18.15 L1.74098931,18.15 C1.06861014,18.15 0.635530413,17.4495162 0.959352356,16.870054 Z M9.96597455,13.7448416 C10.4490813,13.7448416 10.8196237,14.1257886 10.8196237,14.6151726 C10.8196237,15.1078483 10.450184,15.4898784 9.96597455,15.4898784 C9.48176512,15.4898784 9.11232535,15.1078483 9.11232535,14.6151726 C9.11232535,14.1257886 9.48286785,13.7448416 9.96597455,13.7448416 Z M2.73547986,16.7123645 L17.2645201,16.7123645 L10,3.71288982 L2.73547986,16.7123645 Z" id="path-1"/>
+</symbol>
+<symbol id="icon-send-active" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M6.17128955,10.3113516 L1.4023605,7.81532073 C0.800097524,7.50009965 0.894239118,6.61046089 1.54913796,6.4282727 L17.3636017,2.02880161 C17.9957995,1.8529287 18.5330628,2.51639359 18.2295918,3.09821027 L10.6382478,17.6523886 C10.3238797,18.2550973 9.43410858,18.1622153 9.25099335,17.5075751 L7.86389707,12.548681 L11.6158714,7.64901991 L6.17128955,10.3113516 Z"/>
+</symbol>
+<symbol id="icon-send" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M10.0179189,15.2320901 L8.76791893,10.6920901 L14.9699189,5.59409012 L10.0179189,15.2320901 Z M3.72691893,7.34509012 L14.0429189,4.43309012 L7.83991893,9.53109012 L3.72691893,7.34509012 Z M17.8359189,2.27609012 C17.6519189,2.04509012 17.3459189,1.94809012 17.0669189,2.02709012 L1.53891893,6.41209012 C1.24791893,6.49409012 1.03591893,6.74909012 1.00391893,7.05309012 C0.972918926,7.35809012 1.12791893,7.65209012 1.39491893,7.79409012 L7.30491893,10.9340901 L9.10091893,17.4540901 C9.18191893,17.7490901 9.43291893,17.9640901 9.73391893,17.9960901 C9.75891893,17.9990901 9.78591893,18.0000901 9.80991893,18.0000901 C10.0819189,18.0000901 10.3349189,17.8470901 10.4629189,17.5980901 L17.9169189,3.09309012 C18.0519189,2.82909012 18.0209189,2.50809012 17.8359189,2.27609012 Z"/>
+</symbol>
+<symbol id="icon-share" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M9.2826087,4.66628243 L7.81818082,6.07497537 C7.52990623,6.35227846 7.07404495,6.35227846 6.78577036,6.07497537 L6.78577036,6.07497537 C6.51152846,5.8111709 6.50306726,5.37499814 6.76687173,5.10075624 C6.77304849,5.0943351 6.77934922,5.08803437 6.78577036,5.08185761 L9.2963023,2.66687448 C9.6834527,2.29445871 10.2956706,2.29445871 10.682821,2.66687448 L13.193353,5.08185761 C13.4675949,5.34566208 13.4760561,5.78183485 13.2122516,6.05607674 C13.2060749,6.06249788 13.1997741,6.06879861 13.193353,6.07497537 L13.193353,6.07497537 C12.9050784,6.35227846 12.4492171,6.35227846 12.1609425,6.07497537 L10.7173913,4.68636454 L10.7173913,12.6820222 C10.7173913,13.0782265 10.3962043,13.3994135 10,13.3994135 L10,13.3994135 C9.60379572,13.3994135 9.2826087,13.0782265 9.2826087,12.6820222 L9.2826087,4.66628243 Z M12.3913043,9.56559144 L12.3913043,8.1854155 L14.5,8.1854155 C15.0522847,8.1854155 15.5,8.63313075 15.5,9.1854155 L15.5,17 C15.5,17.5522847 15.0522847,18 14.5,18 L5.5,18 C4.94771525,18 4.5,17.5522847 4.5,17 L4.5,9.1854155 C4.5,8.63313075 4.94771525,8.1854155 5.5,8.1854155 L7.60869565,8.1854155 L7.60869565,9.56559144 L5.93478261,9.56559144 L5.93478261,16.6198241 L14.0652174,16.6198241 L14.0652174,9.56559144 L12.3913043,9.56559144 Z"/>
+</symbol>
+<symbol id="icon-shield-alt" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M16.5634606,4.43985056 C17.2203536,4.71330239 17.65,5.35910027 17.65,6.07323887 C17.65,11.6074651 14.7408211,16.3197059 10.6777136,18.0145133 C10.2432,18.1951858 9.75368361,18.1951639 9.31885591,18.0143605 C5.24652225,16.3146728 2.35,11.4967576 2.35,6.07323887 C2.35,5.35806806 2.78065408,4.71262465 3.43960311,4.43985055 L9.32238332,1.98544685 C9.75721162,1.80482366 10.2459134,1.8048491 10.6811077,1.98562473 L16.5634606,4.43985056 Z M10.0771359,16.560036 C13.4472864,15.2212106 16.0750853,10.7589742 16.0724265,6.07323887 C16.0724265,5.9925855 16.0269548,5.92362138 15.9549216,5.89356782 L10.0706297,3.43852492 C10.0256153,3.41936846 9.97139556,3.41951627 9.92436743,3.43934205 L4.04365897,5.89287596 C3.97148842,5.92349719 3.9245098,5.99445698 3.9245098,6.07323887 C3.9245098,10.7602943 6.55399678,15.2218703 9.9235012,16.5590516 C9.97468601,16.5795526 10.0294474,16.5796264 10.0771359,16.560036 Z M7.11413172,7.54798178 C7.30712861,9.10959366 8.01718272,10.699291 9.25,12.3177854 L9.25,6.7370206 L7.11413172,7.54798178 Z M9.45661392,14.8609244 C6.99512655,12.2735323 5.69425768,9.68019131 5.5698334,7.08354827 C5.55429297,6.75923101 5.74920654,6.46174325 6.05275238,6.34649088 L9.73377853,4.94885352 C10.2245557,4.76251188 10.75,5.1250518 10.75,5.65001408 L10.75,14.3439799 C10.75,15.0212122 9.92340254,15.3515891 9.45661392,14.8609244 Z"/>
+</symbol>
+<symbol id="icon-shield-check" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M16.5634606,4.43985056 C17.2203536,4.71330239 17.65,5.35910027 17.65,6.07323887 C17.65,11.6074651 14.7408211,16.3197059 10.6777136,18.0145133 C10.2432,18.1951858 9.75368361,18.1951639 9.31885591,18.0143605 C5.24652225,16.3146728 2.35,11.4967576 2.35,6.07323887 C2.35,5.35806806 2.78065408,4.71262465 3.43960311,4.43985055 L9.32238332,1.98544685 C9.75721162,1.80482366 10.2459134,1.8048491 10.6811077,1.98562473 L16.5634606,4.43985056 Z M10.0771359,16.560036 C13.4472864,15.2212106 16.0750853,10.7589742 16.0724265,6.07323887 C16.0724265,5.9925855 16.0269548,5.92362138 15.9549216,5.89356782 L10.0706297,3.43852492 C10.0256153,3.41936846 9.97139556,3.41951627 9.92436743,3.43934205 L4.04365897,5.89287596 C3.97148842,5.92349719 3.9245098,5.99445698 3.9245098,6.07323887 C3.9245098,10.7602943 6.55399678,15.2218703 9.9235012,16.5590516 C9.97468601,16.5795526 10.0294474,16.5796264 10.0771359,16.560036 Z M12.9976656,6.78918962 C13.2757126,6.507667 13.7293335,6.50484948 14.0110768,6.78311497 C14.2967871,7.07232303 14.2967871,7.52767697 14.0171492,7.81081038 L9.33585469,12.5506211 C9.02538174,12.8649749 8.51885952,12.868121 8.20428493,12.5574296 L8.19747865,12.5506211 L6.20027998,10.5284574 C5.91098135,10.2355426 5.91098135,9.76445743 6.20027998,9.47154256 C6.48783406,9.18039406 6.95696519,9.1774802 7.24942922,9.46634978 L8.80152299,11.037784 L12.9976656,6.78918962 Z"/>
+</symbol>
+<symbol id="icon-shield" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M16.5634606,4.43985056 C17.2203536,4.71330239 17.65,5.35910027 17.65,6.07323887 C17.65,11.6074651 14.7408211,16.3197059 10.6777136,18.0145133 C10.2432,18.1951858 9.75368361,18.1951639 9.31885591,18.0143605 C5.24652225,16.3146728 2.35,11.4967576 2.35,6.07323887 C2.35,5.35806806 2.78065408,4.71262465 3.43960311,4.43985055 L9.32238332,1.98544685 C9.75721162,1.80482366 10.2459134,1.8048491 10.6811077,1.98562473 L16.5634606,4.43985056 Z M10.0771359,16.560036 C13.4472864,15.2212106 16.0750853,10.7589742 16.0724265,6.07323887 C16.0724265,5.9925855 16.0269548,5.92362138 15.9549216,5.89356782 L10.0706297,3.43852492 C10.0256153,3.41936846 9.97139556,3.41951627 9.92436743,3.43934205 L4.04365897,5.89287596 C3.97148842,5.92349719 3.9245098,5.99445698 3.9245098,6.07323887 C3.9245098,10.7602943 6.55399678,15.2218703 9.9235012,16.5590516 C9.97468601,16.5795526 10.0294474,16.5796264 10.0771359,16.560036 Z"/>
+</symbol>
+<symbol id="icon-sign-out" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M12.6111967,18.0001067 L3.00125156,18.0001067 C2.44827559,18.0001067 2,17.5523914 2,17.0001067 L2,3.00010667 C2,2.44782192 2.44827559,2.00010667 3.00125156,2.00010667 L12.4385671,2.00010667 L12.9405155,1.99997633 C13.4928002,1.99993711 13.9405473,2.44762057 13.9405865,2.99990531 C13.9405865,2.99993688 13.9405865,2.99996844 13.9405865,3 L13.9404444,5 L12.4385671,5 L12.4385671,3.65527908 L3.67651425,3.65527908 L3.67651425,16.3449343 L12.4385671,16.3449343 L12.4385671,15 L13.9404444,15 L13.9405965,17.0001067 C13.9406096,17.5523914 13.4929049,18.0001173 12.9406202,18.0001303 C12.9405853,18.0001303 12.9405504,18.0001303 12.9405155,18.0001303 L12.6246372,18 C12.6201655,18.000071 12.6156853,18.0001067 12.6111967,18.0001067 Z M13.6346454,7.68763891 C13.6324021,7.68551041 13.6301715,7.68336955 13.6279538,7.68121644 C13.3080819,7.37066137 13.3109114,6.86986958 13.6342737,6.56266667 C13.9624396,6.25090026 14.4907264,6.25081211 14.8190051,6.56246899 L17.6907645,9.28882239 C17.6936149,9.29152839 17.6964489,9.29425019 17.6992665,9.29698762 C18.1035414,9.68976017 18.099735,10.3229146 17.6907645,10.7111776 L14.8190051,13.437531 C14.4907264,13.7491879 13.9624396,13.7490997 13.6342737,13.4373333 C13.6320318,13.4352035 13.6298027,13.4330612 13.6275864,13.4309068 C13.3079197,13.1201568 13.3110801,12.6193669 13.6346454,12.3123611 L15.2285812,10.8 L7.81922473,10.8 C7.35917599,10.8 6.9862328,10.4418278 6.9862328,10 C6.9862328,9.5581722 7.35917599,9.2 7.81922473,9.2 L15.2285812,9.2 L13.6346454,7.68763891 Z"/>
+</symbol>
+<symbol id="icon-sort-amount-down" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M2.61538462,6.32 C2.27551708,6.32 2,6.02450793 2,5.66 C2,5.29549207 2.27551708,5 2.61538462,5 L11.6410256,5 C11.9808932,5 12.2564103,5.29549207 12.2564103,5.66 C12.2564103,6.02450793 11.9808932,6.32 11.6410256,6.32 L2.61538462,6.32 Z M2.61538462,10.32 C2.27551708,10.32 2,10.0245079 2,9.66 C2,9.29549207 2.27551708,9 2.61538462,9 L10,9 C10.3398675,9 10.6153846,9.29549207 10.6153846,9.66 C10.6153846,10.0245079 10.3398675,10.32 10,10.32 L2.61538462,10.32 Z M2.61538462,14.32 C2.27551708,14.32 2,14.0245079 2,13.66 C2,13.2954921 2.27551708,13 2.61538462,13 L8.35897436,13 C8.6988419,13 8.97435897,13.2954921 8.97435897,13.66 C8.97435897,14.0245079 8.6988419,14.32 8.35897436,14.32 L2.61538462,14.32 Z M16.7982438,13.4418535 C17.0731164,13.1634365 17.5161519,13.1634365 17.7910245,13.4418535 C18.0696585,13.7240806 18.0696585,14.1847364 17.7910245,14.4669634 L15.4963903,16.7911872 C15.2215178,17.0696043 14.7784822,17.0696043 14.5036097,16.7911872 L12.2089755,14.4669634 C11.9303415,14.1847364 11.9303415,13.7240806 12.2089755,13.4418535 C12.4838481,13.1634365 12.9268836,13.1634365 13.2017562,13.4418535 L14.2946341,14.5488243 L14.2946341,3.72136775 C14.2946341,3.32133923 14.6118824,3 15,3 C15.3881176,3 15.7053659,3.32133923 15.7053659,3.72136775 L15.7053659,14.5488243 L16.7982438,13.4418535 Z"/>
+</symbol>
+<symbol id="icon-sort-down" viewBox="0 0 16 16" fill="currentColor">
+  <g stroke-width="1.5" fill="none" fill-rule="evenodd">
+    <path stroke="#CBCED1" d="M10.657 6L8 3.343 5.343 6"/>
+    <path stroke="#9EA2A8" d="M10.657 10L8 12.657 5.343 10"/>
+  </g>
+</symbol>
+<symbol id="icon-sort-up" viewBox="0 0 16 16" fill="currentColor">
+  <g stroke-width="1.5" fill="none" fill-rule="evenodd">
+    <path stroke="#CBCED1" d="M10.657 10L8 12.657 5.343 10"/>
+    <path stroke="#9EA2A8" d="M10.657 6L8 3.343 5.343 6"/>
+  </g>
+</symbol>
+<symbol id="icon-sort" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M12.2343103,8.86260804 C12.1542295,9.07653489 11.9842551,9.19005197 11.7513424,9.19005197 L11.4252683,9.19005197 C11.2628163,9.19005197 11.1277358,9.11883097 11.032942,8.98317129 C10.9377629,8.84696013 10.9164747,8.69056993 10.9711723,8.52628794 L12.7505296,3.53531327 C12.8306104,3.32138642 13.0005848,3.20786934 13.2334975,3.20786934 L13.7077872,3.20786934 C13.9406999,3.20786934 14.1106743,3.32138642 14.1915262,3.53742379 L15.9711023,8.52916085 C16.02481,8.69056993 16.0035218,8.84696013 15.9083427,8.98317129 C15.8135489,9.11883097 15.6784684,9.19005197 15.5160164,9.19005197 L15.1602992,9.19005197 C14.9449981,9.19005197 14.7862553,9.07439811 14.7055234,8.858546 L14.2928455,7.64587973 L12.6484342,7.64587973 L12.2343103,8.86260804 Z M13.8738844,6.44469191 L13.4695661,5.20542345 L13.0413472,6.44469191 L13.8738844,6.44469191 Z M7.96788361,13.4418535 C8.25247416,13.1634365 8.71117304,13.1634365 8.99576359,13.4418535 C9.28424861,13.7240806 9.28424861,14.1847364 8.99576359,14.4669634 L6.62000366,16.7911872 C6.33541312,17.0696043 5.87671424,17.0696043 5.59212369,16.7911872 L3.21636376,14.4669634 C2.92787875,14.1847364 2.92787875,13.7240806 3.21636376,13.4418535 C3.50095431,13.1634365 3.95965319,13.1634365 4.24424374,13.4418535 L5.37575992,14.5488243 L5.37575992,3.72136775 C5.37575992,3.32133923 5.70422437,3 6.10606368,3 C6.50790299,3 6.83636743,3.32133923 6.83636743,3.72136775 L6.83636743,14.5488243 L7.96788361,13.4418535 Z M15.2492285,15.5612472 C15.3833436,15.5612472 15.5015242,15.609996 15.5963195,15.7049593 C15.6918275,15.8006365 15.7413095,15.92102 15.7413095,16.0579065 L15.7413095,16.2954714 C15.7413095,16.4323579 15.6918275,16.5527414 15.5963195,16.6484186 C15.5015242,16.7433819 15.3833436,16.7921307 15.2492285,16.7921307 L11.6920562,16.7921307 C11.5579411,16.7921307 11.4397605,16.7433819 11.3449652,16.6484186 C11.2494572,16.5527414 11.1999752,16.4323579 11.1999752,16.2954714 L11.1999752,16.0579065 C11.1999752,15.9511091 11.2276366,15.8541227 11.2848679,15.7681859 L13.8866041,12.0408315 L11.8402717,12.0408315 C11.7061566,12.0408315 11.587976,11.9920827 11.4931807,11.8971194 C11.3976727,11.8014422 11.3481907,11.6810587 11.3481907,11.5441722 L11.3481907,11.3066073 C11.3481907,11.1697208 11.3976727,11.0493373 11.4931807,10.9536601 C11.587976,10.8586968 11.7061566,10.809948 11.8402717,10.809948 L15.2195854,10.809948 C15.3537005,10.809948 15.4718811,10.8586968 15.5666764,10.9536601 C15.6621844,11.0493373 15.7116664,11.1697208 15.7116664,11.3066073 L15.7116664,11.5441722 C15.7116664,11.6334363 15.6828784,11.7199532 15.626807,11.8041494 L14.1151274,13.9717593 C13.5377055,14.8023467 13.1610856,15.3424039 12.9935834,15.5612472 L15.2492285,15.5612472 Z"/>
+</symbol>
+<symbol id="icon-star-filled" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M5.32095293,16.3740404 L6,12.2111456 L3.08726218,9.2258155 C2.77871132,8.90957482 2.78494515,8.4030812 3.10118583,8.09453033 C3.22076978,7.97785422 3.37388242,7.90154562 3.5390396,7.87631185 L7.52786405,7.26687371 L9.27580674,3.54289024 C9.46353816,3.14292935 9.93995692,2.97088337 10.3399178,3.1586148 C10.5089253,3.2379426 10.6448655,3.37388274 10.7241933,3.54289024 L12.472136,7.26687371 L16.4609604,7.87631185 C16.8977198,7.94304275 17.1976872,8.35120231 17.1309563,8.78796173 C17.1057225,8.95311891 17.0294139,9.10623155 16.9127378,9.2258155 L14,12.2111456 L14.6790471,16.3740404 C14.7501775,16.8101049 14.4543399,17.2212677 14.0182754,17.2923981 C13.8411715,17.3212871 13.6594976,17.2897942 13.5024505,17.2029807 L10,15.2668737 L6.49754953,17.2029807 C6.11086883,17.4167325 5.6241221,17.276546 5.41037027,16.8898653 C5.32355678,16.7328182 5.29206392,16.5511443 5.32095293,16.3740404 Z"/>
+</symbol>
+<symbol id="icon-star" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M10,13.7208075 L12.6750343,15.1995301 C12.8200395,15.279687 13.0025696,15.2271171 13.0827265,15.0821118 C13.1152816,15.0232191 13.1270914,14.9550914 13.116258,14.8886775 L12.60157,11.7333849 L14.7954166,9.4848624 C14.9111232,9.36627215 14.9087855,9.17633704 14.7901952,9.06063046 C14.7453513,9.01687692 14.687934,8.9882612 14.6260001,8.97879853 L11.6078587,8.51766756 L10.2715725,5.67071629 C10.2011732,5.52073095 10.0225162,5.45621371 9.87253082,5.526613 C9.80915301,5.55636092 9.75817545,5.60733848 9.72842753,5.67071629 L8.39214134,8.51766756 L5.37399993,8.97879853 C5.21021514,9.00382262 5.09772737,9.15688245 5.12275146,9.32066724 C5.13221413,9.38260118 5.16082985,9.44001842 5.20458339,9.4848624 L7.39843004,11.7333849 L6.88374199,14.8886775 C6.85706809,15.0522017 6.96800718,15.2063877 7.13153138,15.2330616 C7.19794535,15.2438949 7.26607306,15.2320851 7.32496572,15.1995301 L10,13.7208075 Z M5.32095293,16.3740404 L6,12.2111456 L3.08726218,9.2258155 C2.77871132,8.90957482 2.78494515,8.4030812 3.10118583,8.09453033 C3.22076978,7.97785422 3.37388242,7.90154562 3.5390396,7.87631185 L7.52786405,7.26687371 L9.27580674,3.54289024 C9.46353816,3.14292935 9.93995692,2.97088337 10.3399178,3.1586148 C10.5089253,3.2379426 10.6448655,3.37388274 10.7241933,3.54289024 L12.472136,7.26687371 L16.4609604,7.87631185 C16.8977198,7.94304275 17.1976872,8.35120231 17.1309563,8.78796173 C17.1057225,8.95311891 17.0294139,9.10623155 16.9127378,9.2258155 L14,12.2111456 L14.6790471,16.3740404 C14.7501775,16.8101049 14.4543399,17.2212677 14.0182754,17.2923981 C13.8411715,17.3212871 13.6594976,17.2897942 13.5024505,17.2029807 L10,15.2668737 L6.49754953,17.2029807 C6.11086883,17.4167325 5.6241221,17.276546 5.41037027,16.8898653 C5.32355678,16.7328182 5.29206392,16.5511443 5.32095293,16.3740404 Z"/>
+</symbol>
+<symbol id="icon-strike" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M8.71102759,10.75 L5,10.75 C4.58578644,10.75 4.25,10.4142136 4.25,10 L4.25,10 C4.25,9.58578644 4.58578644,9.25 5,9.25 L6.88021354,9.25 C6.78204757,8.97819605 6.73413086,8.67389293 6.73413086,8.33496094 C6.73413086,6.70361328 8.06713867,5.61816406 10.0666504,5.61816406 C11.5263549,5.61816406 12.6771661,6.28678096 13.1446936,7.32020595 C13.1695523,7.37515376 13.1934632,7.44023864 13.2164262,7.51546057 L13.2164124,7.51546477 C13.3076018,7.81418196 13.1393672,8.13026367 12.8406501,8.22145303 C12.7871345,8.23778972 12.7314907,8.24609375 12.6755371,8.24609375 L12.6755371,8.24609375 C12.3043577,8.24609375 11.9639819,8.03966144 11.7924307,7.7105044 C11.7758164,7.67864214 11.7591627,7.65042465 11.7424631,7.62585529 C11.4203111,7.15188772 10.8206952,6.875 10.0476074,6.875 C8.92407227,6.875 8.17504883,7.41455078 8.17504883,8.23974609 C8.17504883,8.68801286 8.40182573,9.00498773 8.9290297,9.25 L15,9.25 C15.4142136,9.25 15.75,9.58578644 15.75,10 L15.75,10 C15.75,10.4142136 15.4142136,10.75 15,10.75 L12.9104183,10.75 C13.3255701,11.1645854 13.5134277,11.6936468 13.5134277,12.3720703 C13.5134277,14.1240234 12.1550293,15.222168 9.98413086,15.222168 C8.52589796,15.222168 7.41116742,14.6823785 6.86070505,13.7718969 C6.78574215,13.647906 6.71604692,13.4771436 6.65161933,13.2596098 L6.65162579,13.2596079 C6.56337292,12.9616302 6.73338846,12.6485285 7.03136614,12.5602756 C7.08324081,12.5449118 7.13706008,12.5371094 7.19116211,12.5371094 L7.19116211,12.5371094 C7.57915564,12.5371094 7.93595779,12.749696 8.12065234,13.0909099 C8.18486373,13.2095241 8.25166957,13.3024132 8.32107535,13.3695742 C8.70741909,13.7434222 9.32663713,13.9589844 10.092041,13.9589844 C11.2346191,13.9589844 12.0725098,13.3686523 12.0725098,12.5561523 C12.0725098,11.8579102 11.5393066,11.4389648 10.3269043,11.1533203 L9.14624023,10.8676758 C8.99355133,10.8319899 8.84851854,10.7927994 8.71102759,10.75 Z"/>
+</symbol>
+<symbol id="icon-team" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M6.86657437,15.5801347 C7.58520876,15.7682574 8.61292211,15.8834356 10,15.8834356 C11.3870779,15.8834356 12.4147912,15.7682574 13.1334256,15.5801347 C13.1334256,15.5801347 13.1334256,15.5801347 13.1334256,15.5801347 L13.1334256,15.5801347 C13.3467231,15.5242981 13.4743704,15.3061218 13.4185338,15.0928243 C13.4156155,15.0816766 13.412216,15.0706604 13.4083447,15.0598068 C13.3560829,14.9133484 13.3016442,14.8022725 13.245008,14.7265866 C13.048447,14.4639112 12.7512134,14.2644136 12.3414167,14.0828584 C12.1751031,14.0091753 11.493902,13.7453181 11.6235403,13.7970093 C10.8583075,13.4918853 10.4889643,13.1973464 10.4904585,12.5946518 C10.4894826,12.5804199 10.4894826,12.5804199 10.4878549,12.5450587 C10.4787009,12.3124853 10.4948505,12.0462084 10.5597349,11.7782171 C10.6248891,11.5091116 10.7329938,11.273234 10.9162262,11.070624 C11.3215627,10.6524954 11.5076401,10.2237165 11.5076401,9.57409489 C11.5076401,8.52183735 10.8166682,7.69529652 10,7.69529652 C9.18333181,7.69529652 8.49235993,8.52183735 8.49235993,9.57409489 C8.49235993,10.2233141 8.67417823,10.6409083 9.08236596,11.0798066 C9.25442021,11.2657361 9.36656959,11.4977744 9.43487978,11.7609169 C9.50592561,12.0345976 9.52317826,12.3065922 9.51239349,12.5456035 C9.51103565,13.1973374 9.14170293,13.4918771 8.37649193,13.7969964 C8.50598491,13.745362 7.82488309,14.0091814 7.6585833,14.0828584 C7.18242563,14.293814 6.85823893,14.5289935 6.66737023,14.859359 C6.63917247,14.9081651 6.61132271,14.9727022 6.58382094,15.0529703 L6.58380312,15.0529642 C6.5107355,15.2662232 6.62438304,15.4983368 6.83764199,15.5714044 C6.84717504,15.5746706 6.85682578,15.5775827 6.86657437,15.5801347 C6.86657437,15.5801347 6.86657437,15.5801347 6.86657437,15.5801347 Z M8.41301258,12.0555746 C8.38848883,11.9611049 8.35617332,11.8942438 8.32485707,11.8603996 C7.73348712,11.2245407 7.43293718,10.5342476 7.43293718,9.57409489 C7.43293718,7.93442756 8.56627192,6.57873211 10,6.57873211 C11.4337281,6.57873211 12.5670628,7.93442756 12.5670628,9.57409489 C12.5670628,10.5373024 12.2584598,11.2484176 11.6706597,11.8542617 C11.6419002,11.8861451 11.6102585,11.9551853 11.5862644,12.0542877 C11.5511914,12.1991492 11.5411139,12.3653087 11.5463673,12.4987805 C11.5470866,12.5141241 11.5470866,12.5141241 11.5483871,12.5527489 C11.5483871,12.5399871 11.6317888,12.6064972 11.9984178,12.7526844 C11.8450907,12.6915478 12.5594238,12.9682384 12.7519619,13.0535399 C13.9434799,13.5814266 14.6044143,14.3817972 14.6044143,15.8021897 L14.6044143,15.811279 C14.6044143,15.9821073 14.5261213,16.143513 14.3919611,16.2492643 C14.2305253,16.3765154 13.9120694,16.5267941 13.3888066,16.6637728 C12.5805555,16.8753551 11.468373,17 10,17 C8.53162703,17 7.41944446,16.8753551 6.61119342,16.6637728 C6.08793058,16.5267941 5.7694747,16.3765154 5.6080389,16.2492643 L5.6080389,16.2492643 C5.47387866,16.143513 5.39558574,15.9821073 5.39558574,15.811279 L5.39558574,15.8021897 C5.39558574,14.3817972 6.05652011,13.5814266 7.24803809,13.0535399 C7.44057617,12.9682384 8.15490931,12.6915478 8.00158221,12.7526844 C8.3631231,12.608526 8.44924343,12.5418485 8.45342959,12.5064246 C8.46012239,12.3605742 8.44975369,12.1971077 8.41301258,12.0555746 Z M3.47098863,12.0014026 C3.78075717,12.0824932 4.15745324,12.1514588 4.60692149,12.203346 C4.8087471,12.226645 5.13981933,12.2528572 5.60013818,12.2819824 L5.5522539,13.3974058 C5.06219408,13.3663747 4.70863249,13.3383301 4.49156913,13.313272 C3.99632282,13.2561001 3.57299989,13.1785981 3.21560769,13.0850407 C2.69234485,12.948062 2.37388896,12.7977833 2.21245316,12.6705322 L2.21245316,12.6705322 C2.07829293,12.5647809 2,12.4033752 2,12.2325469 L2,12.2234576 C2,10.8030651 2.66093437,10.0026945 3.85245235,9.47480778 C4.04447471,9.38973473 4.75550061,9.11429655 4.60720989,9.17346832 C4.96772733,9.02964676 5.05366231,8.96307734 5.05784385,8.92769246 C5.06453666,8.78184213 5.05416795,8.61837559 5.01742684,8.47684253 C4.99290309,8.38237283 4.96058758,8.3155117 4.92927133,8.28166745 C4.33790139,7.64580855 4.03735144,6.95551548 4.03735144,5.99536278 C4.03735144,4.35569545 5.17068619,3 6.60441426,3 C7.67849915,3 8.58399321,3.76086178 8.97068536,4.83197803 C9.05700455,5.07107749 9.13748521,5.33482507 9.21212735,5.62322077 L8.1527046,5.62322077 C8.05703849,5.35242305 7.95146001,5.11560067 7.83596917,4.91275364 C7.56018184,4.42836334 7.10600648,4.11656442 6.60441426,4.11656442 C5.78774607,4.11656442 5.09677419,4.94310524 5.09677419,5.99536278 C5.09677419,6.64458199 5.27859249,7.06217619 5.68678023,7.50107454 C5.85883447,7.68700398 5.97098386,7.91904226 6.03929404,8.18218479 C6.11033987,8.45586549 6.12759252,8.72786013 6.11680775,8.96687136 C6.11544992,9.61860526 5.74611719,9.91314495 4.98090619,10.2182643 C5.11039917,10.1666298 4.42929735,10.4304493 4.26299756,10.5041263 C3.73380435,10.7385786 3.39232121,11.0029516 3.21294235,11.3946582 C3.18987765,11.4450242 3.16663567,11.5138699 3.14321641,11.6011954 L3.14323196,11.6011996 C3.10123401,11.757801 3.19126735,11.9194342 3.34652355,11.9661607 C3.39177333,11.9797792 3.43326169,11.9915265 3.47098863,12.0014026 Z M16.5290114,12.0014026 C16.5664735,11.9915958 16.6076443,11.979944 16.652524,11.9664472 L16.652536,11.9664871 C16.80813,11.9196947 16.8982079,11.7575526 16.8557351,11.6007244 C16.8295817,11.5041548 16.8035144,11.4286792 16.777533,11.3742976 C16.5957213,10.9937475 16.2569747,10.7344933 15.7370024,10.5041263 C15.5707027,10.4304493 14.8896008,10.1666298 15.0190938,10.2182643 C14.2538828,9.91314495 13.8845501,9.61860526 13.8831923,8.96687136 C13.8724075,8.72786013 13.8896601,8.45586549 13.960706,8.18218479 C14.0290161,7.91904226 14.1411655,7.68700398 14.3132198,7.50107454 C14.7214075,7.06217619 14.9032258,6.64458199 14.9032258,5.99536278 C14.9032258,4.94310524 14.2122539,4.11656442 13.3955857,4.11656442 C12.9029372,4.11656442 12.4560297,4.41734333 12.1789526,4.88700809 C12.0574618,5.09294345 11.9600642,5.33834768 11.8867599,5.62322077 L10.8273371,5.62322077 C10.8731162,5.34911562 10.9369601,5.095158 11.018869,4.86134789 C11.3995118,3.77479702 12.3117095,3 13.3955857,3 C14.8293138,3 15.9626486,4.35569545 15.9626486,5.99536278 C15.9626486,6.95551548 15.6620986,7.64580855 15.0707287,8.28166745 C15.0394124,8.3155117 15.0070969,8.38237283 14.9825732,8.47684253 C14.945832,8.61837559 14.9354633,8.78184213 14.9421561,8.92769246 C14.9463423,8.96311643 15.0324626,9.02979388 15.3940035,9.17395233 C15.2406764,9.11281569 15.9550096,9.38950625 16.1475476,9.47480778 C17.3390656,10.0026945 18,10.8030651 18,12.2234576 L18,12.2325469 C18,12.4033752 17.9217071,12.5647809 17.7875468,12.6705322 C17.626111,12.7977833 17.3076552,12.948062 16.7843923,13.0850407 C16.4270001,13.1785981 16.0036772,13.2561001 15.5084309,13.313272 C15.2913675,13.3383301 15.1282552,13.3663747 15.0190938,13.3974058 L15.0190938,12.2819824 C15.8191932,12.1489896 16.322499,12.055463 16.5290114,12.0014026 Z"/>
+</symbol>
+<symbol id="icon-th-list" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M15.4857143,3 C16.8726857,3 18,4.11367742 18,5.48387097 L18,14.516129 C18,15.8863226 16.8726857,17 15.4857143,17 L4.51428571,17 C3.12731429,17 2,15.8863226 2,14.516129 L2,5.48387097 C2,4.11367742 3.12731429,3 4.51428571,3 L15.4857143,3 Z M15.4857143,15.6451613 C16.1156571,15.6451613 16.6285714,15.1384516 16.6285714,14.516129 L16.6285714,12.483871 L7.94285714,12.483871 L7.94285714,15.6451613 L15.4857143,15.6451613 Z M3.37142857,14.516129 C3.37142857,15.1384516 3.88434286,15.6451613 4.51428571,15.6451613 L6.57142857,15.6451613 L6.57142857,12.483871 L3.37142857,12.483871 L3.37142857,14.516129 Z M4.51428571,4.35483871 C3.88434286,4.35483871 3.37142857,4.86154839 3.37142857,5.48387097 L3.37142857,6.61290323 L6.57142857,6.61290323 L6.57142857,4.35483871 L4.51428571,4.35483871 Z M16.6285714,5.48387097 C16.6285714,4.86154839 16.1156571,4.35483871 15.4857143,4.35483871 L7.94285714,4.35483871 L7.94285714,6.61290323 L16.6285714,6.61290323 L16.6285714,5.48387097 Z M3.37142857,11.1290323 L6.57142857,11.1290323 L6.57142857,7.96774194 L3.37142857,7.96774194 L3.37142857,11.1290323 Z M7.94285714,11.1290323 L16.6285714,11.1290323 L16.6285714,7.96774194 L7.94285714,7.96774194 L7.94285714,11.1290323 Z"/>
+</symbol>
+<symbol id="icon-thread" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M10.1102,16.5461 C14.6082,16.5611 16.0062,15.8201 16.4222,15.3421 C16.3202,15.2811 16.1942,15.2151 16.0962,15.1641 C15.4632,14.8301 13.9762,14.0471 14.7322,12.4211 C14.8092,12.2361 14.9092,12.0211 15.0102,11.8031 C15.3012,11.1801 15.5762,10.5901 15.5762,10.0001 C15.5762,6.3901 12.6332,3.4531 9.0162,3.4531 C5.3992,3.4531 2.4562,6.3901 2.4562,10.0001 C2.4562,13.7931 5.5982,16.5461 9.9272,16.5461 L10.1102,16.5461 Z M16.7762,13.8791 C17.2932,14.1511 18.3672,14.7171 17.8742,15.7631 C16.9412,17.7441 13.1662,18.0001 10.3092,18.0001 L10.1032,18.0001 L9.9272,17.9991 C4.7552,17.9991 1.0002,14.6351 1.0002,10.0001 C1.0002,5.5881 4.5962,2.0001 9.0162,2.0001 C13.4362,2.0001 17.0332,5.5881 17.0332,10.0001 C17.0332,10.9121 16.6602,11.7121 16.3302,12.4171 C16.2382,12.6151 16.1472,12.8111 16.0662,13.0041 C15.9242,13.3121 15.8812,13.4061 16.7762,13.8791 Z M5.643,8.5885 L5.643,8.5885 C5.643,8.18726513 5.96826513,7.862 6.3695,7.862 L11.2955,7.862 C11.6967349,7.862 12.022,8.18726513 12.022,8.5885 L12.022,8.5885 C12.022,8.98973487 11.6967349,9.315 11.2955,9.315 L6.3695,9.315 C5.96826513,9.315 5.643,8.98973487 5.643,8.5885 Z M5.643,11.01 L5.643,11.01 C5.643,10.608489 5.96848899,10.283 6.37,10.283 L12.103,10.283 C12.504511,10.283 12.83,10.608489 12.83,11.01 L12.83,11.01 C12.83,11.411511 12.504511,11.737 12.103,11.737 L6.37,11.737 C5.96848899,11.737 5.643,11.411511 5.643,11.01 Z" id="path-1"/>
+</symbol>
+<symbol id="icon-trash" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M12.1492186,3.45454545 L15.0265167,3.45454545 C15.8400972,3.45454545 16.5,4.10133269 16.5,4.90822364 L16.5,6.19480519 C16.5,6.69218044 16.1368851,7.10474565 15.6612903,7.18186567 L15.6612903,16.5466994 C15.6612903,17.348586 14.9981972,18 14.191474,18 L5.80852599,18 C4.99741268,18 4.33870968,17.3496052 4.33870968,16.5466994 L4.33870968,7.40135259 C4.33870968,7.32762903 4.34431449,7.25517734 4.35512044,7.18438682 C3.87149335,7.11419962 3.5,6.69788587 3.5,6.19480519 L3.5,4.90822364 C3.5,4.10412026 4.16026768,3.45454545 4.9734833,3.45454545 L7.85078142,3.45454545 C8.18629427,2.60314663 9.02207188,2 10,2 C10.9779281,2 11.8137057,2.60314663 12.1492186,3.45454545 Z M10.6291345,3.45454545 C10.4538978,3.32407054 10.23606,3.24675325 10,3.24675325 C9.76393996,3.24675325 9.54610219,3.32407054 9.37086553,3.45454545 L10.6291345,3.45454545 Z M14.4032258,7.19480519 L5.80852599,7.19480519 C5.69416365,7.19480519 5.59677419,7.29047932 5.59677419,7.40135259 L5.59677419,16.5466994 C5.59677419,16.6600184 5.69119346,16.7532468 5.80852599,16.7532468 L14.191474,16.7532468 C14.3058363,16.7532468 14.4032258,16.6575726 14.4032258,16.5466994 L14.4032258,7.19480519 Z M5.80852599,5.94805195 L15.2419355,5.94805195 L15.2419355,4.90822364 C15.2419355,4.79299635 15.1483784,4.7012987 15.0265167,4.7012987 L4.9734833,4.7012987 C4.8530312,4.7012987 4.75806452,4.79472742 4.75806452,4.90822364 L4.75806452,5.94805195 L5.80852599,5.94805195 Z M8.32258065,9.27272727 C8.66998557,9.27272727 8.9516129,9.55435461 8.9516129,9.90175953 L8.9516129,14.0462924 C8.9516129,14.3936973 8.66998557,14.6753247 8.32258065,14.6753247 C7.97517572,14.6753247 7.69354839,14.3936973 7.69354839,14.0462924 L7.69354839,9.90175953 C7.69354839,9.55435461 7.97517572,9.27272727 8.32258065,9.27272727 Z M11.6774194,9.27272727 C12.0248243,9.27272727 12.3064516,9.55435461 12.3064516,9.90175953 L12.3064516,14.0462924 C12.3064516,14.3936973 12.0248243,14.6753247 11.6774194,14.6753247 C11.3300144,14.6753247 11.0483871,14.3936973 11.0483871,14.0462924 L11.0483871,9.90175953 C11.0483871,9.55435461 11.3300144,9.27272727 11.6774194,9.27272727 Z"/>
+</symbol>
+<symbol id="icon-twitter" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M16.3564147,6.73904872 C16.3653278,6.88165916 16.3653278,7.02337828 16.3653278,7.16509741 C16.3653278,11.5004548 13.0665701,16.4953854 7.03593115,16.4953854 C5.17753886,16.4953854 3.45195254,15.957031 2,15.0229326 C2.26382931,15.0541287 2.51696284,15.0639331 2.79148794,15.0639331 C4.32455016,15.0639331 5.73639352,14.546079 6.86301599,13.6627856 C5.46034143,13.6372467 4.22864481,12.7238577 3.79689154,11.3890404 C4.00011141,11.4193451 4.20333129,11.438954 4.41635563,11.438954 C4.71048967,11.438954 5.0046237,11.3988448 5.27914879,11.3275396 C3.74843643,11.0177368 2.64843994,9.67163942 2.64976882,8.10989157 L2.64976882,8.06889107 C3.08651329,8.31222013 3.59456298,8.46463504 4.13202607,8.48513529 C3.21817701,7.87703791 2.66943411,6.85182558 2.67026907,5.75414537 C2.67026907,5.14448574 2.83248844,4.5865224 3.11592669,4.09897296 C4.7818962,6.14948092 7.23975096,7.39671182 9.87833547,7.53053666 C9.82573521,7.28350019 9.79855704,7.03172876 9.79722578,6.77915791 C9.79651556,5.90925604 10.1417682,5.074779 10.756882,4.45966529 C11.3719957,3.84455157 12.2064727,3.49929889 13.0763746,3.50000911 C13.9841041,3.49786829 14.8519077,3.87301252 15.47223,4.53571743 C16.2066325,4.39414309 16.9108481,4.12602844 17.5534511,3.74333818 C17.3090592,4.50120749 16.7966122,5.14390541 16.1121943,5.5509255 C16.7632662,5.47660589 17.3995681,5.30536316 18,5.04287581 C17.5511454,5.69673701 16.9951828,6.27017695 16.3555234,6.73904872 L16.3564147,6.73904872 Z"/>
+</symbol>
+<symbol id="icon-upload" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M15.7589924,6.38897276 C17.6926226,6.7109506 19.1666667,8.39166791 19.1666667,10.4166667 C19.1666667,12.6718294 17.3384961,14.5 15.0833333,14.5 L13.8609366,14.5 C13.446723,14.5 13.1109366,14.1642136 13.1109366,13.75 C13.1109366,13.3357864 13.446723,13 13.8609366,13 L15.0833333,13 C16.5100689,13 17.6666667,11.8434023 17.6666667,10.4166667 C17.6666667,8.98993106 16.5100689,7.83333333 15.0833333,7.83333333 L14.3333333,7.83333333 L14.3333333,7.08333333 C14.3333333,6.11683502 13.5498316,5.33333333 12.5833333,5.33333333 C12.1578556,5.33333333 11.757791,5.48474122 11.4422229,5.7564883 L10.8471393,6.26893624 L10.3625987,5.650917 C9.79666519,4.92908316 8.93447148,4.5 8,4.5 C6.34314575,4.5 5,5.84314575 5,7.5 C5,7.84555431 5.05813131,8.18211108 5.17051205,8.50006544 L5.5239382,9.5 L4.25,9.5 C3.28350169,9.5 2.5,10.2835017 2.5,11.25 C2.5,12.2164983 3.28350169,13 4.25,13 L5.52399362,13 C5.93820718,13 6.27399362,13.3357864 6.27399362,13.75 C6.27399362,14.1642136 5.93820718,14.5 5.52399362,14.5 L4.25,14.5 C2.45507456,14.5 1,13.0449254 1,11.25 C1,9.70004418 2.08500331,8.40350446 3.53691691,8.07847386 C3.5124076,7.88779201 3.5,7.69466874 3.5,7.5 C3.5,5.01471863 5.51471863,3 8,3 C9.15948883,3 10.2470883,3.44202869 11.0679072,4.20761967 C11.5284758,3.96453109 12.0462233,3.83333333 12.5833333,3.83333333 C14.1399442,3.83333333 15.4409581,4.92767402 15.7589924,6.38897276 Z M6.2996699,11.5319805 C6.00677668,11.2390873 6.00677668,10.7642136 6.2996699,10.4713204 L9.12809702,7.64289324 C9.51862131,7.25236895 10.1517863,7.25236895 10.5423106,7.64289324 L13.3707377,10.4713204 C13.6636309,10.7642136 13.6636309,11.2390873 13.3707377,11.5319805 C13.0778445,11.8248738 12.6029708,11.8248738 12.3100775,11.5319805 L10.6310683,9.85297129 L10.6310683,15.9599838 C10.6310683,16.3741973 10.2952819,16.7099838 9.88106829,16.7099838 C9.46685473,16.7099838 9.13106829,16.3741973 9.13106829,15.9599838 L9.13106829,9.76124232 L7.36033007,11.5319805 C7.06743685,11.8248738 6.59256312,11.8248738 6.2996699,11.5319805 Z"/>
+</symbol>
+<symbol id="icon-user-plus" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M6.47524131,15.6933183 C7.21913526,15.8780876 8.28297209,15.9912127 9.71880492,15.9912127 C11.1546378,15.9912127 12.2184746,15.8780876 12.9623685,15.6933183 C12.9977477,15.6845308 13.0363223,15.674235 13.0780925,15.6624308 L13.0780738,15.6623647 C13.2374784,15.6173172 13.3301831,15.451576 13.2851356,15.2921714 C13.2838275,15.2875426 13.2824082,15.282946 13.2808791,15.2783855 C13.2161577,15.0853646 13.1480482,14.9436731 13.0765504,14.8533111 C12.8730706,14.5961443 12.5658037,14.400665 12.142521,14.2227321 C11.9703616,14.1503625 11.2652166,13.8912088 11.3994117,13.9419785 C10.6072814,13.6422936 10.2249561,13.3530051 10.2265028,12.7610539 C10.2254925,12.7470757 10.2254925,12.7470757 10.2238077,12.7123449 C10.2143319,12.4839172 10.2310491,12.2223869 10.2982142,11.9591728 C10.3656585,11.6948643 10.477563,11.4631914 10.6672359,11.264193 C11.0868197,10.853518 11.2794376,10.4323824 11.2794376,9.79434075 C11.2794376,8.7608405 10.5641785,7.94903339 9.71880492,7.94903339 C8.87343135,7.94903339 8.15817223,8.7608405 8.15817223,9.79434075 C8.15817223,10.4319871 8.34638133,10.8421374 8.76891661,11.273212 C8.94701846,11.4558272 9.06310983,11.6837292 9.13382107,11.942181 C9.20736412,12.2109831 9.22522319,12.4781293 9.21405934,12.7128799 C9.21265378,13.3529962 8.83033924,13.6422855 8.03823154,13.9419659 C8.17227611,13.8912518 7.46723399,14.1503685 7.29508887,14.2227321 C6.85361959,14.40831 6.53834964,14.6129744 6.33540533,14.8868042 C6.27241167,14.9718006 6.21193925,15.1028167 6.15398807,15.2798525 L6.15399772,15.2798556 C6.10245502,15.437314 6.18831666,15.6067429 6.34577508,15.6582856 C6.34962196,15.6595449 6.35349394,15.6607261 6.35738864,15.6618287 C6.39997771,15.6738852 6.43926194,15.6843817 6.47524131,15.6933183 Z M5.45869947,5.19332162 L7.01933216,5.19332162 C7.36875661,5.19332162 7.65202109,5.4765861 7.65202109,5.82601054 L7.65202109,5.82601054 C7.65202109,6.17543499 7.36875661,6.45869947 7.01933216,6.45869947 L5.45869947,6.45869947 L5.45869947,8.01933216 C5.45869947,8.36875661 5.17543499,8.65202109 4.82601054,8.65202109 L4.82601054,8.65202109 C4.4765861,8.65202109 4.19332162,8.36875661 4.19332162,8.01933216 L4.19332162,6.45869947 L2.63268893,6.45869947 C2.28326448,6.45869947 2,6.17543499 2,5.82601054 L2,5.82601054 C2,5.4765861 2.28326448,5.19332162 2.63268893,5.19332162 L4.19332162,5.19332162 L4.19332162,3.63268893 C4.19332162,3.28326448 4.4765861,3 4.82601054,3 L4.82601054,3 C5.17543499,3 5.45869947,3.28326448 5.45869947,3.63268893 L5.45869947,5.19332162 Z M8.07603587,12.2315862 C8.05065012,12.1388005 8.01719874,12.0731312 7.98478174,12.0398903 C7.37262551,11.4153661 7.06151142,10.737378 7.06151142,9.79434075 C7.06151142,8.18390173 8.23468218,6.85237258 9.71880492,6.85237258 C11.2029277,6.85237258 12.3760984,8.18390173 12.3760984,9.79434075 C12.3760984,10.7403784 12.0566482,11.4388174 11.4481872,12.0338619 C11.4184169,12.0651769 11.385663,12.1329864 11.3608256,12.2303222 C11.3245198,12.3726014 11.3140881,12.5357991 11.3195261,12.6668917 C11.3202706,12.6819617 11.3202706,12.6819617 11.3216169,12.719898 C11.3216169,12.7073637 11.40795,12.7726882 11.7874659,12.9162695 C11.6287494,12.8562227 12.3681909,13.127981 12.5674966,13.211762 C13.8008957,13.7302388 14.4850615,14.5163421 14.4850615,15.911415 L14.4850615,16.18604 L14.2651408,16.3505202 C14.0980306,16.475503 13.7683812,16.6231028 13.226726,16.7576397 C12.3900654,16.9654505 11.2387903,17.0878735 9.71880492,17.0878735 C8.19881954,17.0878735 7.04754444,16.9654505 6.21088388,16.7576397 C5.66922867,16.6231028 5.33957926,16.475503 5.17246909,16.3505202 L4.95254833,16.18604 L4.95254833,15.911415 C4.95254833,14.5163421 5.63671414,13.7302388 6.87011324,13.211762 C7.06941891,13.127981 7.80886043,12.8562227 7.65014398,12.9162695 C8.0243928,12.7746808 8.11354021,12.7091919 8.11787351,12.6743994 C8.12480157,12.531149 8.11406841,12.3705964 8.07603587,12.2315862 Z M16.477307,12.1783798 C16.5158371,12.1688097 16.5581573,12.1574506 16.6042675,12.1443024 L16.6042817,12.1443522 C16.7636436,12.0989109 16.8559945,11.9328851 16.8105532,11.7735232 C16.810273,11.7725406 16.8099878,11.7715595 16.8096976,11.7705799 C16.779061,11.6671559 16.7482995,11.5868139 16.7174133,11.5295539 C16.5254259,11.1736284 16.1797665,10.9273528 15.6574595,10.7077937 C15.4853143,10.63543 14.7802722,10.3763133 14.9143168,10.4270274 C14.1222091,10.127347 13.7398946,9.83805769 13.738489,9.19794144 C13.7273251,8.96319076 13.7451842,8.69604464 13.8187273,8.42724251 C13.8894385,8.16879069 14.0055299,7.94088867 14.1836317,7.75827356 C14.606167,7.32719891 14.7943761,6.91704865 14.7943761,6.27940226 C14.7943761,5.24590201 14.079117,4.4340949 13.2337434,4.4340949 C12.7177895,4.4340949 12.250303,4.7364918 11.9643141,5.20712573 C11.8425844,5.40744863 11.7455166,5.6689139 11.6731107,5.99152156 L10.5764499,5.99152156 C10.627452,5.64723748 10.699169,5.35598111 10.7916011,5.11775244 C11.1958972,4.07574507 12.1286114,3.33743409 13.2337434,3.33743409 C14.7178661,3.33743409 15.8910369,4.66896324 15.8910369,6.27940226 C15.8910369,7.2224395 15.5799228,7.90042758 14.9677666,8.52495181 C14.9353496,8.55819276 14.9018982,8.62386204 14.8765125,8.71664775 C14.8384799,8.85565787 14.8277468,9.01621049 14.8346748,9.15946093 C14.8390081,9.19425344 14.9281555,9.25974232 15.3024044,9.40133103 C15.1436879,9.3412842 15.8831294,9.61304255 16.0824351,9.69682351 C17.3158342,10.2153003 18,11.0014036 18,12.3964765 L18,12.3964765 C18,12.5693263 17.918498,12.7320573 17.7800792,12.8355817 C17.6129691,12.9605645 17.2833197,13.1081643 16.7416645,13.2427013 C16.3717101,13.334591 15.9335077,13.4107115 15.4208537,13.4668642 C15.1961607,13.4914756 14.9240143,13.5192959 14.6044143,13.550325 L14.6044143,12.4539581 C14.860183,12.425352 15.0925272,12.3996071 15.3014468,12.3767234 C15.7667136,12.3257612 16.1566503,12.2580249 16.477307,12.1783798 Z"/>
+</symbol>
+<symbol id="icon-user-rounded" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M16.4,15.8666667 C16.4,16.0906667 16.2613333,16.2805333 16.0661333,16.3594667 C15.8432,15.0176 14.9984,14.1888 13.6405333,13.6224 C13.4218667,13.5328 12.7082667,13.2704 12.6336,13.2448 C12.3786667,13.1477333 12.2186667,13.0741333 12.1290667,13.0133333 C12.1258667,12.8650667 12.1386667,12.6837333 12.1792,12.5269333 C12.2058667,12.4224 12.2389333,12.3552 12.2613333,12.3317333 C13.0485333,11.568 13.4656,10.6634667 13.4656,9.44426667 C13.4656,7.36533333 11.936,5.6448 10,5.6448 C8.064,5.6448 6.5344,7.36533333 6.5344,9.44426667 C6.5344,10.6592 6.9408,11.5370667 7.7344,12.3402667 C7.76,12.3669333 7.79413333,12.432 7.8208,12.5312 C7.86346667,12.6848 7.87733333,12.8650667 7.872,13.0133333 C7.7824,13.0741333 7.6224,13.1477333 7.3664,13.2448 C7.2928,13.2704 6.57813333,13.5328 6.36053333,13.6224 C5.00266667,14.1888 4.15786667,15.0176 3.93386667,16.3594667 C3.73866667,16.2816 3.6,16.0906667 3.6,15.8666667 L3.6,4.13333333 C3.6,3.83893333 3.84,3.6 4.13333333,3.6 L15.8666667,3.6 C16.1610667,3.6 16.4,3.83893333 16.4,4.13333333 L16.4,15.8666667 Z M7.92,14.7456 C8.9568,14.3552 9.46773333,13.9712 9.4688,13.1082667 C9.48373333,12.8021333 9.46026667,12.4565333 9.3632,12.1056 C9.26933333,11.7632 9.1136,11.4613333 8.8736,11.2170667 C8.35946667,10.6965333 8.1344,10.2112 8.1344,9.44426667 C8.1344,8.21013333 8.99306667,7.2448 10,7.2448 C11.008,7.2448 11.8656,8.21013333 11.8656,9.44426667 C11.8656,10.2112 11.6362667,10.7093333 11.1274667,11.2042667 C10.8682667,11.472 10.72,11.7792 10.6293333,12.1290667 C10.5418667,12.4714667 10.5194667,12.8096 10.5322667,13.1072 C10.5344,13.1530667 10.5344,13.1530667 10.5354667,13.1722667 C10.5333333,13.9712 11.0442667,14.3552 12.08,14.7456 C12.1642667,14.7754667 12.8405333,15.0229333 13.0250667,15.0997333 C13.8112,15.4272 14.2602667,15.7973333 14.4384,16.4 L5.5616,16.4 C5.7408,15.7973333 6.1888,15.4272 6.976,15.0997333 C7.16053333,15.0229333 7.83466667,14.7765333 7.92,14.7456 Z M15.8666667,2 L4.13333333,2 C2.95573333,2 2,2.95573333 2,4.13333333 L2,15.8666667 C2,17.0453333 2.95573333,18 4.13333333,18 L15.8666667,18 C17.0442667,18 18,17.0453333 18,15.8666667 L18,4.13333333 C18,2.95573333 17.0442667,2 15.8666667,2 Z"/>
+</symbol>
+<symbol id="icon-user" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M4.27480067,15.5788555 C4.46241979,15.6493289 4.6953138,15.7210393 4.97762481,15.7907451 C6.13236699,16.0758643 7.77970068,16.25 10,16.25 C12.2202993,16.25 13.867633,16.0758643 15.0223752,15.7907451 C15.3046862,15.7210393 15.5375802,15.6493289 15.7251993,15.5788555 C15.5983237,14.4774932 14.9803761,13.8728683 13.7733251,13.3684697 C13.606156,13.2986136 13.4321022,13.2317806 13.2013981,13.1474943 C13.2550617,13.1670999 12.7540658,12.9856593 12.6248761,12.9370725 C11.43863,12.4909382 10.875,12.066988 10.8771407,11.2052234 C10.875679,11.1851522 10.875679,11.1851522 10.8731563,11.1334812 C10.8588712,10.7911536 10.8841398,10.3981809 10.9852093,10.0044418 C11.0857121,9.61291073 11.2517673,9.27116505 11.5296145,8.98133446 C12.1929469,8.33592793 12.5,7.66856599 12.5,6.66686892 C12.5,5.03712214 11.3592047,3.75 10,3.75 C8.64079533,3.75 7.5,5.03712214 7.5,6.66686892 C7.5,7.66773765 7.7999417,8.31751087 8.46661637,8.99363388 C8.72906092,9.26113673 8.90126846,9.59720151 9.00658259,9.97985029 C9.11711181,10.3814476 9.14407411,10.7823785 9.12726318,11.1337828 C9.12407496,11.1908013 9.12407496,11.1908013 9.125,11.1485976 C9.125,12.066988 8.56137005,12.4909382 7.37512387,12.9370725 C7.24593418,12.9856593 6.74493831,13.1670999 6.79860194,13.1474943 C6.56789784,13.2317806 6.39384395,13.2986136 6.22667493,13.3684697 C5.01962388,13.8728683 4.4016763,14.4774932 4.27480067,15.5788555 Z M2.75,16.0377562 C2.75,13.9409138 3.77899495,12.7655993 5.64832507,11.9844496 C5.84012695,11.9043001 6.03360165,11.8300098 6.28386334,11.7385783 C6.23878565,11.7550472 6.72802415,11.5778646 6.84709835,11.5330821 C7.46640773,11.3001666 7.625,11.1808769 7.62778697,11.0840013 C7.627485,11.0883491 7.627485,11.0883491 7.62897669,11.0621059 C7.63887029,10.8552966 7.62177078,10.6010259 7.56035736,10.3778862 C7.51758203,10.2224661 7.45933796,10.1088022 7.3972016,10.0454649 C6.46953613,9.10465693 6,8.08748593 6,6.66686892 C6,4.24630414 7.7693538,2.25 10,2.25 C12.2306462,2.25 14,4.24630414 14,6.66686892 C14,8.09185944 13.5179349,9.13959977 12.5946644,10.0372413 C12.5366833,10.0978699 12.479814,10.2149083 12.4381067,10.3773884 C12.3797234,10.604834 12.3631543,10.8625118 12.371852,11.0709415 C12.3730731,11.0955617 12.3730731,11.0955617 12.375,11.1485976 C12.375,11.1808769 12.5335923,11.3001666 13.1529016,11.5330821 C13.2719758,11.5778646 13.7612144,11.7550472 13.7161367,11.7385783 C13.9663983,11.8300098 14.159873,11.9043001 14.3516749,11.9844496 C16.2210051,12.7655993 17.25,13.9409138 17.25,16.0377562 L17.25,16.41472 L16.947485,16.6396342 C16.7008168,16.8230274 16.2046246,17.0438817 15.381944,17.247011 C14.1009858,17.5632943 12.3347397,17.75 10,17.75 C7.6652603,17.75 5.8990142,17.5632943 4.61805603,17.247011 C3.79537543,17.0438817 3.2991832,16.8230274 3.05251503,16.6396342 L2.75,16.41472 L2.75,16.0377562 Z"/>
+</symbol>
+<symbol id="icon-video-off" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M11.6956896,10.3846732 L13.8429459,8.6668682 L16.1227415,7.9343381 C16.5910433,7.78362292 17.0661321,7.8469809 17.4277814,8.10713257 C17.7904002,8.36824422 17.9978879,8.79639052 17.9978879,9.28309494 L17.9978879,13.595277 C17.9978879,14.0819814 17.7894306,14.5091677 17.4277814,14.7702794 C17.1941152,14.938274 16.9148794,15.0237112 16.6201304,15.0237112 C16.4562733,15.0237112 16.2885378,14.9977921 16.121772,14.9440338 L13.1500431,13.9879044 L13.1500431,15 C13.1500431,15.5522847 12.7023278,16 12.1500431,16 L4.67653119,16 L6.47647359,14.5600461 L11.1956896,14.5600461 C11.471832,14.5600461 11.6956896,14.3361885 11.6956896,14.0600461 L11.6956896,10.3846732 Z M8.67391188,8.32024575 L3.95435345,8.32024575 C3.67821107,8.32024575 3.45435345,8.54410338 3.45435345,8.82024575 L3.45435345,12.4958925 L2,13.6593753 L2,7.88029183 C2,7.32800708 2.44771525,6.88029183 3,6.88029183 L10.4738543,6.88029183 L8.67391188,8.32024575 Z M16.5386559,12.8785475 L16.5425945,10.0045389 C16.5429729,9.72839678 16.3194223,9.50423259 16.0432801,9.50385415 C15.9913385,9.50378297 15.9397029,9.51180575 15.8902315,9.52763379 L13.1500431,10.4043391 L13.1500431,12.4740328 L15.8855664,13.3538492 C16.1484467,13.4383984 16.430094,13.2938325 16.5146432,13.0309522 C16.5304843,12.981699 16.538585,12.9302855 16.5386559,12.8785475 Z M4.42382545,4.71997696 C4.42382545,4.32234467 4.74617012,4 5.14380242,4 L10.0060468,4 C10.4036791,4 10.7260237,4.32234467 10.7260237,4.71997696 C10.7260237,5.11760926 10.4036791,5.43995392 10.0060468,5.43995392 L5.14380242,5.43995392 C4.74617012,5.43995392 4.42382545,5.11760926 4.42382545,4.71997696 Z M1.26850001,16.4855001 C1.00978155,16.162171 1.06215878,15.6903283 1.38548783,15.4316098 L1.3855488,15.4315611 L15.2144512,4.36843912 C15.5378508,4.1097195 16.0097467,4.16212751 16.2685,4.4855001 C16.5272185,4.80882915 16.4748412,5.28067188 16.1515122,5.53939034 L16.1514512,5.53943912 L2.3225488,16.6025611 C1.99914927,16.8612807 1.52725331,16.8088727 1.26850001,16.4855001 Z"/>
+</symbol>
+<symbol id="icon-video" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M16.5386559,12.8785475 L16.5425945,10.0045389 C16.5429729,9.72839678 16.3194223,9.50423259 16.0432801,9.50385415 C15.9913385,9.50378297 15.9397029,9.51180575 15.8902315,9.52763379 L13.1500431,10.4043391 L13.1500431,12.4740328 L15.8855664,13.3538492 C16.1484467,13.4383984 16.430094,13.2938325 16.5146432,13.0309522 C16.5304843,12.981699 16.538585,12.9302855 16.5386559,12.8785475 Z M11.6956896,14.0600461 L11.6956896,8.82024575 C11.6956896,8.54410338 11.471832,8.32024575 11.1956896,8.32024575 L3.95435345,8.32024575 C3.67821107,8.32024575 3.45435345,8.54410338 3.45435345,8.82024575 L3.45435345,14.0600461 C3.45435345,14.3361885 3.67821107,14.5600461 3.95435345,14.5600461 L11.1956896,14.5600461 C11.471832,14.5600461 11.6956896,14.3361885 11.6956896,14.0600461 Z M17.4277814,8.10713257 C17.7904002,8.36824422 17.9978879,8.79639052 17.9978879,9.28309494 L17.9978879,13.595277 C17.9978879,14.0819814 17.7894306,14.5091677 17.4277814,14.7702794 C17.1941152,14.938274 16.9148794,15.0237112 16.6201304,15.0237112 C16.4562733,15.0237112 16.2885378,14.9977921 16.121772,14.9440338 L13.1500431,13.9879044 L13.1500431,15 C13.1500431,15.5522847 12.7023278,16 12.1500431,16 L3,16 C2.44771525,16 2,15.5522847 2,15 L2,7.88029183 C2,7.32800708 2.44771525,6.88029183 3,6.88029183 L12.1500431,6.88029183 C12.7023278,6.88029183 13.1500431,7.32800708 13.1500431,7.88029183 L13.1500431,8.88950754 L16.1227415,7.9343381 C16.5910433,7.78362292 17.0661321,7.8469809 17.4277814,8.10713257 Z M4.42382545,4.71997696 L4.42382545,4.71997696 C4.42382545,4.32234467 4.74617012,4 5.14380242,4 L10.0060468,4 C10.4036791,4 10.7260237,4.32234467 10.7260237,4.71997696 L10.7260237,4.71997696 C10.7260237,5.11760926 10.4036791,5.43995392 10.0060468,5.43995392 L5.14380242,5.43995392 C4.74617012,5.43995392 4.42382545,5.11760926 4.42382545,4.71997696 Z"/>
+</symbol>
+<symbol id="icon-volume-disable" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M15.3606606,10 L16.4213208,11.0606602 C16.714214,11.3535534 16.714214,11.8284271 16.4213208,12.1213203 C16.1284276,12.4142136 15.6535538,12.4142136 15.3606606,12.1213203 L14.3000004,11.0606602 L13.2393403,12.1213203 C12.946447,12.4142136 12.4715733,12.4142136 12.1786801,12.1213203 C11.8857869,11.8284271 11.8857869,11.3535534 12.1786801,11.0606602 L13.2393403,10 L12.1786801,8.93933983 C11.8857869,8.64644661 11.8857869,8.17157288 12.1786801,7.87867966 C12.4715733,7.58578644 12.946447,7.58578644 13.2393403,7.87867966 L14.3000004,8.93933983 L15.3606606,7.87867966 C15.6535538,7.58578644 16.1284276,7.58578644 16.4213208,7.87867966 C16.714214,8.17157288 16.714214,8.64644661 16.4213208,8.93933983 L15.3606606,10 Z M3.75,7.09517135 L3.75,12.9048286 L5.43245947,12.9048286 L5.63894611,13.3223525 C5.65922749,13.3633623 5.71508736,13.4593296 5.80756519,13.5916741 C5.96863714,13.8221831 6.16885566,14.0544177 6.40846127,14.2708248 C6.92022706,14.7330418 7.52853553,15.0539812 8.25,15.1846116 L8.25,4.81079103 C7.49756658,4.93809941 6.88088684,5.25989714 6.37652571,5.72431357 C5.98186506,6.08771765 5.74423392,6.44589062 5.65005042,6.65418049 L5.45064532,7.09517135 L3.75,7.09517135 Z M2.25,13.4048286 L2.25,6.59517135 C2.25,6.0428866 2.69771525,5.59517135 3.25,5.59517135 L4.52731222,5.59517135 C4.72123957,5.29556612 4.9952979,4.95710146 5.36046207,4.62085778 C6.28946638,3.76542931 7.5026227,3.25 9,3.25 C9.41421356,3.25 9.75,3.58578644 9.75,4 L9.75,16 C9.75,16.4142136 9.41421356,16.75 9,16.75 C7.54610131,16.75 6.34565499,16.2353378 5.40305955,15.3840038 C5.02776988,15.0450494 4.74311016,14.7042759 4.54040759,14.4048286 L3.25,14.4048286 C2.69771525,14.4048286 2.25,13.9571134 2.25,13.4048286 Z"/>
+</symbol>
+<symbol id="icon-volume-mute" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M4.41732946,12.9048286 L2.81964176,14.3077446 C2.48275566,14.1468858 2.25,13.8030387 2.25,13.4048286 L2.25,6.59517135 C2.25,6.0428866 2.69771525,5.59517135 3.25,5.59517135 L4.52731222,5.59517135 C4.72123957,5.29556612 4.9952979,4.95710146 5.36046207,4.62085778 C6.28946638,3.76542931 7.5026227,3.25 9,3.25 C9.41421356,3.25 9.75,3.58578644 9.75,4 L9.75,8.22225603 L8.25,9.53939326 L8.25,4.81079103 C7.49756658,4.93809941 6.88088684,5.25989714 6.37652571,5.72431357 C5.98186506,6.08771765 5.74423392,6.44589062 5.65005042,6.65418049 L5.45064532,7.09517135 L3.75,7.09517135 L3.75,12.9048286 L4.41732946,12.9048286 Z M6.94582501,14.6796061 C7.33297307,14.9237131 7.76602638,15.096982 8.25,15.1846116 C8.25,14.7824403 8.25,14.4808118 8.25,14.2797261 C8.25,14.114086 8.25,13.8656257 8.25,13.5343454 L9.75,12.217121 C9.75,12.7430653 9.75,13.1375236 9.75,13.4004958 C9.75,13.9781634 9.75,14.8446648 9.75,16 C9.75,16.4142136 9.41421356,16.75 9,16.75 C7.73555859,16.75 6.66281867,16.3607296 5.78467358,15.6992708 L6.94582501,14.6796061 Z M13.1979694,9.18928805 L14.501136,8.04491283 C14.6653084,8.67653585 14.75,9.3323297 14.75,10 C14.75,11.0478243 14.5414102,12.0663977 14.1443715,13.0081991 C14.1328828,13.0354511 14.1201673,13.0646263 14.1062251,13.0957246 L14.1062527,13.095737 C13.9451147,13.4551586 13.5231178,13.6158992 13.1636963,13.4547612 C13.1440103,13.4459355 13.124735,13.436221 13.1059297,13.4256479 C12.751374,13.226302 12.6043325,12.7915868 12.7650753,12.4179423 C12.7729955,12.3994984 12.7803982,12.3818808 12.7872713,12.3650844 C13.0908386,11.6232232 13.25,10.8236722 13.25,10 C13.25,9.72669825 13.2324768,9.45605216 13.1979694,9.18928805 Z M15.7800454,6.92183901 L16.9971442,5.85304417 C17.4915425,7.16344744 17.75,8.56337974 17.75,10 C17.75,11.6998647 17.3881456,13.3483643 16.7017379,14.8579624 C16.6734975,14.9200708 16.6396953,14.9911622 16.6003313,15.0712366 L16.6003442,15.071243 C16.4238097,15.4303503 15.9895861,15.5783547 15.6304788,15.4018201 C15.6184936,15.3959283 15.6066736,15.3897062 15.5950323,15.383161 C15.2366851,15.1816833 15.0967913,14.73628 15.2755886,14.3660941 C15.2982072,14.3193204 15.3183178,14.2765515 15.3359423,14.237798 C15.9345682,12.921521 16.25,11.4842764 16.25,10 C16.25,8.94105765 16.0894462,7.90605433 15.7800454,6.92183901 Z M18.4863803,2.54806414 C18.7610155,2.84089595 18.7462641,3.30091878 18.4534323,3.57555391 C18.4476472,3.58097952 18.4417737,3.58631009 18.4358142,3.59154347 L2.59249548,17.5043474 C2.27773902,17.7807507 1.80043832,17.7575137 1.51401966,17.4518427 C1.23927018,17.1586253 1.2542414,16.6981972 1.54745882,16.4234477 C1.5531779,16.4180888 1.55898319,16.4128227 1.56487242,16.4076514 L17.4081586,2.49579667 C17.7228161,2.21949858 18.1999228,2.24262662 18.4863803,2.54806414 Z"/>
+</symbol>
+<symbol id="icon-volume" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M3.75,7.09517135 L3.75,12.9048286 L5.43245947,12.9048286 L5.63894611,13.3223525 C5.65922749,13.3633623 5.71508736,13.4593296 5.80756519,13.5916741 C5.96863714,13.8221831 6.16885566,14.0544177 6.40846127,14.2708248 C6.92022706,14.7330418 7.52853553,15.0539812 8.25,15.1846116 L8.25,4.81079103 C7.49756658,4.93809941 6.88088684,5.25989714 6.37652571,5.72431357 C5.98186506,6.08771765 5.74423392,6.44589062 5.65005042,6.65418049 L5.45064532,7.09517135 L3.75,7.09517135 Z M2.25,13.4048286 L2.25,6.59517135 C2.25,6.0428866 2.69771525,5.59517135 3.25,5.59517135 L4.52731222,5.59517135 C4.72123957,5.29556612 4.9952979,4.95710146 5.36046207,4.62085778 C6.28946638,3.76542931 7.5026227,3.25 9,3.25 C9.41421356,3.25 9.75,3.58578644 9.75,4 L9.75,16 C9.75,16.4142136 9.41421356,16.75 9,16.75 C7.54610131,16.75 6.34565499,16.2353378 5.40305955,15.3840038 C5.02776988,15.0450494 4.74311016,14.7042759 4.54040759,14.4048286 L3.25,14.4048286 C2.69771525,14.4048286 2.25,13.9571134 2.25,13.4048286 Z M13.1059297,13.4256479 C12.751374,13.226302 12.6043325,12.7915868 12.7650753,12.4179423 C12.7729955,12.3994984 12.7803982,12.3818808 12.7872713,12.3650844 C13.0908386,11.6232232 13.25,10.8236722 13.25,10 C13.25,9.25397869 13.1194336,8.52774488 12.8692642,7.84624031 C12.8425298,7.77341141 12.8080786,7.6890624 12.7659105,7.59319327 C12.6002964,7.21667708 12.7473848,6.77594091 13.1059297,6.57435207 C13.4474603,6.38232932 13.8799908,6.50352942 14.0720136,6.84506006 C14.0817194,6.86232277 14.0906981,6.87998432 14.0989261,6.89799829 C14.1570809,7.02536538 14.2040637,7.13577994 14.239857,7.22924999 C14.5747836,8.10387215 14.75,9.03965062 14.75,10 C14.75,11.0478243 14.5414102,12.0663977 14.1443715,13.0081991 C14.1328828,13.0354511 14.1201673,13.0646263 14.1062251,13.0957246 L14.1062527,13.095737 C13.9451147,13.4551586 13.5231178,13.6158992 13.1636963,13.4547612 C13.1440103,13.4459355 13.124735,13.436221 13.1059297,13.4256479 Z M15.5950323,15.383161 C15.2366851,15.1816833 15.0967913,14.73628 15.2755886,14.3660941 C15.2982072,14.3193204 15.3183178,14.2765515 15.3359423,14.237798 C15.9345682,12.921521 16.25,11.4842764 16.25,10 C16.25,8.49373507 15.9251532,7.03590572 15.3091513,5.70378267 C15.2986944,5.6811693 15.2873237,5.65706979 15.2750393,5.63148416 L15.2750558,5.63147622 C15.0975612,5.26179594 15.2375748,4.81781648 15.5950323,4.61683897 C15.9442732,4.42048119 16.3865684,4.54441745 16.5829261,4.89365836 C16.5897537,4.90580172 16.5962299,4.91813923 16.602347,4.93065554 C16.6229626,4.97276348 16.6415196,5.01157619 16.6580474,5.04707933 C17.3727819,6.58239346 17.75,8.26442372 17.75,10 C17.75,11.6998647 17.3881456,13.3483643 16.7017379,14.8579624 C16.6734975,14.9200708 16.6396953,14.9911622 16.6003313,15.0712366 L16.6003442,15.071243 C16.4238097,15.4303503 15.9895861,15.5783547 15.6304788,15.4018201 C15.6184936,15.3959283 15.6066736,15.3897062 15.5950323,15.383161 Z"/>
+</symbol>
+<symbol id="icon-warning" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M9.98344445,7.04264254 C10.4190789,7.04264254 10.7723523,7.39520794 10.7723523,7.83027001 L10.7723523,12.3994926 C10.7723523,12.8345547 10.4190789,13.1871201 9.98344445,13.1871201 C9.54780997,13.1871201 9.19453663,12.8345547 9.19453663,12.3994926 L9.19453663,7.83027001 C9.19453663,7.39520794 9.54780997,7.04264254 9.98344445,7.04264254 Z M0.959352356,16.870054 L9.04441459,2.40226256 C9.32933111,1.8924195 9.98368057,1.7021729 10.5098756,1.97341266 C10.6984618,2.07062387 10.853564,2.21970064 10.9555854,2.40226256 L19.0406476,16.870054 C19.3644696,17.4495162 18.9313899,18.15 18.2590107,18.15 L1.74098931,18.15 C1.06861014,18.15 0.635530413,17.4495162 0.959352356,16.870054 Z M9.96597455,13.7448416 C10.4490813,13.7448416 10.8196237,14.1257886 10.8196237,14.6151726 C10.8196237,15.1078483 10.450184,15.4898784 9.96597455,15.4898784 C9.48176512,15.4898784 9.11232535,15.1078483 9.11232535,14.6151726 C9.11232535,14.1257886 9.48286785,13.7448416 9.96597455,13.7448416 Z M2.73547986,16.7123645 L17.2645201,16.7123645 L10,3.71288982 L2.73547986,16.7123645 Z"/>
+</symbol>
+</svg>
\ No newline at end of file
diff --git a/app/ui-master/public/icons/game.svg b/app/ui-master/public/icons/game.svg
new file mode 100644
index 000000000000..2fd484da958a
--- /dev/null
+++ b/app/ui-master/public/icons/game.svg
@@ -0,0 +1,3 @@
+<svg id="game" viewBox="0 0 20 20">
+    <path fill-rule="evenodd" d="M10 20C15.5229 20 20 15.5228 20 10C20 4.47715 15.5229 0 10 0C4.47716 0 7.62939e-06 4.47715 7.62939e-06 10C7.62939e-06 15.5228 4.47716 20 10 20ZM16.3276 14.8957C17.203 13.7658 17.7825 12.3952 17.9499 10.9H14.9439C15.0872 12.3612 15.5759 13.7203 16.3276 14.8957ZM15.042 16.2115C13.8851 17.1517 12.4604 17.7752 10.9 17.9499V10.9H13.1367C13.2973 12.8635 13.9787 14.6807 15.042 16.2115ZM14.9439 9.1H17.9499C17.7825 7.60479 17.203 6.23416 16.3276 5.10434C15.5759 6.27969 15.0872 7.63879 14.9439 9.1ZM15.042 3.7885C13.9787 5.31935 13.2973 7.13646 13.1367 9.1H10.9V2.05006C12.4604 2.22475 13.8851 2.84826 15.042 3.7885ZM9.10001 17.9499C7.53945 17.7752 6.1146 17.1516 4.9576 16.2111C6.02095 14.6803 6.70261 12.8633 6.86331 10.9H9.10001V17.9499ZM5.05607 10.9C4.91267 12.3612 4.42373 13.72 3.67202 14.8952C2.79682 13.7654 2.21744 12.395 2.05007 10.9H5.05607ZM9.10001 9.1H6.86333C6.70272 7.13674 6.02142 5.31947 4.95804 3.7885C6.11496 2.84826 7.53965 2.22475 9.10001 2.05006V9.1ZM5.0561 9.1C4.91278 7.63858 4.42402 6.2796 3.67238 5.10437C2.79698 6.23418 2.21747 7.6048 2.05007 9.1H5.0561Z"/>
+</svg>
diff --git a/app/ui-master/public/icons/livechat.svg b/app/ui-master/public/icons/omnichannel.svg
similarity index 96%
rename from app/ui-master/public/icons/livechat.svg
rename to app/ui-master/public/icons/omnichannel.svg
index 18be34ba8acd..5c7ba65cb5eb 100644
--- a/app/ui-master/public/icons/livechat.svg
+++ b/app/ui-master/public/icons/omnichannel.svg
@@ -1,3 +1,3 @@
-<svg id="livechat" viewBox="0 0 20 20">
+<svg id="omnichannel" viewBox="0 0 20 20">
   <path d="M16.628,10.954 C16.628,11.33 16.32,11.637 15.942,11.637 C15.565,11.637 15.257,11.33 15.257,10.954 L15.257,9.137 C15.257,8.761 15.565,8.454 15.942,8.454 C16.32,8.454 16.628,8.761 16.628,9.137 L16.628,10.954 Z M10.228,16.637 L9.771,16.637 C9.393,16.637 9.086,16.33 9.086,15.954 C9.086,15.578 9.393,15.272 9.771,15.272 L10.228,15.272 C10.607,15.272 10.914,15.578 10.914,15.954 C10.914,16.33 10.607,16.637 10.228,16.637 Z M4.057,11.637 C3.679,11.637 3.371,11.33 3.371,10.954 L3.371,9.137 C3.371,8.761 3.679,8.454 4.057,8.454 C4.435,8.454 4.742,8.761 4.742,9.137 L4.742,10.954 C4.742,11.33 4.435,11.637 4.057,11.637 Z M15.942,7.091 C15.662,7.091 15.396,7.147 15.152,7.249 C14.667,4.828 12.542,3 10,3 C7.458,3 5.333,4.828 4.847,7.249 C4.604,7.147 4.337,7.091 4.057,7.091 C2.922,7.091 2,8.009 2,9.137 L2,10.954 C2,12.082 2.922,13 4.057,13 C5.151,13 6.04,12.144 6.102,11.071 L6.114,11.071 L6.114,10.954 L6.114,9.137 L6.114,8.301 C6.114,6.13 7.857,4.363 10,4.363 C12.142,4.363 13.885,6.13 13.885,8.301 L13.885,9.137 L13.885,10.954 L13.885,11.995 C13.885,13.345 13.218,14.55 12.156,15.265 C11.87,14.476 11.118,13.909 10.228,13.909 L9.771,13.909 C8.637,13.909 7.714,14.826 7.714,15.954 C7.714,17.082 8.637,18 9.771,18 L10.228,18 C11.029,18 11.717,17.538 12.057,16.872 C13.729,16.159 14.902,14.645 15.189,12.853 C15.423,12.945 15.676,13 15.942,13 C17.077,13 18,12.082 18,10.954 L18,9.137 C18,8.009 17.077,7.091 15.942,7.091 Z"/>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/app/ui-utils/client/index.js b/app/ui-utils/client/index.js
index 293698e9d66f..813392fcf961 100644
--- a/app/ui-utils/client/index.js
+++ b/app/ui-utils/client/index.js
@@ -17,7 +17,7 @@ export { Layout } from './lib/Layout';
 export { IframeLogin, iframeLogin } from './lib/IframeLogin';
 export { fireGlobalEvent } from './lib/fireGlobalEvent';
 export { getAvatarAsPng, updateAvatarOfUsername } from './lib/avatar';
-export { TabBar } from './lib/TabBar';
+export { TabBar, TABBAR_DEFAULT_VISIBLE_ICON_COUNT } from './lib/TabBar';
 export { RocketChatTabBar } from './lib/RocketChatTabBar';
 export { popout } from './lib/popout';
 export { messageProperties } from '../lib/MessageProperties';
diff --git a/app/ui-utils/client/lib/TabBar.js b/app/ui-utils/client/lib/TabBar.js
index 761b965ea44c..b9ec9039e3d7 100644
--- a/app/ui-utils/client/lib/TabBar.js
+++ b/app/ui-utils/client/lib/TabBar.js
@@ -1,6 +1,8 @@
 import _ from 'underscore';
 import { ReactiveVar } from 'meteor/reactive-var';
 
+export const TABBAR_DEFAULT_VISIBLE_ICON_COUNT = 4;
+
 export const TabBar = new class TabBar {
 	get size() {
 		return this._size.get();
@@ -12,7 +14,7 @@ export const TabBar = new class TabBar {
 
 	constructor() {
 		this.buttons = new ReactiveVar({});
-		this._size = new ReactiveVar(4);
+		this._size = new ReactiveVar(TABBAR_DEFAULT_VISIBLE_ICON_COUNT);
 		this.extraGroups = {};
 	}
 
diff --git a/package-lock.json b/package-lock.json
index 8c97b0aaed90..0296bebbb172 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2681,9 +2681,9 @@
 			}
 		},
 		"@rocket.chat/apps-engine": {
-			"version": "1.12.0",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/apps-engine/-/apps-engine-1.12.0.tgz",
-			"integrity": "sha512-HqhUQIisnMdx9X/ZnQh71dyxL+NLKtMjCyf7qoPmKs/MzMJ2a/Ix4AjSL5SRajM3SGlB1+cZ5/+vVZNeXOe68g==",
+			"version": "1.13.0-beta.2857",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/apps-engine/-/apps-engine-1.13.0-beta.2857.tgz",
+			"integrity": "sha512-zWOmvGv1p1sj7s4aJAoPWIJ9Mmuz7Hlq3BKQYNh8ELjM1IiRXd1dwuyl+5q1hBuru+QZ7T7QZ+qCOa2OcM8tfQ==",
 			"requires": {
 				"adm-zip": "^0.4.9",
 				"cryptiles": "^4.1.3",
@@ -2694,11 +2694,6 @@
 				"uuid": "^3.2.1"
 			},
 			"dependencies": {
-				"adm-zip": {
-					"version": "0.4.14",
-					"resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.14.tgz",
-					"integrity": "sha512-/9aQCnQHF+0IiCl0qhXoK7qs//SwYE7zX8lsr/DNk1BRAHYxeLZPL4pguwK29gUEqasYQjqPtEpDRSWEkdHn9g=="
-				},
 				"typescript": {
 					"version": "2.9.2",
 					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
diff --git a/package.json b/package.json
index 15dced2347e9..4d0bb6be6017 100644
--- a/package.json
+++ b/package.json
@@ -124,7 +124,7 @@
 		"@google-cloud/language": "^3.7.0",
 		"@google-cloud/storage": "^2.3.1",
 		"@google-cloud/vision": "^1.8.0",
-		"@rocket.chat/apps-engine": "^1.12.0",
+		"@rocket.chat/apps-engine": "^1.13.0-beta.2857",
 		"@rocket.chat/fuselage": "^0.3.0",
 		"@rocket.chat/fuselage-hooks": "^0.3.0",
 		"@rocket.chat/fuselage-ui-kit": "^0.3.0",
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index e08e476ce934..66396ccf61b4 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -385,6 +385,7 @@
   "Apps_Framework_Development_Mode": "Enable development mode",
   "Apps_Framework_Development_Mode_Description": "Development mode allows the installation of Apps that are not from the Rocket.Chat's Marketplace.",
   "Apps_Framework_enabled": "Enable the App Framework",
+  "Apps_Game_Center_enabled": "Enable the Game Center",
   "Apps_Marketplace_Deactivate_App_Prompt": "Do you really want to disable this app?",
   "Apps_Marketplace_Modify_App_Subscription": "Modify Subscription",
   "Apps_Marketplace_Uninstall_App_Prompt": "Do you really want to uninstall this app?",
@@ -487,6 +488,7 @@
   "Back": "Back",
   "Back_to_applications": "Back to applications",
   "Back_to_chat": "Back to chat",
+  "Back_to_Game_Center": "Back to Game Center",
   "Back_to_imports": "Back to imports",
   "Back_to_integration_detail": "Back to the integration detail",
   "Back_to_integrations": "Back to integrations",
@@ -1436,6 +1438,7 @@
   "except_pinned": "(except those that are pinned)",
   "Execute_Synchronization_Now": "Execute Synchronization Now",
   "Exit_Full_Screen": "Exit Full Screen",
+  "Experimental_Feature_Alert": "This is an experimental feature! Please be aware that it may change, break, or even be removed in the future without any notice.",
   "Expiration": "Expiration",
   "Expiration_(Days)": "Expiration (Days)",
   "Export_My_Data": "Export My Data (JSON)",
@@ -1595,6 +1598,8 @@
   "From_Email": "From Email",
   "From_email_warning": "<b>Warning</b>: The field <b>From</b> is subject to your mail server settings.",
   "Full_Screen": "Full Screen",
+  "Game_Center": "Game Center",
+  "Game_Center_Play_Game_Together": "@here Let's play __name__ together!",
   "Gaming": "Gaming",
   "General": "General",
   "Get_link": "Get Link",
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index 7911dd0ea698..ecf78a99815f 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -370,6 +370,7 @@
   "Apps_Engine_Version": "Versão da Apps Engine",
   "Apps_Framework_Development_Mode": "Habilitar modo de desenvolvimento",
   "Apps_Framework_enabled": "Ativar o App Framework",
+  "Apps_Game_Center_enabled": "Habilitar Game Center",
   "Apps_Settings": "Configurações da aplicação",
   "Apps_WhatIsIt": "Apps: o que são eles?",
   "Apps_WhatIsIt_paragraph1": "Um novo ícone na área de administração! O que significa e quais são as aplicações?",
@@ -1335,6 +1336,7 @@
   "except_pinned": "(exceto aqueles que estão presos)",
   "Execute_Synchronization_Now": "Execute sincronização agora",
   "Exit_Full_Screen": "Sair da tela cheia",
+  "Experimental_Feature_Alert": "Esta é uma funcionalidade experimental! Essas funcionalidades podem sofrer mudanças, parar de funcionar, ou até serem removidas sem aviso prévio.",
   "Expiration": "Validade",
   "Expiration_(Days)": "Validade (Dias)",
   "Export_My_Data": "Exportar meus dados (JSON)",
@@ -1472,6 +1474,7 @@
   "From_Email": "Email De",
   "From_email_warning": "<b>Aviso</b>: O campo <b>De</b> está sujeito às configurações do seu servidor de emails.",
   "Full_Screen": "Tela cheia",
+  "Game_Center": "Game Center",
   "Gaming": "Jogos",
   "General": "Geral",
   "Get_link": "Obter Link",
diff --git a/packages/rocketchat-i18n/i18n/zh.i18n.json b/packages/rocketchat-i18n/i18n/zh.i18n.json
index 4fc64ad83383..735d4d3d1517 100644
--- a/packages/rocketchat-i18n/i18n/zh.i18n.json
+++ b/packages/rocketchat-i18n/i18n/zh.i18n.json
@@ -374,6 +374,7 @@
   "Apps_Framework_Development_Mode": "启用开发模式",
   "Apps_Framework_Development_Mode_Description": "开发模式允许您安装那些不在 Rocket.Chat 市场中的应用。",
   "Apps_Framework_enabled": "启用应用框架",
+  "Apps_Game_Center_enabled": "启用游戏中心",
   "Apps_Marketplace_Deactivate_App_Prompt": "是否确定要禁用此应用程序？",
   "Apps_Marketplace_Modify_App_Subscription": "修改订阅",
   "Apps_Marketplace_Uninstall_App_Prompt": "是否确定要卸载此应用程序？",
@@ -1401,6 +1402,7 @@
   "except_pinned": "（固定的除外）",
   "Execute_Synchronization_Now": "立即执行同步",
   "Exit_Full_Screen": "退出全屏",
+  "Experimental_Feature_Alert": "这是一个实验性特性！请注意这个特性随时都会改变、损坏甚至在未来版本中不加任何通知地被移除。",
   "Expiration": "期满",
   "Expiration_(Days)": "到期天数",
   "Export_My_Data": "导出我的数据",
@@ -1549,6 +1551,7 @@
   "From_Email": "从电子邮件",
   "From_email_warning": "<b>警告</b>：<b>From</b> 字段来自于邮件服务器的设置。",
   "Full_Screen": "全屏",
+  "Game_Center": "游戏中心",
   "Gaming": "游戏",
   "General": "通用",
   "Get_link": "获取链接",
@@ -3547,4 +3550,4 @@
   "Your_server_link": "您的服务器链接",
   "Your_temporary_password_is_password": "您的暂时密码为 <strong>[password]</strong>。",
   "Your_workspace_is_ready": "您的工作区已准备好使用🎉"
-}
\ No newline at end of file
+}
diff --git a/private/public/icons.svg b/private/public/icons.svg
index 86aae757dca4..0d2fbfeae599 100644
--- a/private/public/icons.svg
+++ b/private/public/icons.svg
@@ -146,6 +146,9 @@
 <symbol id="icon-folder" viewBox="0 0 20 20" fill="currentColor">
   <path d="M7.325376,4.5 L4,4.5 C3.72385763,4.5 3.5,4.72385763 3.5,5 L3.5,15 C3.5,15.2761424 3.72385763,15.5 4,15.5 L16,15.5 C16.2761424,15.5 16.5,15.2761424 16.5,15 L16.5,7 C16.5,6.72385763 16.2761424,6.5 16,6.5 L9.316214,6.5 L7.700244,4.66913179 C7.60533058,4.56159644 7.46880685,4.5 7.325376,4.5 Z M9.992979,5 L17,5 C17.5522847,5 18,5.44771525 18,6 L18,16 C18,16.5522847 17.5522847,17 17,17 L3,17 C2.44771525,17 2,16.5522847 2,16 L2,4 C2,3.44771525 2.44771525,3 3,3 L7.776552,3 C8.0634137,3 8.33646216,3.12319287 8.526289,3.33826358 L9.992979,5 Z"/>
 </symbol>
+<symbol id="icon-game" viewBox="0 0 20 20" fill="currentColor">
+  <path fill-rule="evenodd" d="M10 20C15.5229 20 20 15.5228 20 10C20 4.47715 15.5229 0 10 0C4.47716 0 7.62939e-06 4.47715 7.62939e-06 10C7.62939e-06 15.5228 4.47716 20 10 20ZM16.3276 14.8957C17.203 13.7658 17.7825 12.3952 17.9499 10.9H14.9439C15.0872 12.3612 15.5759 13.7203 16.3276 14.8957ZM15.042 16.2115C13.8851 17.1517 12.4604 17.7752 10.9 17.9499V10.9H13.1367C13.2973 12.8635 13.9787 14.6807 15.042 16.2115ZM14.9439 9.1H17.9499C17.7825 7.60479 17.203 6.23416 16.3276 5.10434C15.5759 6.27969 15.0872 7.63879 14.9439 9.1ZM15.042 3.7885C13.9787 5.31935 13.2973 7.13646 13.1367 9.1H10.9V2.05006C12.4604 2.22475 13.8851 2.84826 15.042 3.7885ZM9.10001 17.9499C7.53945 17.7752 6.1146 17.1516 4.9576 16.2111C6.02095 14.6803 6.70261 12.8633 6.86331 10.9H9.10001V17.9499ZM5.05607 10.9C4.91267 12.3612 4.42373 13.72 3.67202 14.8952C2.79682 13.7654 2.21744 12.395 2.05007 10.9H5.05607ZM9.10001 9.1H6.86333C6.70272 7.13674 6.02142 5.31947 4.95804 3.7885C6.11496 2.84826 7.53965 2.22475 9.10001 2.05006V9.1ZM5.0561 9.1C4.91278 7.63858 4.42402 6.2796 3.67238 5.10437C2.79698 6.23418 2.21747 7.6048 2.05007 9.1H5.0561Z"/>
+</symbol>
 <symbol id="icon-github" viewBox="0 0 20 20" fill="currentColor">
   <path d="M7.26894971,14.8834111 C7.26894971,14.9490684 7.19284523,15.001959 7.09565157,15.001959 C6.98562101,15.0119899 6.90951653,14.9590994 6.90951653,14.8834111 C6.90951653,14.816842 6.98653793,14.7648633 7.08281467,14.7648633 C7.1827591,14.7539205 7.26894971,14.806811 7.26894971,14.8834111 Z M6.23466241,14.7347704 C6.21082245,14.8004277 6.27775771,14.8770278 6.37770214,14.8961778 C6.46389275,14.9299184 6.56383718,14.8961778 6.58400945,14.8305206 C6.6032648,14.7639514 6.53999722,14.6882632 6.44096971,14.6581703 C6.35386218,14.6353727 6.25758544,14.6682013 6.23466241,14.7347704 Z M7.70448736,14.6782322 C7.60821061,14.7010299 7.54219228,14.7639514 7.55136149,14.8405516 C7.56144762,14.9062088 7.64855515,14.9499803 7.74758266,14.9262707 C7.84477633,14.9034731 7.91079467,14.8405516 7.90070853,14.7739824 C7.89153932,14.7110609 7.80168102,14.6682013 7.70448736,14.6782322 Z M9.89409558,2 C5.27923034,2 1.75,5.48348178 1.75,10.0731058 C1.75,13.7417045 4.0716449,16.8813977 7.38906641,17.986628 C7.81451792,18.0623162 7.9639761,17.8015111 7.9639761,17.5863012 C7.9639761,17.3811223 7.95480689,16.2494467 7.95480689,15.5545741 C7.95480689,15.5545741 5.62582662,16.051563 5.13619061,14.5697154 C5.13619061,14.5697154 4.75750208,13.6058305 4.21193387,13.357792 C4.21193387,13.357792 3.44997221,12.8380055 4.26511531,12.8489484 C4.26511531,12.8489484 5.0930953,12.9146056 5.54880522,13.7024926 C6.27775771,14.9791613 7.49818005,14.6116631 7.97406224,14.3937175 C8.05108363,13.8648119 8.26747708,13.4973137 8.50587663,13.2784562 C6.64727702,13.0732773 4.77033898,12.8051769 4.77033898,9.62262413 C4.77033898,8.71254172 5.02340928,8.25658861 5.55614059,7.67388053 C5.46903306,7.45867066 5.18662128,6.57229781 5.6423312,5.4278555 C6.3373576,5.21264563 7.93738538,6.3215236 7.93738538,6.3215236 C8.61789979,6.13383695 9.32085186,6.03874118 10.0270492,6.03883267 C10.7329655,6.0384409 11.4356553,6.13354292 12.1157961,6.3215236 C12.1157961,6.3215236 13.7158238,5.208998 14.4117672,5.4278555 C14.8674771,6.57594544 14.5841484,7.45867066 14.4979578,7.67388053 C15.0297722,8.25932433 15.3561962,8.71618935 15.3561962,9.62262413 C15.3561962,12.8152078 13.3967352,13.0696297 11.5372187,13.2793681 C11.8434704,13.5401733 12.1029592,14.0362503 12.1029592,14.8141063 C12.1029592,15.9284557 12.092873,17.3081698 12.092873,17.5799178 C12.092873,17.7951277 12.2459989,18.0559329 12.6677827,17.9802447 C15.9952904,16.8813977 18.25,13.7417045 18.25,10.0731058 C18.25,5.48348178 14.5080439,2 9.89409558,2 Z M4.98398166,13.4106826 C4.93996944,13.4444231 4.95005557,13.5201113 5.0069047,13.5830329 C5.06008614,13.6359234 5.13619061,13.6587211 5.18020283,13.6158615 C5.22329814,13.5830329 5.213212,13.5064327 5.15636288,13.4444231 C5.10318144,13.3915326 5.02707697,13.367823 4.98398166,13.4106826 Z M4.62454849,13.1425822 C4.60070853,13.1863537 4.6337177,13.2392442 4.70065296,13.2720728 C4.7538344,13.3049015 4.81985274,13.2948705 4.84369269,13.2492752 C4.86753265,13.2055037 4.83452348,13.1526131 4.76758822,13.1197845 C4.70065296,13.0997226 4.64838844,13.1106654 4.62454849,13.1425822 Z M5.70193109,14.320765 C5.64874965,14.3636246 5.66892192,14.4630224 5.7450264,14.5259439 C5.82204779,14.6016321 5.91832453,14.6116631 5.96141984,14.5587725 C6.00451514,14.5159129 5.98525979,14.4165152 5.91832453,14.3535936 C5.84497083,14.2779054 5.7450264,14.2678744 5.70193109,14.320765 Z M5.32324257,13.834719 C5.27006113,13.8675476 5.27006113,13.9532668 5.32324257,14.0298669 C5.37642401,14.1055551 5.4662823,14.1392957 5.5093776,14.1055551 C5.56255904,14.0626955 5.56255904,13.9769764 5.5093776,13.9003762 C5.46261462,13.824688 5.37642401,13.7909475 5.32324257,13.834719 Z"/>
 </symbol>
@@ -197,9 +200,6 @@
 <symbol id="icon-list" viewBox="0 0 20 20" fill="currentColor">
   <path d="M6.7826087,5.75 C6.35038585,5.75 6,5.41421356 6,5 C6,4.58578644 6.35038585,4.25 6.7826087,4.25 L17.2173913,4.25 C17.6496142,4.25 18,4.58578644 18,5 C18,5.41421356 17.6496142,5.75 17.2173913,5.75 L6.7826087,5.75 Z M6.7826087,10.75 C6.35038585,10.75 6,10.4142136 6,10 C6,9.58578644 6.35038585,9.25 6.7826087,9.25 L17.2173913,9.25 C17.6496142,9.25 18,9.58578644 18,10 C18,10.4142136 17.6496142,10.75 17.2173913,10.75 L6.7826087,10.75 Z M6.7826087,15.75 C6.35038585,15.75 6,15.4142136 6,15 C6,14.5857864 6.35038585,14.25 6.7826087,14.25 L17.2173913,14.25 C17.6496142,14.25 18,14.5857864 18,15 C18,15.4142136 17.6496142,15.75 17.2173913,15.75 L6.7826087,15.75 Z M1.995652,15 L1.995652,15 C1.995652,14.5857864 2.33143844,14.25 2.745652,14.25 L3.85434765,14.25 C4.26856121,14.25 4.60434765,14.5857864 4.60434765,15 L4.60434765,15 C4.60434765,15.4142136 4.26856121,15.75 3.85434765,15.75 L2.745652,15.75 C2.33143844,15.75 1.995652,15.4142136 1.995652,15 Z M1.995652,10 L1.995652,10 C1.995652,9.58578644 2.33143844,9.25 2.745652,9.25 L3.85434765,9.25 C4.26856121,9.25 4.60434765,9.58578644 4.60434765,10 L4.60434765,10 C4.60434765,10.4142136 4.26856121,10.75 3.85434765,10.75 L2.745652,10.75 C2.33143844,10.75 1.995652,10.4142136 1.995652,10 Z M1.995652,5 L1.995652,5 C1.995652,4.58578644 2.33143844,4.25 2.745652,4.25 L3.85434765,4.25 C4.26856121,4.25 4.60434765,4.58578644 4.60434765,5 L4.60434765,5 C4.60434765,5.41421356 4.26856121,5.75 3.85434765,5.75 L2.745652,5.75 C2.33143844,5.75 1.995652,5.41421356 1.995652,5 Z"/>
 </symbol>
-<symbol id="icon-omnichannel" viewBox="0 0 20 20" fill="currentColor">
-  <path d="M16.628,10.954 C16.628,11.33 16.32,11.637 15.942,11.637 C15.565,11.637 15.257,11.33 15.257,10.954 L15.257,9.137 C15.257,8.761 15.565,8.454 15.942,8.454 C16.32,8.454 16.628,8.761 16.628,9.137 L16.628,10.954 Z M10.228,16.637 L9.771,16.637 C9.393,16.637 9.086,16.33 9.086,15.954 C9.086,15.578 9.393,15.272 9.771,15.272 L10.228,15.272 C10.607,15.272 10.914,15.578 10.914,15.954 C10.914,16.33 10.607,16.637 10.228,16.637 Z M4.057,11.637 C3.679,11.637 3.371,11.33 3.371,10.954 L3.371,9.137 C3.371,8.761 3.679,8.454 4.057,8.454 C4.435,8.454 4.742,8.761 4.742,9.137 L4.742,10.954 C4.742,11.33 4.435,11.637 4.057,11.637 Z M15.942,7.091 C15.662,7.091 15.396,7.147 15.152,7.249 C14.667,4.828 12.542,3 10,3 C7.458,3 5.333,4.828 4.847,7.249 C4.604,7.147 4.337,7.091 4.057,7.091 C2.922,7.091 2,8.009 2,9.137 L2,10.954 C2,12.082 2.922,13 4.057,13 C5.151,13 6.04,12.144 6.102,11.071 L6.114,11.071 L6.114,10.954 L6.114,9.137 L6.114,8.301 C6.114,6.13 7.857,4.363 10,4.363 C12.142,4.363 13.885,6.13 13.885,8.301 L13.885,9.137 L13.885,10.954 L13.885,11.995 C13.885,13.345 13.218,14.55 12.156,15.265 C11.87,14.476 11.118,13.909 10.228,13.909 L9.771,13.909 C8.637,13.909 7.714,14.826 7.714,15.954 C7.714,17.082 8.637,18 9.771,18 L10.228,18 C11.029,18 11.717,17.538 12.057,16.872 C13.729,16.159 14.902,14.645 15.189,12.853 C15.423,12.945 15.676,13 15.942,13 C17.077,13 18,12.082 18,10.954 L18,9.137 C18,8.009 17.077,7.091 15.942,7.091 Z"/>
-</symbol>
 <symbol id="icon-loading" viewBox="0 0 20 20" fill="currentColor">
   <path d="M10,2.68702533 L10,2.68702533 C10,3.06515396 9.71022961,3.38019545 9.333419,3.41173939 C9.20724273,3.42233281 9.10021136,3.43419215 9.01232745,3.44734802 C5.81995673,3.92523329 3.37142857,6.68414566 3.37142857,10.0159806 C3.37142857,13.3545008 5.82979236,16.117797 9.03155256,16.5874622 C9.11479793,16.5996735 9.21552923,16.6107219 9.33374646,16.6206074 L9.33374367,16.6206408 C9.7103617,16.6521342 10,16.9670034 10,17.3449359 L10,17.3449359 C10,17.7068101 9.70664301,18.0001671 9.34476882,18.0001671 C9.32883938,18.0001671 9.31291523,17.9995862 9.29702812,17.9984256 C9.18973641,17.9906119 9.09725269,17.9819371 9.01957518,17.9724256 C5.06413098,17.4880865 2,14.1109378 2,10.0159806 C2,5.93002254 5.05067833,2.5587214 8.99351071,2.06277065 C9.07782726,2.05216486 9.17917305,2.04254526 9.29754807,2.03391185 L9.29755023,2.03394136 C9.65823854,2.00763539 9.9719594,2.27870584 9.99826537,2.63939416 C9.99942141,2.6552449 10,2.67113248 10,2.68702533 Z"/>
 </symbol>
@@ -236,6 +236,9 @@
 <symbol id="icon-mute" viewBox="0 0 20 20" fill="currentColor">
   <path d="M8.07162956,9.03236085 L6.868093,10.0641379 C6.6325462,9.59341351 6.5,9.06218567 6.5,8.5 L6.5,5.5 C6.5,3.56700338 8.06700338,2 10,2 C11.5863668,2 12.9262329,3.05539481 13.3557571,4.50234323 L12,5.66461716 L12,5.5 C12,4.3954305 11.1045695,3.5 10,3.5 C8.8954305,3.5 8,4.3954305 8,5.5 L8,8.5 C8,8.684342 8.02493988,8.86285898 8.07162956,9.03236085 Z M7.37145588,14.2427133 L8.69338552,13.1094393 C9.08788589,13.2036768 9.52319165,13.25 10,13.25 C12.5473822,13.25 13.9101536,11.9277943 14.1946327,9.04074514 C14.2030058,8.95577013 14.2109047,8.85128998 14.2183292,8.72730468 L14.2183104,8.72730356 C14.2429945,8.31509415 14.5870831,7.99494551 15,8 C15.402301,8.00492454 15.7244382,8.33504606 15.7195137,8.73734705 C15.7193751,8.74867236 15.7189723,8.75999289 15.7183058,8.77129942 C15.7126924,8.86709227 15.7067695,8.95009551 15.7005706,9.02031109 C15.39585,12.4718915 13.7154723,14.4393939 10.75,14.716139 L10.75,17 L12.5,17 C12.7761424,17 13,17.2238576 13,17.5 C13,17.7761424 12.7761424,18 12.5,18 L7.5,18 C7.22385763,18 7,17.7761424 7,17.5 C7,17.2238576 7.22385763,17 7.5,17 L9.25,17 L9.25,14.716139 C8.55228772,14.6510268 7.92571318,14.4923209 7.37145588,14.2427133 Z M4.94084799,11.7163414 C4.60618286,10.9564611 4.39181379,10.0586727 4.30015364,9.02848274 C4.29372099,8.95618468 4.28758275,8.87041985 4.28173892,8.77118824 L4.28175695,8.77118718 C4.25810647,8.3695884 4.5644941,8.02485576 4.96609288,8.00120528 C4.97738436,8.00054032 4.9886898,8.00013845 5,8 C5.41277955,7.99494719 5.75675134,8.31499417 5.78141823,8.72706702 C5.78840657,8.84343937 5.79579487,8.94198439 5.80360528,9.02270073 C5.86440242,9.65100643 5.97602995,10.2055069 6.13957636,10.6886863 L4.94084799,11.7163414 Z M13.4613488,9.02192297 C13.2093532,10.7073691 11.7556316,12 10,12 C9.9958443,12 9.99169029,11.9999928 9.98753799,11.9999783 L13.4613488,9.02192297 Z M17.7972,2.9998 C18.0667928,3.31427187 18.0304112,3.7877499 17.7159393,4.05734277 L3.07474272,16.6090606 C2.76027085,16.8786535 2.28679282,16.8422719 2.01719995,16.5278 C1.74760708,16.2133281 1.7839887,15.7398501 2.09846057,15.4702572 L16.7396572,2.91853938 C17.0541291,2.64894651 17.5276071,2.68532813 17.7972,2.9998 Z"/>
 </symbol>
+<symbol id="icon-omnichannel" viewBox="0 0 20 20" fill="currentColor">
+  <path d="M16.628,10.954 C16.628,11.33 16.32,11.637 15.942,11.637 C15.565,11.637 15.257,11.33 15.257,10.954 L15.257,9.137 C15.257,8.761 15.565,8.454 15.942,8.454 C16.32,8.454 16.628,8.761 16.628,9.137 L16.628,10.954 Z M10.228,16.637 L9.771,16.637 C9.393,16.637 9.086,16.33 9.086,15.954 C9.086,15.578 9.393,15.272 9.771,15.272 L10.228,15.272 C10.607,15.272 10.914,15.578 10.914,15.954 C10.914,16.33 10.607,16.637 10.228,16.637 Z M4.057,11.637 C3.679,11.637 3.371,11.33 3.371,10.954 L3.371,9.137 C3.371,8.761 3.679,8.454 4.057,8.454 C4.435,8.454 4.742,8.761 4.742,9.137 L4.742,10.954 C4.742,11.33 4.435,11.637 4.057,11.637 Z M15.942,7.091 C15.662,7.091 15.396,7.147 15.152,7.249 C14.667,4.828 12.542,3 10,3 C7.458,3 5.333,4.828 4.847,7.249 C4.604,7.147 4.337,7.091 4.057,7.091 C2.922,7.091 2,8.009 2,9.137 L2,10.954 C2,12.082 2.922,13 4.057,13 C5.151,13 6.04,12.144 6.102,11.071 L6.114,11.071 L6.114,10.954 L6.114,9.137 L6.114,8.301 C6.114,6.13 7.857,4.363 10,4.363 C12.142,4.363 13.885,6.13 13.885,8.301 L13.885,9.137 L13.885,10.954 L13.885,11.995 C13.885,13.345 13.218,14.55 12.156,15.265 C11.87,14.476 11.118,13.909 10.228,13.909 L9.771,13.909 C8.637,13.909 7.714,14.826 7.714,15.954 C7.714,17.082 8.637,18 9.771,18 L10.228,18 C11.029,18 11.717,17.538 12.057,16.872 C13.729,16.159 14.902,14.645 15.189,12.853 C15.423,12.945 15.676,13 15.942,13 C17.077,13 18,12.082 18,10.954 L18,9.137 C18,8.009 17.077,7.091 15.942,7.091 Z"/>
+</symbol>
 <symbol id="icon-pause" viewBox="0 0 20 20" fill="currentColor">
   <path d="M10,18 C5.58217143,18 2,14.4187429 2,10 C2,5.58125714 5.58217143,2 10,2 C14.4178286,2 18,5.58125714 18,10 C18,14.4187429 14.4178286,18 10,18 Z M11.0146065,7.74166381 L11.0020833,12.2500029 C11.0009359,12.6630659 11.3348595,12.9988497 11.7479225,12.9999971 C11.748615,12.999999 11.7493075,13 11.75,13 L11.75,13 C12.1642136,13 12.5,12.6642136 12.5,12.25 L12.5,7.74166667 C12.5,7.33205548 12.1679445,7 11.7583333,7 L11.7583333,7 C11.3483893,7 11.0157452,7.33172136 11.0146065,7.74166381 Z M7.5,7.75 L7.5,12.25 C7.5,12.6642136 7.83578644,13 8.25,13 L8.25,13 C8.66421356,13 9,12.6642136 9,12.25 L9,7.75 C9,7.33578644 8.66421356,7 8.25,7 L8.25,7 C7.83578644,7 7.5,7.33578644 7.5,7.75 Z"/>
 </symbol>

From b060e07dc19355fa12a8505d9c7fbea6cf530bef Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Thu, 19 Mar 2020 21:21:28 -0300
Subject: [PATCH 034/223] Add the await statement to deal the
 Livechat.sendMessage as a promise. (#16941)

---
 app/apps/server/bridges/livechat.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/apps/server/bridges/livechat.js b/app/apps/server/bridges/livechat.js
index f719b8251cbe..4e8a1103f243 100644
--- a/app/apps/server/bridges/livechat.js
+++ b/app/apps/server/bridges/livechat.js
@@ -32,7 +32,7 @@ export class AppLivechatBridge {
 			message: this.orch.getConverters().get('messages').convertAppMessage(message),
 		};
 
-		const msg = Livechat.sendMessage(data);
+		const msg = await Livechat.sendMessage(data);
 
 		return msg._id;
 	}

From 12fe0c3159dbd37175de1d27123e3b9903685542 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 20 Mar 2020 02:08:04 -0300
Subject: [PATCH 035/223] [NEW] Settings to enable E2E encryption for Private
 and Direct Rooms by default (#16928)

---
 app/cas/server/cas_server.js                  | 17 +---
 app/e2e/server/beforeCreateRoom.js            | 11 +++
 app/e2e/server/index.js                       |  1 +
 app/e2e/server/settings.js                    | 10 ++
 app/lib/server/functions/createDirectRoom.js  | 50 ++++++++--
 app/lib/server/functions/createRoom.js        |  8 +-
 .../server/saml_server.js                     | 18 +---
 packages/rocketchat-i18n/i18n/en.i18n.json    |  2 +
 packages/rocketchat-i18n/i18n/pt-BR.i18n.json |  2 +
 server/methods/createDirectMessage.js         | 91 +------------------
 10 files changed, 81 insertions(+), 129 deletions(-)
 create mode 100644 app/e2e/server/beforeCreateRoom.js

diff --git a/app/cas/server/cas_server.js b/app/cas/server/cas_server.js
index de2bec2ff5ff..50828e58240a 100644
--- a/app/cas/server/cas_server.js
+++ b/app/cas/server/cas_server.js
@@ -2,7 +2,6 @@ import url from 'url';
 
 import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
-import { Random } from 'meteor/random';
 import { WebApp } from 'meteor/webapp';
 import { RoutePolicy } from 'meteor/routepolicy';
 import _ from 'underscore';
@@ -11,8 +10,9 @@ import CAS from 'cas';
 
 import { logger } from './cas_rocketchat';
 import { settings } from '../../settings';
-import { Rooms, Subscriptions, CredentialTokens } from '../../models';
+import { Rooms, CredentialTokens } from '../../models/server';
 import { _setRealName } from '../../lib';
+import { createRoom } from '../../lib/server/functions/createRoom';
 
 RoutePolicy.declare('/_cas/', 'network');
 
@@ -250,18 +250,7 @@ Accounts.registerLoginHandler(function(options) {
 				if (room_name) {
 					let room = Rooms.findOneByNameAndType(room_name, 'c');
 					if (!room) {
-						room = Rooms.createWithIdTypeAndName(Random.id(), 'c', room_name);
-					}
-
-					if (!Subscriptions.findOneByRoomIdAndUserId(room._id, userId)) {
-						Subscriptions.createWithRoomAndUser(room, user, {
-							ts: new Date(),
-							open: true,
-							alert: true,
-							unread: 1,
-							userMentions: 1,
-							groupMentions: 0,
-						});
+						room = createRoom('c', room_name, user.username);
 					}
 				}
 			});
diff --git a/app/e2e/server/beforeCreateRoom.js b/app/e2e/server/beforeCreateRoom.js
new file mode 100644
index 000000000000..29ee95653d42
--- /dev/null
+++ b/app/e2e/server/beforeCreateRoom.js
@@ -0,0 +1,11 @@
+import { callbacks } from '../../callbacks/server';
+import { settings } from '../../settings/server';
+
+callbacks.add('beforeCreateRoom', ({ type, extraData }) => {
+	if (
+		(type === 'd' && settings.get('E2E_Enabled_Default_DirectRooms'))
+		|| (type === 'p' && settings.get('E2E_Enabled_Default_PrivateRooms'))
+	) {
+		extraData.encrypted = true;
+	}
+});
diff --git a/app/e2e/server/index.js b/app/e2e/server/index.js
index 6f2ab21df038..47f3d8df836a 100644
--- a/app/e2e/server/index.js
+++ b/app/e2e/server/index.js
@@ -2,6 +2,7 @@ import { callbacks } from '../../callbacks';
 import { Notifications } from '../../notifications';
 
 import './settings';
+import './beforeCreateRoom';
 import './methods/setUserPublicAndPrivateKeys';
 import './methods/getUsersOfRoomWithoutKey';
 import './methods/updateGroupKey';
diff --git a/app/e2e/server/settings.js b/app/e2e/server/settings.js
index 2d9b508e4764..e15f5e4df1ab 100644
--- a/app/e2e/server/settings.js
+++ b/app/e2e/server/settings.js
@@ -8,4 +8,14 @@ settings.addGroup('E2E Encryption', function() {
 		public: true,
 		alert: 'E2E_Enable_alert',
 	});
+
+	this.add('E2E_Enabled_Default_DirectRooms', false, {
+		type: 'boolean',
+		enableQuery: { _id: 'E2E_Enable', value: true },
+	});
+
+	this.add('E2E_Enabled_Default_PrivateRooms', false, {
+		type: 'boolean',
+		enableQuery: { _id: 'E2E_Enable', value: true },
+	});
 });
diff --git a/app/lib/server/functions/createDirectRoom.js b/app/lib/server/functions/createDirectRoom.js
index 67d516adff7d..a209e841569b 100644
--- a/app/lib/server/functions/createDirectRoom.js
+++ b/app/lib/server/functions/createDirectRoom.js
@@ -1,45 +1,81 @@
 import { Rooms, Subscriptions } from '../../../models/server';
+import { getDefaultSubscriptionPref } from '../../../utils/server';
+import { callbacks } from '../../../callbacks/server';
 
 export const createDirectRoom = function(source, target, extraData, options) {
 	const rid = [source._id, target._id].sort().join('');
 
-	Rooms.upsert({ _id: rid }, {
+	const now = new Date();
+
+	const roomUpsertResult = Rooms.upsert({ _id: rid }, {
+		$set: {
+			usernames: [source.username, target.username],
+		},
 		$setOnInsert: Object.assign({
 			t: 'd',
-			usernames: [source.username, target.username],
 			msgs: 0,
-			ts: new Date(),
+			ts: now,
+			usersCount: 2,
 		}, extraData),
 	});
 
+	const targetNotificationPref = getDefaultSubscriptionPref(target);
+
 	Subscriptions.upsert({ rid, 'u._id': target._id }, {
 		$setOnInsert: Object.assign({
+			fname: source.name,
 			name: source.username,
 			t: 'd',
-			open: true,
-			alert: true,
+			open: false,
+			alert: false,
 			unread: 0,
+			userMentions: 0,
+			groupMentions: 0,
+			customFields: target.customFields,
 			u: {
 				_id: target._id,
 				username: target.username,
 			},
+			ts: now,
+			...targetNotificationPref,
 		}, options.subscriptionExtra),
 	});
 
+	const sourceNotificationPref = getDefaultSubscriptionPref(source);
+
 	Subscriptions.upsert({ rid, 'u._id': source._id }, {
+		$set: {
+			ls: now,
+			open: true,
+			...target.active === false && {
+				archived: true,
+			},
+		},
 		$setOnInsert: Object.assign({
+			fname: target.name,
 			name: target.username,
 			t: 'd',
-			open: true,
-			alert: true,
+			alert: false,
 			unread: 0,
+			userMentions: 0,
+			groupMentions: 0,
+			customFields: source.customFields,
 			u: {
 				_id: source._id,
 				username: source.username,
 			},
+			ts: now,
+			...sourceNotificationPref,
 		}, options.subscriptionExtra),
 	});
 
+	// If the room is new, run a callback
+	if (roomUpsertResult.insertedId) {
+		const insertedRoom = Rooms.findOneById(rid);
+
+		callbacks.run('afterCreateDirectRoom', insertedRoom, { from: source, to: target });
+	}
+
 	return {
 		_id: rid,
 		t: 'd',
diff --git a/app/lib/server/functions/createRoom.js b/app/lib/server/functions/createRoom.js
index 434ecc8ac086..e82cb8806fbb 100644
--- a/app/lib/server/functions/createRoom.js
+++ b/app/lib/server/functions/createRoom.js
@@ -9,7 +9,9 @@ import { getValidRoomName } from '../../../utils';
 import { Apps } from '../../../apps/server';
 import { createDirectRoom } from './createDirectRoom';
 
-export const createRoom = function(type, name, owner, members, readOnly, extraData = {}, options = {}) {
+export const createRoom = function(type, name, owner, members = [], readOnly, extraData = {}, options = {}) {
+	callbacks.run('beforeCreateRoom', { type, name, owner, members, readOnly, extraData, options });
+
 	if (type === 'd') {
 		return createDirectRoom(members[0], members[1], extraData, options);
 	}
@@ -59,10 +61,6 @@ export const createRoom = function(type, name, owner, members, readOnly, extraDa
 		ro: readOnly === true,
 	});
 
-	if (type === 'd') {
-		room.usernames = members;
-	}
-
 	if (Apps && Apps.isLoaded()) {
 		const prevent = Promise.await(Apps.getBridges().getListenerBridge().roomEvent('IPreRoomCreatePrevent', room));
 		if (prevent) {
diff --git a/app/meteor-accounts-saml/server/saml_server.js b/app/meteor-accounts-saml/server/saml_server.js
index 4d0e716b273e..ca1e6544713a 100644
--- a/app/meteor-accounts-saml/server/saml_server.js
+++ b/app/meteor-accounts-saml/server/saml_server.js
@@ -11,10 +11,9 @@ import s from 'underscore.string';
 
 import { SAML } from './saml_utils';
 import { settings } from '../../settings/server';
-import { Rooms, Subscriptions, CredentialTokens } from '../../models';
+import { Users, Rooms, CredentialTokens } from '../../models/server';
 import { generateUsernameSuggestion } from '../../lib';
-import { _setUsername } from '../../lib/server/functions';
-import { Users } from '../../models/server';
+import { _setUsername, createRoom } from '../../lib/server/functions';
 
 if (!Accounts.saml) {
 	Accounts.saml = {
@@ -419,18 +418,7 @@ Accounts.saml.subscribeToSAMLChannels = function(channels, user) {
 
 			let room = Rooms.findOneByNameAndType(roomName, 'c');
 			if (!room) {
-				room = Rooms.createWithIdTypeAndName(Random.id(), 'c', roomName);
-			}
-
-			if (!Subscriptions.findOneByRoomIdAndUserId(room._id, user._id)) {
-				Subscriptions.createWithRoomAndUser(room, user, {
-					ts: new Date(),
-					open: true,
-					alert: true,
-					unread: 1,
-					userMentions: 1,
-					groupMentions: 0,
-				});
+				room = createRoom('c', roomName, user.username);
 			}
 		}
 	}	catch (err) {
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 66396ccf61b4..8759d94d6399 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1209,6 +1209,8 @@
   "E2E_Enabled": "E2E Enabled",
   "E2E_Enable_alert": "This feature is currently in beta! Please report bugs to github.com/RocketChat/Rocket.Chat/issues and be aware of:<br/>- Encrypted messages of encrypted rooms will not be found by search operations.<br/>- The mobile apps may not support the encypted messages (they are implementing it).<br/>- Bots may not be able to see encrypted messages until they implement support for it.<br/>- Uploads will not be encrypted in this version.",
   "E2E_Enable_description": "Enable option to create encrypted groups and be able to change groups and direct messages to be encrypted",
+  "E2E_Enabled_Default_DirectRooms": "Enable encryption for Direct Rooms by default",
+  "E2E_Enabled_Default_PrivateRooms": "Enable encryption for Private Rooms by default",
   "E2E_Encryption_Password_Change": "Change Encryption Password",
   "E2E_Encryption_Password_Explanation": "You can now create encrypted private groups and direct messages. You may also change existing private groups or DMs to encrypted.<br/><br/>This is end to end encryption so the key to encode/decode your messages will not be saved on the server. For that reason you need to store your password somewhere safe. You will be required to enter it on other devices you wish to use e2e encryption on.",
   "E2E_password_reveal_text": "You can now create encrypted private groups and direct messages. You may also change existing private groups or DMs to encrypted.<br/><br/>This is end to end encryption so the key to encode/decode your messages will not be saved on the server. For that reason you need to store this password somewhere safe.  You will be required to enter it on other devices you wish to use e2e encryption on. <a href=\"https://rocket.chat/docs/user-guides/end-to-end-encryption/\" target=\"_blank\">Learn more here!</a><br/><br/>Your password is: <span style=\"font-weight: bold;\">%s</span><br/><br/>This is an auto generated password, you can setup a new password for your encryption key any time from any browser you have entered the existing password.<br/>This password is only stored on this browser until you store the password and dismiss this message.",
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index ecf78a99815f..cfbcc744b4d9 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -1125,6 +1125,8 @@
   "E2E_Enabled": "E2E Enabled",
   "E2E_Enable_alert": "Este recurso está atualmente em beta! Relate os erros para github.com/RocketChat/Rocket.Chat/issues e esteja ciente de: <br/>- As mensagens criptografadas de salas criptografadas não serão encontradas pelas operações de pesquisa. <br/>- Os aplicativos para dispositivos móveis talvez não ofereçam suporte às mensagens critografadas (eles estão implementando). <br/>- Os bots talvez não consigam ver as mensagens criptografadas até implementarem o suporte. <br/>- Os uploads não serão criptografados nesta versão.",
   "E2E_Enable_description": "Ative a opção para criar grupos criptografados e ser capaz de alterar grupos e mensagens privadas para serem criptografadas",
+  "E2E_Enabled_Default_DirectRooms": "Ativar criptografia em salas diretas por padrão",
+  "E2E_Enabled_Default_PrivateRooms": "Ativar criptografia em salas privadas por padrão",
   "E2E_Encryption_Password_Explanation": "Agora você pode criar grupos privados criptografados e mensagens diretas. Você também pode alterar os grupos privados ou DMs existentes para criptografados. <br/><br/>Esta é uma criptografia de ponta a ponta, logo a chave para codificar / decodificar suas mensagens não será salva no servidor. Por esse motivo, você precisa armazenar sua senha em algum lugar seguro. Será solicitada a inserção de senha em outros dispositivos nos quais deseja usar a criptografia E2E.",
   "E2E_password_reveal_text": "Agora você pode criar grupos privados e mensagens diretas criptografados. Você também pode alterar os grupos privados ou DMs existentes para criptografados. <br/><br/>Esta é uma criptografia de ponta a ponta, logo a chave para codificar / decodificar suas mensagens não será salva no servidor. Por esse motivo, você precisa armazenar sua senha em algum lugar seguro. Será solicitada a inserção de senha em outros dispositivos nos quais deseja usar a criptografia E2E. <a href=\"https://rocket.chat/docs/user-guides/end-to-end-encryption/\" target=\"_blank\">Saiba mais aqui!</a><br/><br/>Sua senha é: <span style=\"font-weight: bold;\">%s</span><br/><br/>Esta é uma senha gerada automaticamente, você pode configurar uma nova senha para sua chave de criptografia a qualquer momento, a partir de qualquer navegador onde utilizou a senha existente. <br/>Esta senha só é armazenada neste navegador até que você armazene a senha e feche esta mensagem.",
   "E2E_password_request_text": "Para acessar seus grupos privados e mensagens diretas criptografados , insira sua senha de criptografia. <br/>Você precisa digitar essa senha para codificar / decodificar suas mensagens em todos os clientes que você usa, já que a chave não está armazenada no servidor.",
diff --git a/server/methods/createDirectMessage.js b/server/methods/createDirectMessage.js
index c2d2dcc9d17f..9d1d48f92441 100644
--- a/server/methods/createDirectMessage.js
+++ b/server/methods/createDirectMessage.js
@@ -3,11 +3,10 @@ import { check } from 'meteor/check';
 
 import { settings } from '../../app/settings';
 import { hasPermission } from '../../app/authorization';
-import { Users, Rooms, Subscriptions } from '../../app/models';
-import { getDefaultSubscriptionPref } from '../../app/utils';
+import { Users } from '../../app/models';
 import { RateLimiter } from '../../app/lib';
-import { callbacks } from '../../app/callbacks';
 import { addUser } from '../../app/federation/server/functions/addUser';
+import { createRoom } from '../../app/lib/server';
 
 Meteor.methods({
 	createDirectMessage(username) {
@@ -58,91 +57,7 @@ Meteor.methods({
 			});
 		}
 
-		const rid = [me._id, to._id].sort().join('');
-
-		const now = new Date();
-
-		// Make sure we have a room
-		const roomUpsertResult = Rooms.upsert({
-			_id: rid,
-		}, {
-			$set: {
-				usernames: [me.username, to.username],
-			},
-			$setOnInsert: {
-				t: 'd',
-				msgs: 0,
-				ts: now,
-				usersCount: 2,
-			},
-		});
-
-		const myNotificationPref = getDefaultSubscriptionPref(me);
-
-		// Make user I have a subcription to this room
-		const upsertSubscription = {
-			$set: {
-				ls: now,
-				open: true,
-			},
-			$setOnInsert: {
-				fname: to.name,
-				name: to.username,
-				t: 'd',
-				alert: false,
-				unread: 0,
-				userMentions: 0,
-				groupMentions: 0,
-				customFields: me.customFields,
-				u: {
-					_id: me._id,
-					username: me.username,
-				},
-				ts: now,
-				...myNotificationPref,
-			},
-		};
-
-		if (to.active === false) {
-			upsertSubscription.$set.archived = true;
-		}
-
-		Subscriptions.upsert({
-			rid,
-			$and: [{ 'u._id': me._id }], // work around to solve problems with upsert and dot
-		}, upsertSubscription);
-
-		const toNotificationPref = getDefaultSubscriptionPref(to);
-
-		Subscriptions.upsert({
-			rid,
-			$and: [{ 'u._id': to._id }], // work around to solve problems with upsert and dot
-		}, {
-			$setOnInsert: {
-				fname: me.name,
-				name: me.username,
-				t: 'd',
-				open: false,
-				alert: false,
-				unread: 0,
-				userMentions: 0,
-				groupMentions: 0,
-				customFields: to.customFields,
-				u: {
-					_id: to._id,
-					username: to.username,
-				},
-				ts: now,
-				...toNotificationPref,
-			},
-		});
-
-		// If the room is new, run a callback
-		if (roomUpsertResult.insertedId) {
-			const insertedRoom = Rooms.findOneById(rid);
-
-			callbacks.run('afterCreateDirectRoom', insertedRoom, { from: me, to });
-		}
+		const { _id: rid } = createRoom('d', undefined, undefined, [me, to]);
 
 		return {
 			rid,

From ee12b856605013a78ca31f30668684b03a5fe27f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 Mar 2020 09:47:11 -0300
Subject: [PATCH 036/223] Bump acorn from 6.0.7 to 6.4.1 (#16876)

---
 package-lock.json | 11 ++++++++---
 package.json      |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0296bebbb172..51e608b53119 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2694,6 +2694,11 @@
 				"uuid": "^3.2.1"
 			},
 			"dependencies": {
+				"adm-zip": {
+					"version": "0.4.14",
+					"resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.14.tgz",
+					"integrity": "sha512-/9aQCnQHF+0IiCl0qhXoK7qs//SwYE7zX8lsr/DNk1BRAHYxeLZPL4pguwK29gUEqasYQjqPtEpDRSWEkdHn9g=="
+				},
 				"typescript": {
 					"version": "2.9.2",
 					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
@@ -6516,9 +6521,9 @@
 			}
 		},
 		"acorn": {
-			"version": "6.0.7",
-			"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.0.7.tgz",
-			"integrity": "sha512-HNJNgE60C9eOTgn974Tlp3dpLZdUr+SoxxDwPaY9J/kDNOLQTkaDgwBUXAF4SSsrAwD9RpdxuHK/EbuF+W9Ahw==",
+			"version": "6.4.1",
+			"resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.1.tgz",
+			"integrity": "sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==",
 			"dev": true
 		},
 		"acorn-dynamic-import": {
diff --git a/package.json b/package.json
index 4d0bb6be6017..4583c8dd566c 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
 		"@types/meteor": "^1.4.37",
 		"@typescript-eslint/eslint-plugin": "^2.11.0",
 		"@typescript-eslint/parser": "^2.11.0",
-		"acorn": "^6.0.7",
+		"acorn": "^6.4.1",
 		"autoprefixer": "^9.6.1",
 		"babel-eslint": "^10.0.3",
 		"babel-loader": "^8.0.6",

From 9cf0d0aca676df6079a2317fa6a6799f66e58bc7 Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Fri, 20 Mar 2020 11:27:44 -0300
Subject: [PATCH 037/223] Upgrade the current version of the Livechat widget.
 (#16950)

---
 package-lock.json | 42 +++++++++++++++++++++---------------------
 package.json      |  2 +-
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 51e608b53119..bdb5822c96d0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2755,9 +2755,9 @@
 			"integrity": "sha512-cE8tq4MzfqJq3AiSKMQS6RWj5gYKDhnQZNP63q0ljtvcZDzGX/LL3zmACmrCwwjT4Y0XNp2CpPW9mNFtG20iNQ=="
 		},
 		"@rocket.chat/livechat": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/livechat/-/livechat-1.3.1.tgz",
-			"integrity": "sha512-FlnVnAVtGbb3Gko4iLarAhpdUQia6gkO55k47+A8lSTPM8ATNsJYVUZmequq/dOWz3ZLjJcIVyVu73Q5cpoEUw==",
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/livechat/-/livechat-1.4.0.tgz",
+			"integrity": "sha512-jOUy49njPMW0ZmL9Gk6lRv4X0WTSS9N78iSzR/p3pSV4ivEQk1LRXCi6QLknZmxEXIpe6MTJgUY/ggsORfxrDQ==",
 			"dev": true,
 			"requires": {
 				"@kossnocorp/desvg": "^0.2.0",
@@ -12094,9 +12094,9 @@
 			}
 		},
 		"date-fns": {
-			"version": "2.9.0",
-			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.9.0.tgz",
-			"integrity": "sha512-khbFLu/MlzLjEzy9Gh8oY1hNt/Dvxw3J6Rbc28cVoYWQaC1S3YI4xwkF9ZWcjDLscbZlY9hISMr66RFzZagLsA==",
+			"version": "2.11.0",
+			"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.11.0.tgz",
+			"integrity": "sha512-8P1cDi8ebZyDxUyUprBXwidoEtiQAawYPGvpfb+Dg0G6JrQ+VozwOmm91xYC0vAv1+0VmLehEPb+isg4BGUFfA==",
 			"dev": true
 		},
 		"date-now": {
@@ -16757,9 +16757,9 @@
 			}
 		},
 		"i18n": {
-			"version": "0.8.5",
-			"resolved": "https://registry.npmjs.org/i18n/-/i18n-0.8.5.tgz",
-			"integrity": "sha512-6UgLbhJGgn4XFeuZc/dDdrrri0ij24EK4hxv4Pbi5hloYAZ1B2+0eQchEryBFezLKYOHhVGV/5+H4i0oxng94w==",
+			"version": "0.8.6",
+			"resolved": "https://registry.npmjs.org/i18n/-/i18n-0.8.6.tgz",
+			"integrity": "sha512-aMsJq8i1XXrb+BBsgmJBwak9mr69zPEIAUPb6c5yw2G/O4k1Q52lBxL+agZdQDN/RGf1ylQzrCswsOOgIiC1FA==",
 			"dev": true,
 			"requires": {
 				"debug": "*",
@@ -16873,9 +16873,9 @@
 					"dev": true
 				},
 				"minimist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+					"version": "1.2.5",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+					"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
 					"dev": true
 				},
 				"supports-color": {
@@ -19347,9 +19347,9 @@
 			}
 		},
 		"make-plural": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/make-plural/-/make-plural-6.0.1.tgz",
-			"integrity": "sha512-h0uBNi4tpDkiWUyYKrJNj8Kif6q3Ba5zp/8jnfPy3pQE+4XcTj6h3eZM5SYVUyDNX9Zk69Isr/dx0I+78aJUaQ==",
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/make-plural/-/make-plural-6.1.0.tgz",
+			"integrity": "sha512-0ekbPHqxcdRcmjZ43TkRuejK5rXgMF1OjG4FVnVHgCvOcjrexaSX7a0dfAvqhOm1qWPgjYnXtmz3cHpHW5ZewA==",
 			"dev": true
 		},
 		"mamacro": {
@@ -19749,9 +19749,9 @@
 					}
 				},
 				"minimist": {
-					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-					"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+					"version": "1.2.5",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+					"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
 					"dev": true,
 					"optional": true
 				}
@@ -21123,9 +21123,9 @@
 			}
 		},
 		"mustache": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/mustache/-/mustache-4.0.0.tgz",
-			"integrity": "sha512-FJgjyX/IVkbXBXYUwH+OYwQKqWpFPLaLVESd70yHjSDunwzV2hZOoTBvPf4KLoxesUzzyfTH6F784Uqd7Wm5yA==",
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/mustache/-/mustache-4.0.1.tgz",
+			"integrity": "sha512-yL5VE97+OXn4+Er3THSmTdCFCtx5hHWzrolvH+JObZnUYwuaG7XV+Ch4fR2cIrcYI0tFHxS7iyFYl14bW8y2sA==",
 			"dev": true
 		},
 		"mute-stream": {
diff --git a/package.json b/package.json
index 4583c8dd566c..9e139a098b12 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
 		"@babel/preset-react": "^7.0.0",
 		"@octokit/rest": "^16.1.0",
 		"@rocket.chat/eslint-config": "^0.3.0",
-		"@rocket.chat/livechat": "^1.3.1",
+		"@rocket.chat/livechat": "^1.4.0",
 		"@settlin/spacebars-loader": "^1.0.7",
 		"@storybook/addon-actions": "^5.2.8",
 		"@storybook/addon-knobs": "^5.2.8",

From 2ff44263e251fdc59123b319a8d9395917c51c6d Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Fri, 20 Mar 2020 11:45:03 -0300
Subject: [PATCH 038/223] Add lint to `.less` files (#16893)

---
 app/livechat/client/stylesheets/livechat.less | 329 ++++++++++--------
 package.json                                  |   2 +-
 2 files changed, 191 insertions(+), 140 deletions(-)

diff --git a/app/livechat/client/stylesheets/livechat.less b/app/livechat/client/stylesheets/livechat.less
index c79cba89c444..00fbbed79423 100644
--- a/app/livechat/client/stylesheets/livechat.less
+++ b/app/livechat/client/stylesheets/livechat.less
@@ -13,8 +13,8 @@
 
 .trigger-option,
 .trigger-value {
-	float: left;
 	display: inline-block;
+	float: left;
 }
 
 .trigger-option {
@@ -26,29 +26,37 @@
 .trigger-value {
 	width: 70%;
 
-	textarea, input, select {
+	textarea,
+	input,
+	select {
 		display: block !important;
+
 		width: auto !important;
-		margin-bottom: 4px;
 		min-width: 50%;
+		margin-bottom: 4px;
 	}
 }
 
 .livechat-code {
 	width: 90%;
 	max-width: 750px;
+
 	text-align: right;
 
 	textarea {
-		text-align: left;
+		display: block;
+
 		width: 100%;
 		height: 200px;
+
+		margin-bottom: 1rem;
+
+		text-align: left;
+
 		background-color: #efefef;
+
 		font-family: courier;
 		font-size: 12px;
-		display: block;
-
-		margin-bottom: 1rem;
 	}
 }
 
@@ -69,14 +77,18 @@
 
 	li {
 		display: inline-block;
-		background-color: #dddddd;
-		border-radius: 10px;
-		padding: 2px 8px 2px 2px;
+
 		margin: 1px 0;
+		padding: 2px 8px 2px 2px;
+
 		cursor: pointer;
 
+		border-radius: 10px;
+		background-color: #dddddd;
+
 		.icon-plus-circled {
 			opacity: 0.5;
+
 			font-size: 0.8rem;
 		}
 	}
@@ -85,8 +97,9 @@
 .agent-info {
 	input[type='text'] {
 		width: auto;
-		line-height: 24px;
 		height: 24px;
+
+		line-height: 24px;
 	}
 }
 
@@ -97,24 +110,28 @@
 .visitor-navigation,
 .visitor-custom-fields {
 	.visitor-scroll {
-		height: 130px;
 		overflow-y: auto;
-		border: 1px solid #e7e7e7;
-		border-radius: 4px;
-		padding: 4px;
+
+		height: 130px;
 		margin-top: 4px;
 		margin-bottom: 20px;
+		padding: 4px;
+
+		border: 1px solid #e7e7e7;
+		border-radius: 4px;
 
 		ul {
 			li {
 				white-space: nowrap;
 
 				a {
-					text-overflow: ellipsis;
 					display: block;
 					overflow: hidden;
-					color: @secondary-font-color;
+
 					text-decoration: underline;
+					text-overflow: ellipsis;
+
+					color: @secondary-font-color;
 
 					&:hover {
 						text-decoration: none;
@@ -130,39 +147,46 @@
 }
 
 .livechat-status {
+	color: #9d9fa3;
+
 	font-size: 20px;
 	line-height: 18px;
-	color: #9d9fa3;
 }
 
 .external-message {
-	padding: 10px;
 	position: relative;
 
+	padding: 10px;
+
 	&::after {
-		content: " ";
 		position: absolute;
-		border-bottom: 1px solid #cccccc;
-		left: 10px;
 		right: 10px;
 		bottom: 0;
+		left: 10px;
+
+		content: " ";
+
+		border-bottom: 1px solid #cccccc;
 	}
 }
 
 .user-view {
 	li {
 		color: @secondary-font-color;
-		line-height: 18px;
+
 		font-size: 12px;
 		font-weight: 300;
+		line-height: 18px;
 	}
 
 	nav.centered-buttons {
-		text-align: center;
 		margin-bottom: 1em;
 
+		text-align: center;
+
 		button {
 			display: inline-block;
+
 			width: auto;
 		}
 	}
@@ -178,8 +202,9 @@
 
 .visitor-edit {
 	h3 {
-		font-size: 24px;
 		margin-bottom: 8px;
+
+		font-size: 24px;
 		line-height: 22px;
 	}
 }
@@ -192,27 +217,31 @@
 
 .lc-analytics-table {
 	display: flex;
-	flex-flow: column;
-	// width: 100%;
-	min-height: 300px;
+
 	height: ~"calc(100% - 280px)";
 	height: ~"-webkit-calc-height(100% - 280px)";
+
+	min-height: 300px;
+	flex-flow: column;
 }
 
 .lc-analytics-flex-container {
 	position: relative;
+
 	display: flex;
-	flex-flow: row;
+
 	height: 100%;
-	// align-content: stretch;
+	flex-flow: row;
 }
 
 .lc-analytics-chart-col {
 	position: relative;
+
 	flex: 66.66666%;
+
 	max-width: 66.66666%;
-	padding-right: 2px;
 	max-height: 100%;
+	padding-right: 2px;
 }
 
 .lc-chart-ov-content {
@@ -221,137 +250,141 @@
 
 .lc-analytics-chart-ov-col {
 	position: relative;
+
 	flex: 33.33333%;
+
 	max-width: 33.33333%;
-	// overflow: scroll;
-	padding-left: 2px;
 	height: 100%;
+
+	padding-left: 2px;
 }
 
 .lc-chart-section {
 	position: relative;
+
 	height: 100%;
 	max-height: 100%;
 }
 
 .lc-chart-section-content {
 	position: relative;
-	width: 100%;
-	height: 100%;
-	// max-height: 100%;
+
 	display: flex;
 	flex-direction: column;
-}
 
-.lc-chart-options {
-	// flex: 1;
+	width: 100%;
+	height: 100%;
 }
 
 .border-component-td {
-  padding: 0.5rem;
+	padding: 0.5rem;
 }
 
 .lc-analytics-chart-container {
-	// flex-grow: 100%;
-	flex: auto;
 	position: relative;
-	// height: inherit;
+
+	flex: auto;
 }
 
 .lc-analytics-header {
 	float: right;
-  & > .lc-date-picker-btn {
-    font-weight: inherit;
-    font-size: inherit;
-    color: #383838;
-    //line-height: 1;
-    padding-top: 23px;
-  }
-
-  & > .lc-date-picker-btn {
-    // padding-top: 15px;
-    // padding-right: 25px;
-    // padding-left: 10px;
-    position: relative;
-
-    .fade {
-      color: #9ea2a8;
-    }
-  }
+
+	& > .lc-date-picker-btn {
+		position: relative;
+
+		padding-top: 23px;
+
+		color: #383838;
+
+		font-size: inherit;
+		font-weight: inherit;
+
+		.fade {
+			color: #9ea2a8;
+		}
+	}
 }
 
 .lc-analytics-overview {
-  display: flex;
-  flex-wrap: wrap;
-  margin-top: 10px;
-  margin-bottom: 10px;
+	display: flex;
+
+	margin-top: 10px;
+	margin-bottom: 10px;
+	flex-wrap: wrap;
 	justify-content: center;
 }
 
 .lc-analytics-ov-col {
-  min-height: 20px;
-  flex: 25%; //1;
-  max-width: 25%;
+	flex: 25%;
 
-  &.-full-width {
-    max-width: 100%;
-  }
+	max-width: 25%;
+	min-height: 20px;
+
+	&.-full-width {
+		max-width: 100%;
+	}
 
-  &:not(:last-child) {
-    border-right: 1px solid #E9E9E9;
-  }
+	&:not(:last-child) {
+		border-right: 1px solid #e9e9e9;
+	}
 }
 
 .lc-analytics-ov-case {
-  width: 100%;
-  text-align: center;
-  margin-bottom: 20px;
-  user-select: text;
-
-  &:first-child {
-    margin-top: 8px;
-		//border-bottom: 1px solid #E9E9E9;
-  }
-
-  &.-standalone {
-    & > .title {
-			margin-top: 1px;
+	width: 100%;
+	margin-bottom: 20px;
+
+	user-select: text;
+	text-align: center;
+
+	&:first-child {
+		margin-top: 8px;
+	}
+
+	&.-standalone {
+		& > .title {
 			display: inline-block;
-      font-size: .875rem;
-      font-weight: 300;
-      text-transform: none;
-      // margin-bottom: 6px;
-    }
-    & > .value {
-      // margin-top: 1px;
-      font-size: 1.75rem;
+
+			margin-top: 1px;
+
+			text-transform: none;
+
+			font-size: 0.875rem;
+			font-weight: 300;
+		}
+
+		& > .value {
 			margin-bottom: 6px;
-    }
-  }
 
-  & > .title {
+			font-size: 1.75rem;
+		}
+	}
+
+	& > .title {
+		display: inline-block;
+
 		margin-top: 8px;
+
+		text-transform: uppercase;
+
+		color: #9ea2a8;
+
+		font-size: 0.875rem;
+		font-weight: 300;
+	}
+
+	& > .value {
 		display: inline-block;
-    font-weight: 300;
-    font-size: 0.875rem;
-    color: #9ea2a8;
-    text-transform: uppercase;
-    //cursor: help;
-  }
-
-  & > .value {
-    display: inline-block;
-    width: 100%;
-  }
-
-  & > .value {
-    // margin-top: 8px;
-    font-weight: 400;
-    font-size: 1.75rem;
-    color: #383838;
-    line-height: 1;
-    text-transform: capitalize;
-  }
+
+		width: 100%;
+
+		text-transform: capitalize;
+
+		color: #383838;
+
+		font-size: 1.75rem;
+		font-weight: 400;
+		line-height: 1;
+	}
 }
 
 @media screen and (max-width: 925px) {
@@ -359,6 +392,7 @@
 		& > .title {
 			font-size: 0.5rem;
 		}
+
 		& > .value {
 			font-size: 1rem;
 		}
@@ -370,18 +404,20 @@
 
 	.lc-analytics-chart-col {
 		flex: 100%;
+
 		max-width: 100%;
-		padding-right: 0px;
 		max-height: 100%;
+		padding-right: 0;
 		padding-bottom: 2px;
 	}
 
 	.lc-analytics-chart-ov-col {
-		padding-left: 0;
 		flex: 100%;
+
 		max-width: 100%;
 		max-height: 100%;
 		padding-top: 2px;
+		padding-left: 0;
 	}
 }
 
@@ -390,6 +426,7 @@
 		& > .title {
 			font-size: 0.875rem;
 		}
+
 		& > .value {
 			font-size: 1.75rem;
 		}
@@ -401,18 +438,20 @@
 
 	.lc-analytics-chart-col {
 		flex: 66.66666%;
+
 		max-width: 66.66666%;
-		padding-right: 2px;
 		max-height: 100%;
+		padding-right: 2px;
 		padding-bottom: 0;
 	}
 
 	.lc-analytics-chart-ov-col {
-		padding-left: 2px;
 		flex: 33.33333%;
+
 		max-width: 33.33333%;
 		max-height: 100%;
 		padding-top: 0;
+		padding-left: 2px;
 	}
 }
 
@@ -421,6 +460,7 @@
 		& > .title {
 			font-size: 0.5rem;
 		}
+
 		& > .value {
 			font-size: 1rem;
 		}
@@ -432,55 +472,56 @@
 
 	.lc-analytics-chart-col {
 		flex: 100%;
+
 		max-width: 100%;
-		padding-right: 0;
 		max-height: 100%;
+		padding-right: 0;
 		padding-bottom: 2px;
 	}
 
 	.lc-analytics-chart-ov-col {
-		padding-left: 0;
 		flex: 100%;
+
 		max-width: 100%;
 		max-height: 100%;
 		padding-top: 2px;
+		padding-left: 0;
 	}
 }
 
 .lc-monitoring-flex {
 	display: flex;
-	flex-wrap: wrap;
-	margin-bottom: 2px !important;
+
 	margin-top: 2px !important;
-	// flex-direction: row;
-  // margin-top: 10px;
-  // margin-bottom: 10px;
-	// justify-content: center;
-	// padding: 0 4px;
+	margin-bottom: 2px !important;
+	flex-wrap: wrap;
 }
 
 .lc-monitoring-doughnut-chart {
 	flex: 33.33333%;
+
 	max-width: 33.33333%;
-	padding: 2px 2px;
+	padding: 2px;
 }
 
 .lc-monitoring-line-chart {
 	flex: 66.66666%;
+
 	max-width: 66.66666%;
-	padding: 2px 2px;
+	padding: 2px;
 
 	& .lc-analytics-ov-col {
-		min-height: 20px;
-		flex: 33.3%; //1;
+		flex: 33.3%;
+
 		max-width: 33.3%;
+		min-height: 20px;
 
 		&.-full-width {
-		  max-width: 100%;
+			max-width: 100%;
 		}
 
 		&:not(:last-child) {
-		  border-right: 1px solid #E9E9E9;
+			border-right: 1px solid #e9e9e9;
 		}
 	}
 
@@ -491,8 +532,9 @@
 
 .lc-monitoring-line-chart-full {
 	flex: 66.66666%;
+
 	width: 100%;
-	padding: 2px 2px;
+	padding: 2px;
 }
 
 .lc-monitoring-chart-container {
@@ -502,16 +544,19 @@
 @media screen and (max-width: 925px) {
 	.lc-monitoring-doughnut-chart {
 		flex: 100%;
+
 		max-width: 100%;
 	}
 
 	.lc-monitoring-line-chart {
 		flex: 100%;
+
 		max-width: 100%;
 	}
 
 	.lc-monitoring-line-chart-full {
 		flex: 100%;
+
 		max-width: 100%;
 	}
 }
@@ -519,16 +564,19 @@
 @media screen and (max-width: 800px) {
 	.lc-monitoring-doughnut-chart {
 		flex: 33.33333%;
+
 		max-width: 33.33333%;
 	}
 
 	.lc-monitoring-line-chart {
 		flex: 66.66666%;
+
 		max-width: 66.66666%;
 	}
 
 	.lc-monitoring-line-chart-full {
 		flex: 66.66666%;
+
 		width: 66.66666%;
 		max-width: 100%;
 	}
@@ -537,16 +585,19 @@
 @media screen and (max-width: 600px) {
 	.lc-monitoring-doughnut-chart {
 		flex: 100%;
+
 		max-width: 100%;
 	}
 
 	.lc-monitoring-line-chart {
 		flex: 100%;
+
 		max-width: 100%;
 	}
 
 	.lc-monitoring-line-chart-full {
 		flex: 100%;
+
 		max-width: 100%;
 	}
 }
@@ -561,6 +612,7 @@
 
 .livechat-group-filters-buttons {
 	flex: 0 0 auto;
+
 	margin-top: 26px;
 	padding-left: 30px;
 
@@ -581,4 +633,3 @@
 .livechat-current-chats-add-filter-button {
 	margin-top: 17px;
 }
-
diff --git a/package.json b/package.json
index 9e139a098b12..c7a9d3512673 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
 		"jslint": "eslint --ext .js,.jsx .",
 		"tslint": "eslint --ext .ts,.tsx .",
 		"eslint": "meteor npm run jslint && meteor npm run tslint",
-		"stylelint": "stylelint \"app/**/*.css\" \"client/**/*.css\"",
+		"stylelint": "stylelint \"app/**/*.css\" \"client/**/*.css\" \"app/**/*.less\" \"client/**/*.less\" \"ee/**/*.less\"",
 		"deploy": "npm run build && pm2 startOrRestart pm2.json",
 		"postinstall": "node .scripts/npm-postinstall.js",
 		"testunit-watch": "mocha --watch --opts ./mocha.opts \"`node -e \"console.log(require('./package.json').mocha.tests.join(' '))\"`\"",

From 0129fb512771f0a324cf0a98635046dce55ef31f Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 20 Mar 2020 15:49:29 -0300
Subject: [PATCH 039/223] [IMPROVE] Allow login of non LDAP users when LDAP is
 enabled (#16949)

---
 app/ldap/server/loginHandler.js | 24 ++++++++++++++++++------
 app/ldap/server/settings.js     |  2 +-
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/ldap/server/loginHandler.js b/app/ldap/server/loginHandler.js
index d8ec65ce7a88..c563ea950c99 100644
--- a/app/ldap/server/loginHandler.js
+++ b/app/ldap/server/loginHandler.js
@@ -74,11 +74,7 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) {
 	}
 
 	if (ldapUser === undefined) {
-		if (settings.get('LDAP_Login_Fallback') === true) {
-			return fallbackDefaultAccountSystem(self, loginRequest.username, loginRequest.ldapPass);
-		}
-
-		throw new Meteor.Error('LDAP-login-error', `LDAP Authentication failed with provided username [${ loginRequest.username }]`);
+		return fallbackDefaultAccountSystem(self, loginRequest.username, loginRequest.ldapPass);
 	}
 
 	// Look to see if user already exists
@@ -120,7 +116,7 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) {
 	if (user) {
 		if (user.ldap !== true && settings.get('LDAP_Merge_Existing_Users') !== true) {
 			logger.info('User exists without "ldap: true"');
-			throw new Meteor.Error('LDAP-login-error', `LDAP Authentication succeded, but there's already an existing user with provided username [${ username }] in Mongo.`);
+			throw new Meteor.Error('LDAP-login-error', `LDAP Authentication succeeded, but there's already an existing user with provided username [${ username }] in Mongo.`);
 		}
 
 		logger.info('Logging user');
@@ -156,3 +152,19 @@ Accounts.registerLoginHandler('ldap', function(loginRequest) {
 
 	return result;
 });
+
+callbacks.add('beforeValidateLogin', (login) => {
+	if (!login.allowed) {
+		return login;
+	}
+
+	if (login.type === 'ldap') {
+		return login;
+	}
+
+	if (login.user.services && login.user.services.ldap && login.user.services.ldap.id) {
+		login.allowed = !!settings.get('LDAP_Login_Fallback');
+	}
+
+	return login;
+});
diff --git a/app/ldap/server/settings.js b/app/ldap/server/settings.js
index 598537a8056e..c07c0e1e7fb0 100644
--- a/app/ldap/server/settings.js
+++ b/app/ldap/server/settings.js
@@ -33,7 +33,7 @@ settings.addGroup('LDAP', function() {
 	];
 
 	this.add('LDAP_Enable', false, { type: 'boolean', public: true });
-	this.add('LDAP_Login_Fallback', true, { type: 'boolean', enableQuery });
+	this.add('LDAP_Login_Fallback', false, { type: 'boolean', enableQuery: null });
 	this.add('LDAP_Find_User_After_Login', true, { type: 'boolean', enableQuery });
 	this.add('LDAP_Host', '', { type: 'string', enableQuery });
 	this.add('LDAP_Port', '389', { type: 'string', enableQuery });

From 3ded1721532c91ea5e41bcd4ab4b463e8a083018 Mon Sep 17 00:00:00 2001
From: Marcelo Schmidt <marcelo.schmidt@rocket.chat>
Date: Fri, 20 Mar 2020 16:05:20 -0300
Subject: [PATCH 040/223] [FIX] Login with LinkedIn not mapping name and
 picture correctly (#16955)

Co-authored-by: Diego Sampaio <chinello@gmail.com>
---
 .../functions/getAvatarSuggestionForUser.js   |  5 ++--
 server/lib/accounts.js                        | 28 ++++++++++++++++---
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/app/lib/server/functions/getAvatarSuggestionForUser.js b/app/lib/server/functions/getAvatarSuggestionForUser.js
index f2bb8cd47306..66c58531dd10 100644
--- a/app/lib/server/functions/getAvatarSuggestionForUser.js
+++ b/app/lib/server/functions/getAvatarSuggestionForUser.js
@@ -34,10 +34,11 @@ const avatarProviders = {
 	},
 
 	linkedin(user) {
-		if (user.services && user.services.linkedin && user.services.linkedin.pictureUrl && settings.get('Accounts_OAuth_Linkedin')) {
+		if (user.services && user.services.linkedin && user.services.linkedin.profilePicture && user.services.linkedin.profilePicture.identifiersUrl && user.services.linkedin.profilePicture.identifiersUrl.length > 0 && settings.get('Accounts_OAuth_Linkedin')) {
+			const total = user.services.linkedin.profilePicture.identifiersUrl.length;
 			return {
 				service: 'linkedin',
-				url: user.services.linkedin.pictureUrl,
+				url: user.services.linkedin.profilePicture.identifiersUrl[total - 1],
 			};
 		}
 	},
diff --git a/server/lib/accounts.js b/server/lib/accounts.js
index 1083c9e03be0..95e3aa4bec90 100644
--- a/server/lib/accounts.js
+++ b/server/lib/accounts.js
@@ -98,6 +98,29 @@ Accounts.emailTemplates.enrollAccount.html = function(user = {}/* , url*/) {
 	});
 };
 
+const getLinkedInName = ({ firstName, lastName }) => {
+	const { preferredLocale, localized: firstNameLocalized } = firstName;
+	const { localized: lastNameLocalized } = lastName;
+
+	// LinkedIn new format
+	if (preferredLocale && firstNameLocalized && preferredLocale.language && preferredLocale.country) {
+		const locale = `${ preferredLocale.language }_${ preferredLocale.country }`;
+
+		if (firstNameLocalized[locale] && lastNameLocalized[locale]) {
+			return `${ firstNameLocalized[locale] } ${ lastNameLocalized[locale] }`;
+		}
+		if (firstNameLocalized[locale]) {
+			return firstNameLocalized[locale];
+		}
+	}
+
+	// LinkedIn old format
+	if (!lastName) {
+		return firstName;
+	}
+	return `${ firstName } ${ lastName }`;
+};
+
 Accounts.onCreateUser(function(options, user = {}) {
 	callbacks.run('beforeCreateUser', options, user);
 
@@ -108,12 +131,9 @@ Accounts.onCreateUser(function(options, user = {}) {
 		if (options.profile) {
 			if (options.profile.name) {
 				user.name = options.profile.name;
-			} else if (options.profile.firstName && options.profile.lastName) {
-				// LinkedIn format
-				user.name = `${ options.profile.firstName } ${ options.profile.lastName }`;
 			} else if (options.profile.firstName) {
 				// LinkedIn format
-				user.name = options.profile.firstName;
+				user.name = getLinkedInName(options.profile);
 			}
 		}
 	}

From f32703f59b1e28bc11394fe570525aa1c18359b9 Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Fri, 20 Mar 2020 16:18:28 -0300
Subject: [PATCH 041/223] Add an index to the name field for omnichannel
 department (#16953)

---
 app/models/server/models/LivechatDepartment.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/server/models/LivechatDepartment.js b/app/models/server/models/LivechatDepartment.js
index a57238234c40..652ba3dd72dc 100644
--- a/app/models/server/models/LivechatDepartment.js
+++ b/app/models/server/models/LivechatDepartment.js
@@ -9,6 +9,7 @@ export class LivechatDepartment extends Base {
 	constructor(modelOrName) {
 		super(modelOrName || 'livechat_department');
 
+		this.tryEnsureIndex({ name: 1 });
 		this.tryEnsureIndex({
 			numAgents: 1,
 			enabled: 1,

From 4c62601037160295c4ca7ac8e00c63d6f21170c8 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Fri, 20 Mar 2020 19:23:51 -0300
Subject: [PATCH 042/223] [NEW] Enterprise Edition (#16944)

Co-authored-by: Pierre Lehnen <pierre.lehnen@rocket.chat>
---
 client/main.js                                |   2 +
 .../api-enterprise/server/canned-responses.js |  10 +
 ee/app/api-enterprise/server/index.js         |   1 +
 .../server/lib/canned-responses.js            |  59 ++++
 ee/app/auditing/client/index.css              | 109 ++++++
 ee/app/auditing/client/index.js               |  28 ++
 ee/app/auditing/client/routes.js              |  16 +
 .../client/templates/audit/audit.html         |  99 ++++++
 .../auditing/client/templates/audit/audit.js  | 267 +++++++++++++++
 .../client/templates/auditLog/auditLog.html   |  74 ++++
 .../client/templates/auditLog/auditLog.js     |  73 ++++
 ee/app/auditing/client/templates/index.js     |   2 +
 ee/app/auditing/client/utils.js               |  29 ++
 ee/app/auditing/server/auditLog.js            |   9 +
 ee/app/auditing/server/index.js               |  31 ++
 ee/app/auditing/server/methods.js             |  77 +++++
 .../client/collections/CannedResponse.js      |   3 +
 ee/app/canned-responses/client/index.js       |   9 +
 .../client/startup/responses.js               |  30 ++
 ee/app/canned-responses/client/streamer.js    |   3 +
 .../client/stylesheets/cannedResponses.less   | 155 +++++++++
 ee/app/canned-responses/client/ui.js          |  28 ++
 .../canned-responses/client/views/icons.html  |   7 +
 .../popup/addMessagePopupCannedResponse.js    |  38 +++
 .../popup/messagePopupCannedResponse.html     |   6 +
 .../client/views/tabbar/cannedResponses.html  | 112 ++++++
 .../client/views/tabbar/cannedResponses.js    | 266 +++++++++++++++
 .../tabbar/departmentCannedResponses.html     |   3 +
 .../views/tabbar/departmentCannedResponses.js |  16 +
 ee/app/canned-responses/server/index.js       |  14 +
 .../server/methods/removeCannedResponse.js    |  25 ++
 .../server/methods/saveCannedResponse.js      |  49 +++
 ee/app/canned-responses/server/permissions.js |  11 +
 ee/app/canned-responses/server/settings.js    |  12 +
 ee/app/canned-responses/server/streamer.js    |  11 +
 ee/app/ldap-enterprise/README.md              |  22 ++
 .../server/hooks/beforeSearchAll.js           |  13 +
 .../server/hooks/syncExistentUser.js          |  12 +
 ee/app/ldap-enterprise/server/index.js        |  19 ++
 .../ldap-enterprise/server/ldapEnterprise.js  |  73 ++++
 ee/app/ldap-enterprise/server/listener.js     |  13 +
 ee/app/ldap-enterprise/server/settings.js     |  30 ++
 ee/app/license/client/index.js                |  13 +
 ee/app/license/server/bundles.js              |  46 +++
 ee/app/license/server/decrypt.js              |   9 +
 ee/app/license/server/index.js                |   6 +
 ee/app/license/server/license.js              | 173 ++++++++++
 ee/app/license/server/methods.js              |   9 +
 ee/app/license/server/settings.js             |  40 +++
 ee/app/license/server/startup.js              |  22 ++
 ee/app/livechat-enterprise/client/index.js    |  16 +
 ee/app/livechat-enterprise/client/route.js    |  58 ++++
 .../livechatAgentEditCustomFieldsForm.html    |  12 +
 .../livechatAgentEditCustomFieldsForm.js      |  21 ++
 .../livechatAgentInfoCustomFieldsForm.html    |   6 +
 .../livechatAgentInfoCustomFieldsForm.js      |  24 ++
 .../livechatDepartmentCustomFieldsForm.html   |  14 +
 .../livechatDepartmentCustomFieldsForm.js     |  24 ++
 .../views/app/registerCustomTemplates.js      |   8 +
 .../client/views/livechatMonitors.html        |  91 +++++
 .../client/views/livechatMonitors.js          | 200 +++++++++++
 .../client/views/livechatSideNavItems.js      |   5 +
 .../client/views/livechatTagForm.html         |  77 +++++
 .../client/views/livechatTagForm.js           | 116 +++++++
 .../client/views/livechatTags.html            |  30 ++
 .../client/views/livechatTags.js              |  97 ++++++
 .../client/views/livechatUnitForm.html        | 135 ++++++++
 .../client/views/livechatUnitForm.js          | 249 ++++++++++++++
 .../client/views/livechatUnits.html           |  30 ++
 .../client/views/livechatUnits.js             |  96 ++++++
 .../livechat-enterprise/server/agentStatus.js |  15 +
 .../livechat-enterprise/server/api/agents.js  | 114 +++++++
 .../server/api/departments.js                 | 320 ++++++++++++++++++
 .../livechat-enterprise/server/api/index.js   |   5 +
 .../server/api/lib/monitors.js                |  62 ++++
 .../server/api/lib/tags.js                    |  31 ++
 .../server/api/lib/units.js                   |  43 +++
 .../server/api/monitors.js                    |  31 ++
 ee/app/livechat-enterprise/server/api/tags.js |  29 ++
 .../livechat-enterprise/server/api/units.js   |  40 +++
 .../server/hooks/addDepartmentAncestors.js    |  20 ++
 .../server/hooks/afterTakeInquiry.js          |  19 ++
 .../server/hooks/beforeListTags.js            |   6 +
 .../server/hooks/beforeRoutingChat.js         |  31 ++
 .../hooks/checkAgentBeforeTakeInquiry.js      |  43 +++
 .../server/hooks/onCloseLivechat.js           |  22 ++
 .../server/hooks/onLoadConfigApi.js           |  35 ++
 .../server/hooks/onSetUserStatusLivechat.js   |  30 ++
 ee/app/livechat-enterprise/server/index.js    |  41 +++
 .../livechat-enterprise/server/lib/Helper.js  | 139 ++++++++
 .../server/lib/LivechatEnterprise.js          | 116 +++++++
 .../livechat-enterprise/server/lib/logger.js  |   7 +
 .../server/lib/query.helper.js                |  33 ++
 .../server/lib/routing/LoadBalancing.js       |  36 ++
 .../server/lib/runEndpointsAsUser.js          |  18 +
 .../livechat-enterprise/server/lib/units.js   |  15 +
 .../server/methods/addMonitor.js              |  14 +
 .../server/methods/getUnitsFromUserRoles.js   |  15 +
 .../server/methods/removeMonitor.js           |  14 +
 .../server/methods/removeTag.js               |  14 +
 .../server/methods/removeUnit.js              |  14 +
 .../server/methods/saveTag.js                 |  14 +
 .../server/methods/saveUnit.js                |  14 +
 .../livechat-enterprise/server/permissions.js |  45 +++
 ee/app/livechat-enterprise/server/settings.js |  40 +++
 ee/app/livechat-enterprise/server/startup.js  |  11 +
 .../imports/server/rest/departments.js        |   9 +
 .../livechat/imports/server/rest/inquiries.js |   8 +
 ee/app/livechat/imports/server/rest/rooms.js  |   8 +
 ee/app/livechat/imports/server/rest/sms.js    |   8 +
 ee/app/livechat/imports/server/rest/upload.js |   8 +
 ee/app/livechat/index.js                      |   5 +
 ee/app/models/index.js                        |   5 +
 ee/app/models/server/index.js                 |  21 ++
 ee/app/models/server/models/CannedResponse.js |  62 ++++
 .../server/models/LivechatDepartment.js       |  75 ++++
 ee/app/models/server/models/LivechatRooms.js  |  46 +++
 ee/app/models/server/models/LivechatTag.js    |  46 +++
 ee/app/models/server/models/LivechatUnit.js   | 150 ++++++++
 .../server/models/LivechatUnitMonitors.js     |  38 +++
 ee/app/models/server/raw/CannedResponse.js    |   7 +
 .../models/server/raw/LivechatDepartment.js   |  32 ++
 ee/app/models/server/raw/LivechatRooms.js     |  32 ++
 ee/app/models/server/raw/LivechatTag.js       |   7 +
 .../models/server/raw/LivechatUnitMonitors.js |   7 +
 ee/client/index.js                            |   4 +
 ee/i18n/en.i18n.json                          |  61 ++++
 ee/i18n/pt-BR.i18n.json                       |  49 +++
 ee/server/index.js                            |   6 +
 packages/rocketchat-i18n/i18n/pt-BR.i18n.json |   2 +-
 server/main.js                                |   2 +
 131 files changed, 5686 insertions(+), 1 deletion(-)
 create mode 100644 ee/app/api-enterprise/server/canned-responses.js
 create mode 100644 ee/app/api-enterprise/server/index.js
 create mode 100644 ee/app/api-enterprise/server/lib/canned-responses.js
 create mode 100644 ee/app/auditing/client/index.css
 create mode 100644 ee/app/auditing/client/index.js
 create mode 100644 ee/app/auditing/client/routes.js
 create mode 100644 ee/app/auditing/client/templates/audit/audit.html
 create mode 100644 ee/app/auditing/client/templates/audit/audit.js
 create mode 100644 ee/app/auditing/client/templates/auditLog/auditLog.html
 create mode 100644 ee/app/auditing/client/templates/auditLog/auditLog.js
 create mode 100644 ee/app/auditing/client/templates/index.js
 create mode 100644 ee/app/auditing/client/utils.js
 create mode 100644 ee/app/auditing/server/auditLog.js
 create mode 100644 ee/app/auditing/server/index.js
 create mode 100644 ee/app/auditing/server/methods.js
 create mode 100644 ee/app/canned-responses/client/collections/CannedResponse.js
 create mode 100644 ee/app/canned-responses/client/index.js
 create mode 100644 ee/app/canned-responses/client/startup/responses.js
 create mode 100644 ee/app/canned-responses/client/streamer.js
 create mode 100644 ee/app/canned-responses/client/stylesheets/cannedResponses.less
 create mode 100644 ee/app/canned-responses/client/ui.js
 create mode 100644 ee/app/canned-responses/client/views/icons.html
 create mode 100644 ee/app/canned-responses/client/views/popup/addMessagePopupCannedResponse.js
 create mode 100644 ee/app/canned-responses/client/views/popup/messagePopupCannedResponse.html
 create mode 100644 ee/app/canned-responses/client/views/tabbar/cannedResponses.html
 create mode 100644 ee/app/canned-responses/client/views/tabbar/cannedResponses.js
 create mode 100644 ee/app/canned-responses/client/views/tabbar/departmentCannedResponses.html
 create mode 100644 ee/app/canned-responses/client/views/tabbar/departmentCannedResponses.js
 create mode 100644 ee/app/canned-responses/server/index.js
 create mode 100644 ee/app/canned-responses/server/methods/removeCannedResponse.js
 create mode 100644 ee/app/canned-responses/server/methods/saveCannedResponse.js
 create mode 100644 ee/app/canned-responses/server/permissions.js
 create mode 100644 ee/app/canned-responses/server/settings.js
 create mode 100644 ee/app/canned-responses/server/streamer.js
 create mode 100644 ee/app/ldap-enterprise/README.md
 create mode 100644 ee/app/ldap-enterprise/server/hooks/beforeSearchAll.js
 create mode 100644 ee/app/ldap-enterprise/server/hooks/syncExistentUser.js
 create mode 100644 ee/app/ldap-enterprise/server/index.js
 create mode 100644 ee/app/ldap-enterprise/server/ldapEnterprise.js
 create mode 100644 ee/app/ldap-enterprise/server/listener.js
 create mode 100644 ee/app/ldap-enterprise/server/settings.js
 create mode 100644 ee/app/license/client/index.js
 create mode 100644 ee/app/license/server/bundles.js
 create mode 100644 ee/app/license/server/decrypt.js
 create mode 100644 ee/app/license/server/index.js
 create mode 100644 ee/app/license/server/license.js
 create mode 100644 ee/app/license/server/methods.js
 create mode 100644 ee/app/license/server/settings.js
 create mode 100644 ee/app/license/server/startup.js
 create mode 100644 ee/app/livechat-enterprise/client/index.js
 create mode 100644 ee/app/livechat-enterprise/client/route.js
 create mode 100644 ee/app/livechat-enterprise/client/views/app/customTemplates/livechatAgentEditCustomFieldsForm.html
 create mode 100644 ee/app/livechat-enterprise/client/views/app/customTemplates/livechatAgentEditCustomFieldsForm.js
 create mode 100644 ee/app/livechat-enterprise/client/views/app/customTemplates/livechatAgentInfoCustomFieldsForm.html
 create mode 100644 ee/app/livechat-enterprise/client/views/app/customTemplates/livechatAgentInfoCustomFieldsForm.js
 create mode 100644 ee/app/livechat-enterprise/client/views/app/customTemplates/livechatDepartmentCustomFieldsForm.html
 create mode 100644 ee/app/livechat-enterprise/client/views/app/customTemplates/livechatDepartmentCustomFieldsForm.js
 create mode 100644 ee/app/livechat-enterprise/client/views/app/registerCustomTemplates.js
 create mode 100644 ee/app/livechat-enterprise/client/views/livechatMonitors.html
 create mode 100644 ee/app/livechat-enterprise/client/views/livechatMonitors.js
 create mode 100644 ee/app/livechat-enterprise/client/views/livechatSideNavItems.js
 create mode 100644 ee/app/livechat-enterprise/client/views/livechatTagForm.html
 create mode 100644 ee/app/livechat-enterprise/client/views/livechatTagForm.js
 create mode 100644 ee/app/livechat-enterprise/client/views/livechatTags.html
 create mode 100644 ee/app/livechat-enterprise/client/views/livechatTags.js
 create mode 100644 ee/app/livechat-enterprise/client/views/livechatUnitForm.html
 create mode 100644 ee/app/livechat-enterprise/client/views/livechatUnitForm.js
 create mode 100644 ee/app/livechat-enterprise/client/views/livechatUnits.html
 create mode 100644 ee/app/livechat-enterprise/client/views/livechatUnits.js
 create mode 100644 ee/app/livechat-enterprise/server/agentStatus.js
 create mode 100644 ee/app/livechat-enterprise/server/api/agents.js
 create mode 100644 ee/app/livechat-enterprise/server/api/departments.js
 create mode 100644 ee/app/livechat-enterprise/server/api/index.js
 create mode 100644 ee/app/livechat-enterprise/server/api/lib/monitors.js
 create mode 100644 ee/app/livechat-enterprise/server/api/lib/tags.js
 create mode 100644 ee/app/livechat-enterprise/server/api/lib/units.js
 create mode 100644 ee/app/livechat-enterprise/server/api/monitors.js
 create mode 100644 ee/app/livechat-enterprise/server/api/tags.js
 create mode 100644 ee/app/livechat-enterprise/server/api/units.js
 create mode 100644 ee/app/livechat-enterprise/server/hooks/addDepartmentAncestors.js
 create mode 100644 ee/app/livechat-enterprise/server/hooks/afterTakeInquiry.js
 create mode 100644 ee/app/livechat-enterprise/server/hooks/beforeListTags.js
 create mode 100644 ee/app/livechat-enterprise/server/hooks/beforeRoutingChat.js
 create mode 100644 ee/app/livechat-enterprise/server/hooks/checkAgentBeforeTakeInquiry.js
 create mode 100644 ee/app/livechat-enterprise/server/hooks/onCloseLivechat.js
 create mode 100644 ee/app/livechat-enterprise/server/hooks/onLoadConfigApi.js
 create mode 100644 ee/app/livechat-enterprise/server/hooks/onSetUserStatusLivechat.js
 create mode 100644 ee/app/livechat-enterprise/server/index.js
 create mode 100644 ee/app/livechat-enterprise/server/lib/Helper.js
 create mode 100644 ee/app/livechat-enterprise/server/lib/LivechatEnterprise.js
 create mode 100644 ee/app/livechat-enterprise/server/lib/logger.js
 create mode 100644 ee/app/livechat-enterprise/server/lib/query.helper.js
 create mode 100644 ee/app/livechat-enterprise/server/lib/routing/LoadBalancing.js
 create mode 100644 ee/app/livechat-enterprise/server/lib/runEndpointsAsUser.js
 create mode 100644 ee/app/livechat-enterprise/server/lib/units.js
 create mode 100644 ee/app/livechat-enterprise/server/methods/addMonitor.js
 create mode 100644 ee/app/livechat-enterprise/server/methods/getUnitsFromUserRoles.js
 create mode 100644 ee/app/livechat-enterprise/server/methods/removeMonitor.js
 create mode 100644 ee/app/livechat-enterprise/server/methods/removeTag.js
 create mode 100644 ee/app/livechat-enterprise/server/methods/removeUnit.js
 create mode 100644 ee/app/livechat-enterprise/server/methods/saveTag.js
 create mode 100644 ee/app/livechat-enterprise/server/methods/saveUnit.js
 create mode 100644 ee/app/livechat-enterprise/server/permissions.js
 create mode 100644 ee/app/livechat-enterprise/server/settings.js
 create mode 100644 ee/app/livechat-enterprise/server/startup.js
 create mode 100644 ee/app/livechat/imports/server/rest/departments.js
 create mode 100644 ee/app/livechat/imports/server/rest/inquiries.js
 create mode 100644 ee/app/livechat/imports/server/rest/rooms.js
 create mode 100644 ee/app/livechat/imports/server/rest/sms.js
 create mode 100644 ee/app/livechat/imports/server/rest/upload.js
 create mode 100644 ee/app/livechat/index.js
 create mode 100644 ee/app/models/index.js
 create mode 100644 ee/app/models/server/index.js
 create mode 100644 ee/app/models/server/models/CannedResponse.js
 create mode 100644 ee/app/models/server/models/LivechatDepartment.js
 create mode 100644 ee/app/models/server/models/LivechatRooms.js
 create mode 100644 ee/app/models/server/models/LivechatTag.js
 create mode 100644 ee/app/models/server/models/LivechatUnit.js
 create mode 100644 ee/app/models/server/models/LivechatUnitMonitors.js
 create mode 100644 ee/app/models/server/raw/CannedResponse.js
 create mode 100644 ee/app/models/server/raw/LivechatDepartment.js
 create mode 100644 ee/app/models/server/raw/LivechatRooms.js
 create mode 100644 ee/app/models/server/raw/LivechatTag.js
 create mode 100644 ee/app/models/server/raw/LivechatUnitMonitors.js
 create mode 100644 ee/client/index.js
 create mode 100644 ee/i18n/en.i18n.json
 create mode 100644 ee/i18n/pt-BR.i18n.json
 create mode 100644 ee/server/index.js

diff --git a/client/main.js b/client/main.js
index eaac0a839916..605b6cd6617b 100644
--- a/client/main.js
+++ b/client/main.js
@@ -27,3 +27,5 @@ import './startup/startup';
 import './startup/unread';
 import './startup/userSetUtcOffset';
 import './startup/usersObserve';
+
+import '../ee/client';
diff --git a/ee/app/api-enterprise/server/canned-responses.js b/ee/app/api-enterprise/server/canned-responses.js
new file mode 100644
index 000000000000..36b1175406a1
--- /dev/null
+++ b/ee/app/api-enterprise/server/canned-responses.js
@@ -0,0 +1,10 @@
+import { API } from '../../../../app/api';
+import { findAllCannedResponses } from './lib/canned-responses';
+
+API.v1.addRoute('canned-responses.get', { authRequired: true }, {
+	get() {
+		return API.v1.success({
+			responses: Promise.await(findAllCannedResponses({ userId: this.userId })),
+		});
+	},
+});
diff --git a/ee/app/api-enterprise/server/index.js b/ee/app/api-enterprise/server/index.js
new file mode 100644
index 000000000000..76c26e3c7397
--- /dev/null
+++ b/ee/app/api-enterprise/server/index.js
@@ -0,0 +1 @@
+import './canned-responses';
diff --git a/ee/app/api-enterprise/server/lib/canned-responses.js b/ee/app/api-enterprise/server/lib/canned-responses.js
new file mode 100644
index 000000000000..588de284e1c4
--- /dev/null
+++ b/ee/app/api-enterprise/server/lib/canned-responses.js
@@ -0,0 +1,59 @@
+import { hasPermissionAsync } from '../../../../../app/authorization/server/functions/hasPermission';
+import { hasRoleAsync } from '../../../../../app/authorization/server/functions/hasRole';
+import CannedResponse from '../../../models/server/raw/CannedResponse';
+import { LivechatDepartmentAgents } from '../../../../../app/models/server/raw';
+
+export async function findAllCannedResponses({ userId }) {
+	if (!await hasPermissionAsync(userId, 'view-canned-responses')) {
+		throw new Error('error-not-authorized');
+	}
+
+	// If the user is an admin or livechat manager, get his own responses and all responses from all departments
+	if (await hasRoleAsync(userId, ['admin', 'livechat-manager'])) {
+		return CannedResponse.find({
+			$or: [
+				{
+					scope: 'user',
+					userId,
+				},
+				{
+					scope: 'department',
+				},
+			],
+		}).toArray();
+	}
+
+	// If the user it not any of the previous roles nor an agent, then get only his own responses
+	if (!await hasRoleAsync(userId, 'livechat-agent')) {
+		return CannedResponse.find({
+			scope: 'user',
+			userId,
+		}).toArray();
+	}
+
+	// Last scenario: user is an agente, so get his own responses and those from the departments he is in
+	const departments = await LivechatDepartmentAgents.find({
+		agentId: userId,
+	}, {
+		fields: {
+			departmentId: 1,
+		},
+	}).toArray();
+
+	const departmentIds = departments.map((department) => department.departmentId);
+
+	return CannedResponse.find({
+		$or: [
+			{
+				scope: 'user',
+				userId,
+			},
+			{
+				scope: 'department',
+				departmentId: {
+					$in: departmentIds,
+				},
+			},
+		],
+	}).toArray();
+}
diff --git a/ee/app/auditing/client/index.css b/ee/app/auditing/client/index.css
new file mode 100644
index 000000000000..8d7775625a59
--- /dev/null
+++ b/ee/app/auditing/client/index.css
@@ -0,0 +1,109 @@
+.main-content {
+	display: flex;
+	flex-direction: column;
+}
+
+.rc-audit-empty {
+	padding: 1.5rem;
+
+	text-align: center;
+}
+
+.rc-select {
+	margin: 0.5rem 0;
+}
+
+.rc-audit-container {
+	overflow-y: scroll;
+	flex: 1 1 auto;
+}
+
+.rc-audit {
+	display: flex;
+	flex-direction: column;
+	flex: 1 1 100%;
+}
+
+.rc-audit-form {
+	display: flex;
+
+	flex: 0 0 auto;
+
+	padding: var(--header-padding);
+
+	align-items: center;
+	flex-wrap: wrap;
+	justify-content: flex-start;
+}
+
+.rc-input__element[type=date]::-webkit-inner-spin-button {
+	display: none;
+	-webkit-appearance: none;
+}
+
+.rc-audit-date {
+	flex-grow: 0;
+}
+
+.rc-table--audit {
+	table-layout: fixed;
+}
+
+.rc-table--audit .rc-table-td {
+	overflow: hidden;
+
+	padding-right: 0.5rem;
+
+	padding-left: 0.5rem;
+
+	text-overflow: ellipsis;
+}
+
+.rc-audit-filter-td {
+	width: 200px;
+}
+
+.rc-audit-results-td {
+	width: 70px;
+}
+
+.rc-audit-created-td {
+	width: 200px;
+
+	text-align: center;
+}
+
+.rc-audit-user-td {
+	display: flex;
+
+	min-width: 180px;
+
+	font-size: 16px;
+	align-items: center;
+}
+
+.rc-audit-user__avatar {
+	flex: 0 0 auto;
+
+	width: 48px;
+	height: 48px;
+}
+
+@media (max-width: 501px) {
+	.rc-audit-results-td,
+	.rc-audit-user__avatar {
+		display: none;
+	}
+}
+
+.rc-audit-user__username {
+	padding: 0 0.5rem;
+}
+
+.rc-audit .message .read-receipt,
+.rc-audit .message .message-actions,
+.rc-audit .message .actionLinks,
+.rc-audit .message .rc-button-broadcast,
+.rc-audit .message .reactions {
+	display: none;
+}
diff --git a/ee/app/auditing/client/index.js b/ee/app/auditing/client/index.js
new file mode 100644
index 000000000000..e0be4fdb4a62
--- /dev/null
+++ b/ee/app/auditing/client/index.js
@@ -0,0 +1,28 @@
+import { hasLicense } from '../../license/client';
+import { AccountBox } from '../../../../app/ui-utils/client';
+import { hasAllPermission } from '../../../../app/authorization/client';
+import './routes';
+
+hasLicense('auditing').then((enabled) => {
+	if (!enabled) {
+		return;
+	}
+	require('./templates');
+	require('./index.css');
+
+	AccountBox.addItem({
+		href: 'audit-home',
+		name: 'Message_auditing',
+		icon: 'clipboard',
+		condition: () => hasAllPermission('can-audit'),
+	});
+
+	AccountBox.addItem({
+		href: 'audit-log',
+		name: 'Message_auditing_log',
+		icon: 'clipboard',
+		condition: () => hasAllPermission('can-audit-log'),
+	});
+}).catch((error) => {
+	console.error('Error checking license.', error);
+});
diff --git a/ee/app/auditing/client/routes.js b/ee/app/auditing/client/routes.js
new file mode 100644
index 000000000000..334de697eb2b
--- /dev/null
+++ b/ee/app/auditing/client/routes.js
@@ -0,0 +1,16 @@
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { BlazeLayout } from 'meteor/kadira:blaze-layout';
+
+FlowRouter.route('/audit', {
+	name: 'audit-home',
+	action() {
+		BlazeLayout.render('main', { center: 'audit' });
+	},
+});
+
+FlowRouter.route('/audit-log', {
+	name: 'audit-log',
+	action() {
+		BlazeLayout.render('main', { center: 'auditLog' });
+	},
+});
diff --git a/ee/app/auditing/client/templates/audit/audit.html b/ee/app/auditing/client/templates/audit/audit.html
new file mode 100644
index 000000000000..8244dc5e2158
--- /dev/null
+++ b/ee/app/auditing/client/templates/audit/audit.html
@@ -0,0 +1,99 @@
+<template name='audit'>
+	<section class="page-container page-home page-static rc-audit">
+		{{# header sectionName="Message_auditing" hideHelp=true}}{{/header}}
+		<div class="rc-audit-container">
+			<form class="rc-form--inline rc-audit-form">
+			<div class="rc-input">
+				<label class="rc-input__label">
+					<div class="rc-input__title">{{_"Message"}}</div>
+					<div class="rc-input__wrapper">
+						<div class="rc-input__icon">
+							{{> icon icon="magnifier"}}
+						</div>
+						<input name="msg" type="msg" class="rc-input__element" placeholder="{{_"Search_Messages"}}" autofocus="">
+					</div>
+				</label>
+			</div>
+			<label class="rc-select">
+				<select id="type" class="rc-select__element js-type rc-input__wrapper" name="type">
+					<option value="">{{_ 'Others'}}</option>
+					<option value="d">{{_ 'Direct_Messages'}}</option>
+				</select>
+				{{> icon block="rc-select__arrow" icon="arrow-down" }}
+			</label>
+
+			{{> auditAutocomplete key='room' hide=typeD onChange=onChange prepare=prepareRoom field='name' term='name' icon='hashtag' label="room_name" placeholder='Channel_Name_Placeholder'}}
+			{{> auditAutocomplete key='user' hide=nTypeD onChange=onChange collection='UserAndRoom' modifier=modifierUser endpoint='users.autocomplete' field='username'  icon='at' label="From" placeholder='Username_Placeholder'}}
+			{{> auditAutocomplete key='user2' hide=nTypeD  onChange=onChange collection='UserAndRoom' modifier=modifierUser endpoint='users.autocomplete' field='username' icon='at' label="To" placeholder='Username_Placeholder'}}
+
+			<div class="rc-input rc-input--small rc-audit-date">
+				<label class="rc-input__label">
+					<div class="rc-input__title">{{_"Date_From"}}</div>
+					<div class="rc-input__wrapper">
+						<div class="rc-input__icon">
+							{{> icon icon="lock"}}
+						</div>
+						<input name="startDate" type="date" class="rc-input__element">
+					</div>
+				</label>
+			</div>
+			<div class="rc-input rc-input--small rc-audit-date">
+				<label class="rc-input__label">
+					<div class="rc-input__title">{{_"Date_to"}}</div>
+					<div class="rc-input__wrapper">
+						<div class="rc-input__icon">
+							{{> icon icon="lock"}}
+						</div>
+						<input name="endDate" type="date" class="rc-input__element">
+					</div>
+				</label>
+			</div>
+			<button type="button" class='rc-button rc-button--primary js-submit{{# if isLoading}} loading{{/if}}' name="button">{{_"Apply"}}</button>
+		</form>
+			{{#if isLoading}}
+				{{> loading class="loading-animation--primary"}}
+			{{else}}
+				{{#if hasResults}}
+					<ul aria-live="polite">
+						{{#with messageContext}}
+							{{#each msg in messages}}
+								{{> nrr nrrargs 'message' shouldCollapseReplies=true msg=msg room=room subscription=subscription settings=settings u=u}}
+							{{/each}}
+						{{/with}}
+					</ul>
+				{{else}}
+					{{> roomSearchEmpty class="rc-audit-empty"}}
+				{{/if}}
+			{{/if}}
+		</div>
+	</section>
+</template>
+
+<template name="auditAutocomplete">
+	<div id="autocomplete-{{key}}" class="rc-input {{#if hide}} hidden{{/if}}">
+		<label class="rc-input__label">
+			<div class="rc-input__title">{{_ label}}</div>
+			<div class="rc-input__wrapper">
+				<div class="rc-input__icon">
+					{{> icon block="rc-input__icon-svg" icon=icon}}
+				</div>
+				<div class="rc-tags">
+					{{#let room=selected}}
+						{{#if room}}
+						{{> tag room}}
+						{{/if}}
+					{{/let}}
+					<input type="text" class="rc-tags__input{{#if selected}} hidden{{/if}}" placeholder="{{_ placeholder}}"
+					name="filter" autocomplete="off"/>
+				</div>
+			</div>
+		</label>
+		{{#with config}}
+			{{#if autocomplete 'isShowing'}}
+				{{#if autocomplete 'isLoaded'}}
+					{{> popupList data=config items=items}}
+				{{/if}}
+			{{/if}}
+		{{/with}}
+	</div>
+</template>
diff --git a/ee/app/auditing/client/templates/audit/audit.js b/ee/app/auditing/client/templates/audit/audit.js
new file mode 100644
index 000000000000..f709f8fb951f
--- /dev/null
+++ b/ee/app/auditing/client/templates/audit/audit.js
@@ -0,0 +1,267 @@
+import { Template } from 'meteor/templating';
+import { ReactiveVar } from 'meteor/reactive-var';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+
+import { AutoComplete } from '../../../../../../app/meteor-autocomplete/client';
+import { hasAllPermission } from '../../../../../../app/authorization/client';
+import { messageContext } from '../../../../../../app/ui-utils/client/lib/messageContext';
+import { call, convertDate, scrollTo } from '../../utils.js';
+
+import './audit.html';
+
+const loadMessages = async function({ rid, users, startDate, endDate = new Date(), msg }) {
+	this.messages = this.messages || new ReactiveVar([]);
+	this.loading = this.loading || new ReactiveVar(true);
+	try {
+		this.loading.set(true);
+		const messages = await call('auditGetMessages', { rid, users, startDate, endDate, msg });
+		this.messagesContext.set({
+			...messageContext({ rid }),
+			messages,
+		});
+	} catch (e) {
+		this.messagesContext.set({});
+	} finally {
+		this.loading.set(false);
+	}
+};
+
+Template.audit.events({
+	'submit form'(e) {
+		e.preventDefault();
+	},
+	'change input[type=date]'(e) {
+		e.currentTarget.parentElement.parentElement.parentElement.classList.remove('rc-input--error');
+	},
+	'change [name=type]'(e, t) {
+		t.type.set(e.currentTarget.value);
+	},
+	async 'click .js-submit'(e, t) {
+		const form = e.currentTarget.parentElement;
+
+		const result = {};
+
+		e.currentTarget.blur();
+
+		if (t.type.get() === 'd') {
+			if (!t.user.username) {
+				return form.querySelector('#autocomplete-user').classList.add('rc-input--error');
+			}
+			form.querySelector('#autocomplete-user').classList.remove('rc-input--error');
+			if (!t.user2.username) {
+				return form.querySelector('#autocomplete-user').classList.add('rc-input--error');
+			}
+			form.querySelector('#autocomplete-user').classList.remove('rc-input--error');
+			result.users = [t.user.username, t.user2.username];
+		} else {
+			if (!t.room || !t.room._id) {
+				return form.querySelector('#autocomplete-room').classList.add('rc-input--error');
+			}
+			form.querySelector('#autocomplete-room').classList.remove('rc-input--error');
+			result.rid = t.room._id;
+		}
+
+		if (!form.startDate.value) {
+			return form.startDate.parentElement.parentElement.parentElement.classList.add('rc-input--error');
+		}
+		form.startDate.parentElement.parentElement.parentElement.classList.remove('rc-input--error');
+		result.startDate = form.startDate.type === 'date' ? convertDate(form.startDate.value) : form.startDate.value;
+
+
+		result.msg = form.msg.value;
+
+		if (!form.endDate.value) {
+			return form.endDate.parentElement.parentElement.parentElement.classList.add('rc-input--error');
+		}
+		form.endDate.parentElement.parentElement.parentElement.classList.remove('rc-input--error');
+		result.endDate = form.endDate.type === 'date' ? convertDate(form.endDate.value) : form.endDate.value;
+		result.endDate = new Date(result.endDate.getTime() + 86400000);
+
+		await t.loadMessages(result);
+
+		setTimeout(() => {
+			const offset = $(document.querySelector('.rc-audit-container ul')).offset();
+			if (!offset) {
+				return;
+			}
+			scrollTo(document.querySelector('.rc-audit-container'), offset.top - 150, 300);
+		}, 150);
+	},
+});
+
+Template.audit.helpers({
+	onChange() {
+		const that = Template.instance();
+		return function(value, key) {
+			that[key] = value;
+		};
+	},
+	prepareRoom: () => function(room) {
+		room.username = room.name;
+		return room;
+	},
+	modifierUser: () => function(text, filter) {
+		const f = filter.get();
+		return `@${ f.length === 0 ? text : text.replace(new RegExp(f), function(part) {
+			return `<strong>${ part }</strong>`;
+		}) }`;
+	},
+	nTypeD() {
+		return Template.instance().type.get() !== 'd';
+	},
+	typeD() {
+		return Template.instance().type.get() === 'd';
+	},
+	type() {
+		return Template.instance().type.get();
+	},
+	isLoading() {
+		return Template.instance().loading.get();
+	},
+	messageContext() {
+		return Template.instance().messagesContext.get();
+	},
+	hasResults() {
+		return Template.instance().hasResults.get();
+	},
+});
+
+Template.audit.onCreated(async function() {
+	this.messagesContext = new ReactiveVar({});
+	this.type = new ReactiveVar();
+	this.loading = new ReactiveVar(false);
+	this.hasResults = new ReactiveVar(false);
+
+	if (!hasAllPermission('can-audit')) {
+		return FlowRouter.go('/home');
+	}
+
+	this.autorun(() => {
+		const messagesContext = this.messagesContext.get();
+
+		this.hasResults.set(messagesContext && messagesContext.messages && messagesContext.messages.length > 0);
+	});
+
+	this.loadMessages = loadMessages.bind(this);
+});
+
+const acEvents = (key/* , variable, name*/) => ({
+	'click .rc-popup-list__item'(e, t) {
+		t[key].onItemClick(this, e);
+	},
+	'keydown input'(e, t) {
+		if ([8, 46].includes(e.keyCode) && e.target.value === '') {
+			const users = t.selectedUsers;
+			const usersArr = users.get();
+			usersArr.pop();
+			return users.set(usersArr);
+		}
+		t[key].onKeyDown(e);
+	},
+	'keyup input'(e, t) {
+		t[key].onKeyUp(e);
+	},
+	'focus input'(e, t) {
+		t[key].onFocus(e);
+	},
+	'blur input'(e, t) {
+		t[key].onBlur(e);
+	},
+});
+
+Template.auditAutocomplete.events({
+	...acEvents('ac', 'selected'),
+	'input input'(e, t) {
+		t.filter.set(e.target.value);
+	},
+	'click .rc-tags__tag-icon'(e, t) {
+		t.selected.set();
+	},
+});
+
+Template.auditAutocomplete.helpers({
+	selected() {
+		const instance = Template.instance();
+		const selected = instance.selected.get();
+		return selected && (instance.data.prepare ? instance.data.prepare(selected) : selected);
+	},
+	config() {
+		const { filter } = Template.instance();
+		return {
+			template_item: 'popupList_item_channel',
+			// noMatchTemplate: Template.roomSearchEmpty,
+			filter: filter.get(),
+			noMatchTemplate: 'userSearchEmpty',
+			modifier: (text) => (Template.parentData(8).modifier || function(text, filter) {
+				const f = filter.get();
+				return `#${ f.length === 0 ? text : text.replace(new RegExp(f), function(part) {
+					return `<strong>${ part }</strong>`;
+				}) }`;
+			})(text, filter),
+		};
+	},
+	autocomplete(key) {
+		const instance = Template.instance();
+		const param = instance.ac[key];
+		return typeof param === 'function' ? param.apply(instance.ac) : param;
+	},
+	items() {
+		return Template.instance().ac.filteredList();
+	},
+});
+
+Template.auditAutocomplete.onRendered(async function() {
+	const { selected } = this;
+
+	this.ac.element = this.firstNode.querySelector('input');
+	this.ac.$element = $(this.ac.element);
+
+	this.ac.$element.on('autocompleteselect', function(e, { item }) {
+		selected.set(item);
+	});
+});
+
+const autocompleteConfig = ({
+	collection,
+	endpoint,
+	field,
+	term = 'term',
+}) => ({
+	selector: {
+		item: '.rc-popup-list__item',
+		container: '.rc-popup-list__list',
+	},
+
+	limit: 10,
+	inputDelay: 300,
+	rules: [{
+		// @TODO maybe change this 'collection' and/or template
+		collection,
+		endpoint,
+		field,
+		matchAll: true,
+		selector(match) {
+			return {
+				[term]: match,
+			};
+		},
+		sort: field,
+	}],
+});
+
+Template.auditAutocomplete.onCreated(function() {
+	this.filter = new ReactiveVar('');
+	this.selected = new ReactiveVar('');
+
+	this.autorun(() => {
+		const value = this.selected.get();
+		this.data.onChange(value, this.data.key);
+	});
+	this.ac = new AutoComplete(autocompleteConfig({
+		field: this.data.field,
+		collection: this.data.collection || 'CachedChannelList',
+		endpoint: this.data.endpoint || 'rooms.autocomplete.channelAndPrivate',
+		term: this.data.term || 'term',
+	}));
+	this.ac.tmplInst = this;
+});
diff --git a/ee/app/auditing/client/templates/auditLog/auditLog.html b/ee/app/auditing/client/templates/auditLog/auditLog.html
new file mode 100644
index 000000000000..22082570c5cc
--- /dev/null
+++ b/ee/app/auditing/client/templates/auditLog/auditLog.html
@@ -0,0 +1,74 @@
+<template name='auditLog'>
+	<section class="page-container page-home page-static rc-audit">
+		{{# header sectionName="Message_auditing_log" hideHelp=true}}{{/header}}
+		<form class="rc-form--inline rc-audit-form">
+			<div class="rc-input rc-input--small rc-audit-date">
+				<label class="rc-input__label">
+					<div class="rc-input__title">{{_"Date_From"}}</div>
+					<div class="rc-input__wrapper">
+						<div class="rc-input__icon">
+							{{> icon icon="lock"}}
+						</div>
+						<input name="startDate" type="date" class="rc-input__element"/>
+					</div>
+				</label>
+			</div>
+			<div class="rc-input rc-input--small rc-audit-date">
+				<label class="rc-input__label">
+					<div class="rc-input__title">{{_"Date_to"}}</div>
+					<div class="rc-input__wrapper">
+						<div class="rc-input__icon">
+							{{> icon icon="lock"}}
+						</div>
+						<input name="endDate" type="date" class="rc-input__element"/>
+					</div>
+				</label>
+			</div>
+			<button type="button" class='rc-button rc-button--primary js-submit{{# if isLoading}} loading{{/if}}' name="button">{{_"Apply"}}</button>
+		</form>
+		<div class="rc-audit-container">
+			{{#if isLoading}}
+				{{> loading class="loading-animation--primary"}}
+			{{else}}
+				{{# if logs}}
+				<!-- TODO: review this titles and labels -->
+					<table class="rc-table rc-table--audit">
+						<thead class="rc-table-head">
+							<tr class="rc-table-tr">
+								<td class="rc-table-td rc-audit-user-td">{{_'Username'}}</td>
+								<td class="rc-table-td">Looked for</td>
+								<td class="rc-table-td rc-audit-created-td">When</td>
+								<td class="rc-table-td rc-audit-results-td">Results</td>
+								<td class="rc-table-td rc-audit-created-td">Filter applied</td>
+							</tr>
+						</thead>
+						<tbody class="rc-table-body">
+							{{#each logs}}
+								{{> auditLogItem}}
+							{{/each}}
+						</tbody>
+					</table>
+				{{else}}
+					{{> roomSearchEmpty class="rc-audit-empty"}}
+				{{/if}}
+			{{/if}}
+		</div>
+	</section>
+</template>
+
+<template name="auditLogItem">
+	<tr class="rc-table-tr" data-name="{{username}}">
+		<td class="rc-table-td rc-audit-user-td">
+			<div class="rc-audit-user__avatar">
+				{{> avatar username=u.username}}
+			</div>
+			<div class="rc-audit-user__username">
+				{{u.username}}
+			</div>
+		</td>
+		<td class="rc-table-td rc-table-td-createdAt">{{msg}}</td>
+		<td class="rc-table-td rc-audit-created-td">{{ts}}</td>
+		<td class="rc-table-td rc-audit-results-td">{{results}}</td>
+		<td class="rc-table-td rc-audit-created-td">{{{fields}}}</td>
+	</tr>
+</template>
diff --git a/ee/app/auditing/client/templates/auditLog/auditLog.js b/ee/app/auditing/client/templates/auditLog/auditLog.js
new file mode 100644
index 000000000000..902dfd4228c2
--- /dev/null
+++ b/ee/app/auditing/client/templates/auditLog/auditLog.js
@@ -0,0 +1,73 @@
+import moment from 'moment';
+import { ReactiveVar } from 'meteor/reactive-var';
+import { Template } from 'meteor/templating';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+
+import { hasAllPermission } from '../../../../../../app/authorization';
+import { call, convertDate } from '../../utils.js';
+
+import './auditLog.html';
+
+const loadLog = async function({ startDate, endDate = new Date() }) {
+	this.logs = this.logs || new ReactiveVar([]);
+	this.loading = this.loading || new ReactiveVar(false);
+	if (this.loading.get() === true) {
+		return;
+	}
+	this.loading.set(true);
+	try {
+		const logs = await call('auditGetAuditions', { startDate, endDate });
+		this.logs.set(logs);
+	} catch (e) {
+		this.logs.set([]);
+	} finally {
+		this.loading.set(false);
+	}
+};
+
+Template.auditLog.events({
+	'click button'(e, t) {
+		const form = e.currentTarget.parentElement;
+		t.loadLog({
+			startDate: convertDate(form.startDate.value),
+			endDate: new Date(convertDate(form.endDate.value).getTime() + 86400000),
+		});
+	},
+});
+
+Template.auditLog.helpers({
+	logs() {
+		return Template.instance().logs.get();
+	},
+});
+
+Template.auditLog.onRendered(function() {
+	this.loadLog = loadLog.bind(this);
+});
+
+Template.auditLog.onCreated(function() {
+	this.logs = new ReactiveVar([]);
+
+	if (!hasAllPermission('can-audit-log')) {
+		return FlowRouter.go('/home');
+	}
+});
+
+Template.auditLogItem.helpers({
+	msg() {
+		return this.fields.msg;
+	},
+	username() {
+		return this.u.username;
+	},
+	ts() {
+		return moment(this.ts).format('lll');
+	},
+	fields() {
+		const { fields } = this;
+
+		const from = fields.users ? `<b>@${ fields.users[0] }</b> : <b>@${ fields.users[1] }</b>` : `<b>#${ fields.room }</b>`;
+
+		return `${ from } <p>${ moment(fields.startDate).format('DD/MM/YYYY') } to ${ moment(fields.endDate).format('DD/MM/YYYY') }</p> `;
+	},
+});
diff --git a/ee/app/auditing/client/templates/index.js b/ee/app/auditing/client/templates/index.js
new file mode 100644
index 000000000000..b6bc546b034e
--- /dev/null
+++ b/ee/app/auditing/client/templates/index.js
@@ -0,0 +1,2 @@
+import './audit/audit.js';
+import './auditLog/auditLog.js';
diff --git a/ee/app/auditing/client/utils.js b/ee/app/auditing/client/utils.js
new file mode 100644
index 000000000000..458c928f4cd2
--- /dev/null
+++ b/ee/app/auditing/client/utils.js
@@ -0,0 +1,29 @@
+import { Meteor } from 'meteor/meteor';
+
+export const call = (...args) => new Promise(function(resolve, reject) {
+	Meteor.call(...args, function(err, result) {
+		if (err) {
+			// eslint-disable-next-line no-undef
+			handleError(err);
+			reject(err);
+		}
+		resolve(result);
+	});
+});
+
+export const convertDate = (date) => {
+	const [y, m, d] = date.split('-');
+	return new Date(y, m - 1, d);
+};
+
+export const scrollTo = function scrollTo(element, to, duration) {
+	if (duration <= 0) { return; }
+	const difference = to - element.scrollTop;
+	const perTick = difference / duration * 10;
+
+	setTimeout(function() {
+		element.scrollTop += perTick;
+		if (element.scrollTop === to) { return; }
+		scrollTo(element, to, duration - 10);
+	}, 10);
+};
diff --git a/ee/app/auditing/server/auditLog.js b/ee/app/auditing/server/auditLog.js
new file mode 100644
index 000000000000..b106a3ab92e8
--- /dev/null
+++ b/ee/app/auditing/server/auditLog.js
@@ -0,0 +1,9 @@
+import { Base } from '../../../../app/models';
+
+class AudtitLog extends Base {
+	constructor() {
+		super('audit_log');
+	}
+}
+
+export default new AudtitLog();
diff --git a/ee/app/auditing/server/index.js b/ee/app/auditing/server/index.js
new file mode 100644
index 000000000000..dd531c96949b
--- /dev/null
+++ b/ee/app/auditing/server/index.js
@@ -0,0 +1,31 @@
+/* eslint no-multi-spaces: 0 */
+import { Meteor } from 'meteor/meteor';
+
+import { onLicense } from '../../license/server';
+import { Permissions, Roles } from '../../../../app/models/server';
+
+onLicense('auditing', () => {
+	require('./methods');
+
+	Meteor.startup(function() {
+		const permissions = [
+			{ _id: 'can-audit', roles: ['admin', 'auditor'] },
+			{ _id: 'can-audit-log', roles: ['admin', 'auditor-log'] },
+		];
+
+		const defaultRoles = [
+			{ name: 'auditor', scope: 'Users' },
+			{ name: 'auditor-log', scope: 'Users' },
+		];
+
+		permissions.forEach((permission) => {
+			if (!Permissions.findOneById(permission._id)) {
+				Permissions.upsert(permission._id, { $set: permission });
+			}
+		});
+
+		defaultRoles.forEach((role) =>
+			Roles.upsert({ _id: role.name }, { $setOnInsert: { scope: role.scope, description: role.description || '', protected: true } }),
+		);
+	});
+});
diff --git a/ee/app/auditing/server/methods.js b/ee/app/auditing/server/methods.js
new file mode 100644
index 000000000000..6bb38d90b84d
--- /dev/null
+++ b/ee/app/auditing/server/methods.js
@@ -0,0 +1,77 @@
+import { Meteor } from 'meteor/meteor';
+import s from 'underscore.string';
+import { check } from 'meteor/check';
+import { DDPRateLimiter } from 'meteor/ddp-rate-limiter';
+
+import AuditLog from './auditLog';
+import { Rooms, Messages } from '../../../../app/models';
+import { hasAllPermission } from '../../../../app/authorization';
+
+Meteor.methods({
+	auditGetMessages({ rid, startDate, endDate, users, msg }) {
+		check(startDate, Date);
+		check(endDate, Date);
+
+		const user = Meteor.user();
+		if (!hasAllPermission(user._id, 'can-audit')) {
+			throw new Meteor.Error('Not allowed');
+		}
+
+		const room = !rid ? Rooms.findOne({ t: 'd', usernames: { $all: users } }) : Rooms.findOne({ _id: rid });
+		if (!room) {
+			throw new Meteor.Error('Room doesn`t exist');
+		}
+
+		rid = room._id;
+
+		const query = {
+			rid,
+			ts: {
+				$gt: startDate,
+				$lt: endDate,
+			},
+		};
+
+		if (msg) {
+			const regex = new RegExp(s.trim(s.escapeRegExp(msg)), 'i');
+			query.msg = regex;
+		}
+		const messages = Messages.find(query).fetch();
+
+		// Once the filter is applied, messages will be shown and a log containing all filters will be saved for further auditing.
+
+		AuditLog.insert({ ts: new Date(), results: messages.length, u: user, fields: { msg, users, rid: room._id, room: room.name, startDate, endDate } });
+
+		return messages;
+	},
+	auditGetAuditions({ startDate, endDate }) {
+		check(startDate, Date);
+		check(endDate, Date);
+		if (!hasAllPermission(Meteor.userId(), 'can-audit-log')) {
+			throw new Meteor.Error('Not allowed');
+		}
+		return AuditLog.find({
+			// 'u._id': userId,
+			ts: {
+				$gt: startDate,
+				$lt: endDate,
+			},
+		}).fetch();
+	},
+});
+
+DDPRateLimiter.addRule({
+	type: 'method',
+	name: 'auditGetAuditions',
+	userId(/* userId*/) {
+		return true;
+	},
+}, 10, 60000);
+
+DDPRateLimiter.addRule({
+	type: 'method',
+	name: 'auditGetMessages',
+	userId(/* userId*/) {
+		return true;
+	},
+}, 10, 60000);
diff --git a/ee/app/canned-responses/client/collections/CannedResponse.js b/ee/app/canned-responses/client/collections/CannedResponse.js
new file mode 100644
index 000000000000..61a6add3ec3b
--- /dev/null
+++ b/ee/app/canned-responses/client/collections/CannedResponse.js
@@ -0,0 +1,3 @@
+import { Mongo } from 'meteor/mongo';
+
+export const CannedResponse = new Mongo.Collection(null);
diff --git a/ee/app/canned-responses/client/index.js b/ee/app/canned-responses/client/index.js
new file mode 100644
index 000000000000..d984abd3187b
--- /dev/null
+++ b/ee/app/canned-responses/client/index.js
@@ -0,0 +1,9 @@
+import './ui';
+import './startup/responses';
+import './views/icons.html';
+import './views/tabbar/cannedResponses';
+import './views/tabbar/departmentCannedResponses';
+import './views/popup/addMessagePopupCannedResponse';
+import './views/popup/messagePopupCannedResponse.html';
+
+import './stylesheets/cannedResponses.less';
diff --git a/ee/app/canned-responses/client/startup/responses.js b/ee/app/canned-responses/client/startup/responses.js
new file mode 100644
index 000000000000..29955b600845
--- /dev/null
+++ b/ee/app/canned-responses/client/startup/responses.js
@@ -0,0 +1,30 @@
+import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
+
+import { hasPermission } from '../../../../../app/authorization/client';
+import { APIClient } from '../../../../../app/utils/client';
+import { CannedResponse } from '../collections/CannedResponse';
+import { cannedResponsesStreamer } from '../streamer';
+
+const events = {
+	changed: (response) => {
+		delete response.type;
+		CannedResponse.upsert({ _id: response._id }, response);
+	},
+	removed: (response) => CannedResponse.remove({ _id: response._id }),
+};
+
+Meteor.startup(() => {
+	Tracker.autorun(async (c) => {
+		if (!Meteor.userId()) {
+			return;
+		}
+		if (hasPermission('view-canned-responses')) {
+			const { responses } = await APIClient.v1.get('canned-responses.get');
+			responses.forEach((response) => CannedResponse.insert(response));
+			cannedResponsesStreamer.on('canned-responses', (response) => events[response.type](response));
+
+			c.stop();
+		}
+	});
+});
diff --git a/ee/app/canned-responses/client/streamer.js b/ee/app/canned-responses/client/streamer.js
new file mode 100644
index 000000000000..1f3cb99c4e11
--- /dev/null
+++ b/ee/app/canned-responses/client/streamer.js
@@ -0,0 +1,3 @@
+import { Meteor } from 'meteor/meteor';
+
+export const cannedResponsesStreamer = new Meteor.Streamer('canned-responses');
diff --git a/ee/app/canned-responses/client/stylesheets/cannedResponses.less b/ee/app/canned-responses/client/stylesheets/cannedResponses.less
new file mode 100644
index 000000000000..f9c83bc18243
--- /dev/null
+++ b/ee/app/canned-responses/client/stylesheets/cannedResponses.less
@@ -0,0 +1,155 @@
+@primary-font-color: #444444;
+@secondary-font-color: #7f7f7f;
+@info-font-color: #aaaaaa;
+
+section.canned-responses {
+	overflow-x: hidden;
+
+	padding: 0;
+}
+
+.canned-response-shortcut {
+	color: @primary-font-color;
+
+	font-weight: bold;
+}
+
+.canned-response-text {
+	overflow: hidden;
+
+	white-space: nowrap;
+
+	text-overflow: ellipsis;
+
+	color: @secondary-font-color;
+}
+
+.canned-response-shortcut-preview {
+	color: @primary-font-color;
+
+	font-weight: 500;
+}
+
+.canned-response-text-preview {
+	margin-top: 10px;
+
+	white-space: pre-wrap;
+
+	color: @secondary-font-color;
+
+	line-height: 1.5;
+}
+
+.canned-response-scope {
+	color: @info-font-color;
+}
+
+.canned-response-list li {
+	border-top: 1px solid var(--color-gray-light);
+}
+
+.canned-response-list li:first-of-type {
+	border-top: 0;
+}
+
+.canned-response-form-wrapper {
+	display: flex;
+
+	padding: 24px;
+}
+
+.canned-response-wrapper {
+	padding: 24px;
+}
+
+.canned-response-wrapper div {
+	line-height: 2;
+}
+
+.canned-response-buttons {
+	padding: 24px;
+
+	border-top: 1px solid var(--color-gray-light);
+}
+
+.rc-old .flex-tab-container .flex-tab .content > .canned-response-buttons {
+	overflow-y: hidden;
+}
+
+.canned-response-form {
+	padding: 24px;
+}
+
+.canned-response-label {
+	color: @primary-font-color;
+
+	font-weight: bold;
+}
+
+.canned-response-info {
+	color: @info-font-color;
+}
+
+.canned-response-creator-data {
+	flex: 10 4;
+}
+
+.canned-response-delete-button {
+	flex: 3 2;
+}
+
+.canned-response-delete-button a {
+	color: @primary-font-color;
+}
+
+.canned-response-delete-button a:hover,
+.canned-response-delete-button a:active {
+	color: var(--rc-color-link-active);
+}
+
+.canned-response-form-wrapper fieldset {
+	flex: 1 1;
+}
+
+.canned-response-form-wrapper .rc-input {
+	margin-top: 20px;
+}
+
+.canned-response-buttons a {
+	width: 100%;
+}
+
+.popup-canned-response {
+	display: flex;
+	flex-flow: row wrap;
+
+	&-format {
+		overflow-x: hidden;
+
+		flex: 2 0;
+
+		white-space: nowrap;
+
+		text-overflow: ellipsis;
+		flex-grow: 1;
+	}
+
+	&-description {
+		overflow-x: hidden;
+
+		flex: 4 0;
+
+		text-align: right;
+
+		white-space: nowrap;
+
+		text-overflow: ellipsis;
+
+		font-style: italic;
+		flex-grow: 2;
+	}
+}
+
+.rc-old .page-static .content > .canned-response-list-wrapper {
+	margin-bottom: 0;
+}
diff --git a/ee/app/canned-responses/client/ui.js b/ee/app/canned-responses/client/ui.js
new file mode 100644
index 000000000000..9bb58f8b8c66
--- /dev/null
+++ b/ee/app/canned-responses/client/ui.js
@@ -0,0 +1,28 @@
+import { settings } from '../../../../app/settings';
+import { TabBar } from '../../../../app/ui-utils';
+import { hasLicense } from '../../license/client';
+
+hasLicense('canned-responses').then((enabled) => {
+	if (enabled) {
+		TabBar.addButton({
+			groups: ['live'],
+			id: 'canned-responses',
+			i18nTitle: 'Canned Responses',
+			icon: 'canned-response',
+			template: 'cannedResponses',
+			order: 0,
+			condition: () => settings.get('Canned_Responses_Enable'),
+		});
+
+		TabBar.addButton({
+			groups: ['livechat-department-new', 'livechat-department-edit'],
+			id: 'department-canned-responses',
+			i18nTitle: 'Canned Responses',
+			icon: 'canned-response',
+			template: 'departmentCannedResponses',
+			label: 'Canned Responses',
+			order: 0,
+			condition: () => settings.get('Canned_Responses_Enable'),
+		});
+	}
+});
diff --git a/ee/app/canned-responses/client/views/icons.html b/ee/app/canned-responses/client/views/icons.html
new file mode 100644
index 000000000000..b4a1008c983c
--- /dev/null
+++ b/ee/app/canned-responses/client/views/icons.html
@@ -0,0 +1,7 @@
+<body>
+	<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="display:none">
+	    <symbol id="icon-canned-response" viewBox="0 0 25 23" xml:space="preserve">
+	        <path d="M12.6889524,19.36425 C17.769052,19.381125 19.3479714,18.5475 19.8178072,18.00975 C19.7026071,17.941125 19.560301,17.866875 19.4496186,17.8095 C18.7347001,17.43375 17.055263,16.552875 17.9090992,14.723625 C17.996064,14.5155 18.1090053,14.273625 18.223076,14.028375 C18.5517352,13.3275 18.8623238,12.66375 18.8623238,12 C18.8623238,7.93875 15.5384614,4.634625 11.4533746,4.634625 C7.36828776,4.634625 4.04442532,7.93875 4.04442532,12 C4.04442532,16.267125 7.59304095,19.36425 12.4822698,19.36425 L12.6889524,19.36425 Z M20.2176194,16.363875 C20.8015259,16.669875 22.0145155,17.306625 21.4577149,18.483375 C20.4039725,20.712 16.1404385,21 12.9137056,21 L12.6810465,21 L12.4822698,20.998875 C6.64094579,20.998875 2.4,17.214375 2.4,12 C2.4,7.0365 6.46136913,3 11.4533746,3 C16.44538,3 20.5078785,7.0365 20.5078785,12 C20.5078785,13.026 20.0866075,13.926 19.7139012,14.719125 C19.6099952,14.941875 19.5072186,15.162375 19.4157362,15.3795 C19.2553595,15.726 19.2067948,15.83175 20.2176194,16.363875 Z M10.5,7.66036163 C10.5,7.20154045 10.9029437,6.8295924 11.4,6.8295924 C11.8970563,6.8295924 12.3,7.20154045 12.3,7.66036163 L12.18,11.9988232 C12.18,12.4576443 11.8970563,12.8295924 11.4,12.8295924 C10.9029437,12.8295924 10.62,12.4576443 10.62,11.9988232 L10.5,7.66036163 Z M11.4,16.08 C10.7372583,16.08 10.2,15.5427417 10.2,14.88 C10.2,14.2172583 10.7372583,13.68 11.4,13.68 C12.0627417,13.68 12.6,14.2172583 12.6,14.88 C12.6,15.5427417 12.0627417,16.08 11.4,16.08 Z" id="path-1"></path>
+	    </symbol>
+	</svg>
+</body>
\ No newline at end of file
diff --git a/ee/app/canned-responses/client/views/popup/addMessagePopupCannedResponse.js b/ee/app/canned-responses/client/views/popup/addMessagePopupCannedResponse.js
new file mode 100644
index 000000000000..2e4f843c4ac6
--- /dev/null
+++ b/ee/app/canned-responses/client/views/popup/addMessagePopupCannedResponse.js
@@ -0,0 +1,38 @@
+import _ from 'underscore';
+
+import { CannedResponse } from '../../collections/CannedResponse';
+import { addMessagePopup } from '../../../../../../app/ui-message/client/popup/customMessagePopups';
+import { t } from '../../../../../../app/utils';
+
+addMessagePopup((template) => ({
+	title: t('Canned Responses'),
+	collection: CannedResponse,
+	trigger: '!',
+	prefix: '',
+	suffix: ' ',
+	triggerAnywhere: true,
+	template: 'messagePopupCannedResponse',
+	rid: template.data.rid,
+	getInput: template.data.getInput,
+	textFilterDelay: 500,
+	getFilter: (collection, filter) => {
+		const exp = new RegExp(filter, 'i');
+		const records = collection.find({
+			shortcut: exp,
+		}, {
+			reactive: 1,
+			limit: 12,
+			sort: {
+				shortcut: -1,
+			},
+		}).fetch();
+
+		return records;
+	},
+	getValue: (_id, collection, records) => {
+		const record = _.findWhere(records, {
+			_id,
+		});
+		return record && record.text;
+	},
+}));
diff --git a/ee/app/canned-responses/client/views/popup/messagePopupCannedResponse.html b/ee/app/canned-responses/client/views/popup/messagePopupCannedResponse.html
new file mode 100644
index 000000000000..6b9fcd231acf
--- /dev/null
+++ b/ee/app/canned-responses/client/views/popup/messagePopupCannedResponse.html
@@ -0,0 +1,6 @@
+<template name="messagePopupCannedResponse">
+	<div class="popup-canned-response">
+		<div class="popup-canned-response-format"><strong>!{{shortcut}}</strong></div>
+		<div class="popup-canned-response-description">{{text}}</div>
+	</div>
+</template>
diff --git a/ee/app/canned-responses/client/views/tabbar/cannedResponses.html b/ee/app/canned-responses/client/views/tabbar/cannedResponses.html
new file mode 100644
index 000000000000..1b981c6e1196
--- /dev/null
+++ b/ee/app/canned-responses/client/views/tabbar/cannedResponses.html
@@ -0,0 +1,112 @@
+<template name="cannedResponses">
+	{{#requiresPermission 'view-canned-responses'}}
+		{{#if isDetailScreen}}
+			{{#with cannedResponse}}
+				<ul class="canned-response-list">
+					{{#if isExistingResponse}}
+						<li>
+							<div class="canned-response-form-wrapper">
+								<div class="canned-response-creator-data">
+									<div class="canned-response-label">Created by</div>
+									<div class="canned-response-created-by canned-response-info">{{createdByString}}</div>
+								</div>
+
+								{{#if canDeleteResponse}}
+									<div class="canned-response-delete-button">
+										{{> icon block="rc-header__icon" icon="trash"}}
+										<a href="#" class="delete-canned-response" data-id="{{_id}}" >{{_ "Delete"}}</a>
+									</div>
+								{{/if}}
+							</div>
+						</li>
+					{{/if}}
+
+					<li>
+						<div class="canned-response-form-wrapper">
+							{{#if canModifyResponse}}
+								<fieldset>
+									<input type="hidden" name="id" value={{_id}}>
+									<div class="rc-input">
+										<label class="rc-input__label">
+											<div class="rc-input__title">{{_ "Shortcut"}}</div>
+											<div class="rc-input__wrapper">
+												<div class="rc-input__icon canned-response-shortcut-prefix">!</div>
+												<input class="rc-input__element" type="text" name="shortcut" autocomplete="off" value="{{shortcut}}">
+											</div>
+										</label>
+									</div>
+									<div class="rc-input">
+										<label class="rc-input__label">
+											<div class="rc-input__title">{{_ "Text"}}</div>
+											<div class="rc-input__wrapper">
+												<textarea class="rc-input__element" name="text" rows="8" style="height: auto">{{text}}</textarea>
+											</div>
+										</label>
+									</div>
+
+									<div class="rc-button__group">
+										<button class='rc-button rc-button--primary save-canned-response-btn'><span>{{_ "Save"}}</span></button>
+										<button class='rc-button rc-button--secondary cancel-canned-response-btn'><span>{{_ "Cancel"}}</span></button>
+									</div>
+								</fieldset>
+							{{else}}
+								<div>
+									<div class="canned-response-shortcut-preview">! {{shortcut}}</div>
+									<div class="canned-response-text-preview">{{text}}</div>
+								</div>
+							{{/if}}
+						</div>
+					</li>
+				</ul>
+			{{/with}}
+
+			{{#if isUserContext}}
+				<div class="rc-button__group canned-response-buttons">
+					{{#if isExistingResponse}}
+						<a href="#" class="rc-button rc-button--primary use-canned-response-btn">{{_ "Use_this_response"}}</a>
+						{{#if isPreviewMode}}
+							<button class='rc-button rc-button--secondary cancel-canned-response-btn'><span>{{_ "Cancel"}}</span></button>
+						{{/if}}
+					{{/if}}
+				</div>
+			{{/if}}
+		{{else}}
+
+			{{#if hasNoCannedResponses}}
+				<h2 class="thread-empty">{{_ "No_Canned_Responses"}}</h2>
+			{{else}}
+				<div class="canned-response-list-wrapper">
+					<ul class="canned-response-list">
+
+						<li class="canned-response-search-item">
+							<div class="canned-response-wrapper">
+									<div class="rc-input__wrapper">
+										<div class="rc-input__icon">
+											{{> icon block="rc-input__icon-svg" icon="magnifier" }}
+										</div>
+										<input type="text" class="rc-input__element js-search" name="response-search" id="response-search" placeholder="{{_ "Search"}}" autocomplete="off" value="{{searchText}}">
+									</div>
+							</div>
+						</li>
+				
+					{{#each cannedResponses}}
+						<li data-id="{{_id}}" class="canned-response">
+							<div class="canned-response-wrapper">
+								<div class="canned-response-shortcut">{{shortcut}}</div>
+								<div class="canned-response-text">{{text}}</div>
+								<div class="canned-response-scope">{{scope}}</div>
+							</div>
+						</li>
+					{{/each}}
+
+					</ul>
+				</div>
+			{{/if}}
+
+			<div class="rc-button__group canned-response-buttons">
+				<a href="#" class="rc-button rc-button--primary new-canned-response-btn">{{_ "New_Canned_Response"}}</a>
+			</div>
+		{{/if}}
+
+	{{/requiresPermission}}
+</template>
diff --git a/ee/app/canned-responses/client/views/tabbar/cannedResponses.js b/ee/app/canned-responses/client/views/tabbar/cannedResponses.js
new file mode 100644
index 000000000000..8cb6eef36984
--- /dev/null
+++ b/ee/app/canned-responses/client/views/tabbar/cannedResponses.js
@@ -0,0 +1,266 @@
+import { ReactiveVar } from 'meteor/reactive-var';
+import { Meteor } from 'meteor/meteor';
+import { Template } from 'meteor/templating';
+import toastr from 'toastr';
+
+import { CannedResponse } from '../../collections/CannedResponse';
+import { t, handleError } from '../../../../../../app/utils';
+import { chatMessages } from '../../../../../../app/ui/client';
+
+import './cannedResponses.html';
+
+Template.cannedResponses.helpers({
+	cannedResponses() {
+		const searchText = Template.instance().searchText.get().toLocaleLowerCase();
+
+		let query = {};
+
+		if (Template.instance().context.get() === 'department') {
+			query = {
+				scope: 'department',
+				departmentId: Template.instance().departmentId,
+			};
+		}
+
+		if (searchText) {
+			const regex = new RegExp(searchText, 'i');
+			query.$or = [
+				{
+					shortcut: {
+						$regex: regex,
+					},
+				},
+				{
+					text: {
+						$regex: regex,
+					},
+				},
+			];
+		}
+		return CannedResponse.find(query);
+	},
+
+	hasNoCannedResponses() {
+		return CannedResponse.find().count() === 0;
+	},
+
+	isDetailScreen() {
+		return ['edit', 'new', 'view'].includes(Template.instance().action.get());
+	},
+
+	isNewResponse() {
+		return Template.instance().action.get() === 'new';
+	},
+
+	isExistingResponse() {
+		return ['edit', 'view'].includes(Template.instance().action.get());
+	},
+
+	isUserContext() {
+		return Template.instance().context.get() === 'user';
+	},
+
+	searchText() {
+		return Template.instance().searchText.get();
+	},
+
+	isDepartmentContext() {
+		return Template.instance().context.get() === 'department';
+	},
+
+	cannedResponse() {
+		return Template.instance().cannedResponse.get();
+	},
+
+	canDeleteResponse() {
+		const action = Template.instance().action.get();
+
+		if (action !== 'edit') {
+			return false;
+		}
+
+		const response = Template.instance().cannedResponse.get();
+		const context = Template.instance().context.get();
+
+		return response.scope === context;
+	},
+
+	canModifyResponse() {
+		const action = Template.instance().action.get();
+
+		if (action === 'new') {
+			return true;
+		}
+
+		const response = Template.instance().cannedResponse.get();
+		const context = Template.instance().context.get();
+
+		return response.scope === context;
+	},
+
+	createdByString() {
+		const username = this.createdBy;
+
+		const me = Meteor.users.findOne(Meteor.userId());
+
+		if (me.username === username) {
+			return t('Me');
+		}
+
+		return username;
+	},
+
+	isPreviewMode() {
+		return Template.instance().action.get() === 'view';
+	},
+});
+
+Template.cannedResponses.events({
+	'click .new-canned-response-btn'(e, instance) {
+		e.preventDefault();
+		e.stopPropagation();
+
+		instance.cannedResponse.set({
+			shortcut: '',
+			text: '',
+		});
+		instance.action.set('new');
+	},
+
+	'click .canned-response'(e, instance) {
+		e.preventDefault();
+		e.stopPropagation();
+
+		const { _id } = this;
+
+		const cannedResponse = CannedResponse.findOne({ _id });
+		if (!cannedResponse) {
+			toastr.success(t('Invalid Canned Response'));
+		}
+
+		instance.cannedResponse.set(cannedResponse);
+		const canEdit = instance.context.get() === cannedResponse.scope;
+
+		instance.action.set(canEdit ? 'edit' : 'view');
+	},
+
+	'click .delete-canned-response'(e, instance) {
+		e.preventDefault();
+		e.stopPropagation();
+
+		const _id = instance.$('input[name=id]').val();
+
+		Meteor.call('removeCannedResponse', _id, (error) => {
+			if (error) {
+				return handleError(error);
+			}
+
+			toastr.success(t('Canned_Response_Removed'));
+			instance.action.set(null);
+		});
+	},
+
+	'click .cancel-canned-response-btn'(e, instance) {
+		e.preventDefault();
+		e.stopPropagation();
+
+		instance.action.set(null);
+	},
+
+	'click .use-canned-response-btn'(e, instance) {
+		e.preventDefault();
+		e.stopPropagation();
+
+		const { rid } = Template.currentData();
+		if (!rid) {
+			return;
+		}
+
+		const object = instance.cannedResponse.get();
+		const { input } = chatMessages[rid];
+		const { text } = object;
+
+		if (document.selection) {
+			input.focus();
+			const sel = document.selection.createRange();
+			sel.text = text;
+			return;
+		}
+
+		if (input.selectionStart || input.selectionStart === 0) {
+			const startPos = input.selectionStart;
+			const endPos = input.selectionEnd;
+
+			const prefix = input.value.substring(0, startPos);
+			const suffix = input.value.substring(endPos, input.value.length);
+
+			input.value = `${ prefix }${ text }${ suffix }`;
+			input.selectionStart = startPos + text.length;
+			input.selectionEnd = startPos + text.length;
+
+			input.focus();
+			instance.action.set(null);
+			return;
+		}
+
+		input.value += text;
+	},
+
+	'click .save-canned-response-btn'(e, instance) {
+		e.preventDefault();
+		e.stopPropagation();
+
+		const _id = instance.$('input[name=id]').val();
+		const shortcut = instance.$('input[name=shortcut]').val();
+		const text = instance.$('textarea[name=text]').val();
+
+		const responseData = {
+			shortcut,
+			text,
+		};
+
+		const context = instance.context.get();
+		if (context === 'department') {
+			if (!instance.departmentId) {
+				toastr.error(t('Invalid_Department'));
+				return;
+			}
+
+			responseData.scope = 'department';
+			responseData.departmentId = instance.departmentId;
+		} else {
+			responseData.scope = 'user';
+		}
+
+		Meteor.call('saveCannedResponse', _id, responseData, function(error/* , result*/) {
+			if (error) {
+				return handleError(error);
+			}
+
+			toastr.success(t('Saved'));
+			instance.action.set(null);
+		});
+	},
+
+	'keyup .js-search'(event, instance) {
+		instance.searchText.set(event.currentTarget.value || '');
+	},
+});
+
+Template.cannedResponses.onCreated(function() {
+	this.action = new ReactiveVar();
+	this.context = new ReactiveVar();
+	this.cannedResponse = new ReactiveVar();
+	this.searchText = new ReactiveVar('');
+	this.departmentId = null;
+
+	if (this.data && this.data.context) {
+		this.context.set(this.data.context);
+
+		if (this.data.context === 'department') {
+			this.departmentId = this.data.departmentId;
+		}
+	} else {
+		this.context.set('user');
+	}
+});
diff --git a/ee/app/canned-responses/client/views/tabbar/departmentCannedResponses.html b/ee/app/canned-responses/client/views/tabbar/departmentCannedResponses.html
new file mode 100644
index 000000000000..e95d02768c60
--- /dev/null
+++ b/ee/app/canned-responses/client/views/tabbar/departmentCannedResponses.html
@@ -0,0 +1,3 @@
+<template name="departmentCannedResponses">
+	{{> cannedResponses context="department" departmentId=departmentId}}
+</template>
\ No newline at end of file
diff --git a/ee/app/canned-responses/client/views/tabbar/departmentCannedResponses.js b/ee/app/canned-responses/client/views/tabbar/departmentCannedResponses.js
new file mode 100644
index 000000000000..2ae13e5b9e79
--- /dev/null
+++ b/ee/app/canned-responses/client/views/tabbar/departmentCannedResponses.js
@@ -0,0 +1,16 @@
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Template } from 'meteor/templating';
+
+import './departmentCannedResponses.html';
+
+Template.departmentCannedResponses.helpers({
+	departmentId() {
+		return FlowRouter.getParam('_id');
+	},
+});
+
+Template.departmentCannedResponses.events({
+});
+
+Template.departmentCannedResponses.onCreated(function() {
+});
diff --git a/ee/app/canned-responses/server/index.js b/ee/app/canned-responses/server/index.js
new file mode 100644
index 000000000000..0e0d8a3a36cc
--- /dev/null
+++ b/ee/app/canned-responses/server/index.js
@@ -0,0 +1,14 @@
+import { Meteor } from 'meteor/meteor';
+
+import { onLicense } from '../../license/server';
+
+onLicense('canned-responses', () => {
+	const { createSettings } = require('./settings');
+	require('./permissions');
+	require('./methods/saveCannedResponse');
+	require('./methods/removeCannedResponse');
+
+	Meteor.startup(function() {
+		createSettings();
+	});
+});
diff --git a/ee/app/canned-responses/server/methods/removeCannedResponse.js b/ee/app/canned-responses/server/methods/removeCannedResponse.js
new file mode 100644
index 000000000000..6fbab487a1fb
--- /dev/null
+++ b/ee/app/canned-responses/server/methods/removeCannedResponse.js
@@ -0,0 +1,25 @@
+import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
+
+import { hasPermission } from '../../../../../app/authorization';
+import CannedResponse from '../../../models/server/models/CannedResponse';
+import { cannedResponsesStreamer } from '../streamer';
+
+Meteor.methods({
+	'removeCannedResponse'(_id) {
+		if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'remove-canned-responses')) {
+			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'removeCannedResponse' });
+		}
+
+		check(_id, String);
+
+		const cannedResponse = CannedResponse.findOneById(_id);
+		if (!cannedResponse) {
+			throw new Meteor.Error('error-canned-response-not-found', 'Canned Response not found', { method: 'removeCannedResponse' });
+		}
+
+		cannedResponsesStreamer.emit('canned-responses', { type: 'removed', _id });
+
+		return CannedResponse.removeById(_id);
+	},
+});
diff --git a/ee/app/canned-responses/server/methods/saveCannedResponse.js b/ee/app/canned-responses/server/methods/saveCannedResponse.js
new file mode 100644
index 000000000000..6d04c467bb7f
--- /dev/null
+++ b/ee/app/canned-responses/server/methods/saveCannedResponse.js
@@ -0,0 +1,49 @@
+import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
+
+import { hasPermission } from '../../../../../app/authorization';
+import CannedResponse from '../../../models/server/models/CannedResponse';
+import { Users } from '../../../../../app/models';
+import { cannedResponsesStreamer } from '../streamer';
+
+Meteor.methods({
+	saveCannedResponse(_id, responseData) {
+		if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'save-canned-responses')) {
+			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'saveCannedResponse' });
+		}
+
+		check(_id, Match.Maybe(String));
+
+		check(responseData, {
+			shortcut: String,
+			text: String,
+			scope: String,
+			departmentId: Match.Maybe(String),
+		});
+
+		if (responseData.scope === 'department' && !responseData.departmentId) {
+			throw new Meteor.Error('error-invalid-department', 'Invalid department', { method: 'saveCannedResponse' });
+		}
+
+		if (_id) {
+			const cannedResponse = CannedResponse.findOneById(_id);
+			if (!cannedResponse) {
+				throw new Meteor.Error('error-canned-response-not-found', 'Canned Response not found', { method: 'saveCannedResponse' });
+			}
+
+			responseData.scope = cannedResponse.scope;
+			responseData.createdBy = cannedResponse.createdBy;
+		} else {
+			const user = Users.findOneById(Meteor.userId());
+
+			if (responseData.scope === 'user') {
+				responseData.userId = user._id;
+			}
+			responseData.createdBy = user.username;
+		}
+		const createdCannedResponse = CannedResponse.createOrUpdateCannedResponse(_id, responseData);
+		cannedResponsesStreamer.emit('canned-responses', { type: 'changed', ...createdCannedResponse });
+
+		return createdCannedResponse;
+	},
+});
diff --git a/ee/app/canned-responses/server/permissions.js b/ee/app/canned-responses/server/permissions.js
new file mode 100644
index 000000000000..4adec4cd7c13
--- /dev/null
+++ b/ee/app/canned-responses/server/permissions.js
@@ -0,0 +1,11 @@
+import { Meteor } from 'meteor/meteor';
+
+import { Permissions } from '../../../../app/models';
+
+Meteor.startup(() => {
+	if (Permissions) {
+		Permissions.createOrUpdate('view-canned-responses', ['livechat-agent', 'livechat-monitor', 'livechat-manager', 'admin']);
+		Permissions.createOrUpdate('save-canned-responses', ['livechat-agent', 'livechat-monitor', 'livechat-manager', 'admin']);
+		Permissions.createOrUpdate('remove-canned-responses', ['livechat-agent', 'livechat-monitor', 'livechat-manager', 'admin']);
+	}
+});
diff --git a/ee/app/canned-responses/server/settings.js b/ee/app/canned-responses/server/settings.js
new file mode 100644
index 000000000000..0b204f9cd614
--- /dev/null
+++ b/ee/app/canned-responses/server/settings.js
@@ -0,0 +1,12 @@
+import { settings } from '../../../../app/settings';
+
+export const createSettings = () => {
+	settings.addGroup('Canned Responses', function() {
+		this.section('Canned Responses', function() {
+			this.add('Canned_Responses_Enable', false, {
+				type: 'boolean',
+				public: true,
+			});
+		});
+	});
+};
diff --git a/ee/app/canned-responses/server/streamer.js b/ee/app/canned-responses/server/streamer.js
new file mode 100644
index 000000000000..ee34be29ed50
--- /dev/null
+++ b/ee/app/canned-responses/server/streamer.js
@@ -0,0 +1,11 @@
+import { Meteor } from 'meteor/meteor';
+
+import { hasPermission } from '../../../../app/authorization';
+import { settings } from '../../../../app/settings';
+
+export const cannedResponsesStreamer = new Meteor.Streamer('canned-responses');
+
+cannedResponsesStreamer.allowWrite('none');
+cannedResponsesStreamer.allowRead(function() {
+	return this.userId && settings.get('Canned_Responses_Enable') && hasPermission(this.userId, 'view-canned-responses');
+});
diff --git a/ee/app/ldap-enterprise/README.md b/ee/app/ldap-enterprise/README.md
new file mode 100644
index 000000000000..24c81fd3cbcb
--- /dev/null
+++ b/ee/app/ldap-enterprise/README.md
@@ -0,0 +1,22 @@
+# LDAP-Enterprise
+
+This package enables the administrator option to map the roles used on your LDAP server with the Rocket.Chat server roles.
+With the correspondent license for this product, a new "Roles" section will be enabled in the admin panel in the LDAP group, 
+where the administrator can map LDAP roles to Rocket.Chat roles`(Admin panel -> LDAP -> Roles)`, following the pattern described below:
+
+```
+{
+  "ldapRole": "["admin", "guest"], //must be an array of valid Rocket.Chat Users Roles
+  "anotherLdapRole": "["anonymous"]
+}
+
+```
+**Note:** If some mapping error occurs, be aware of the server log, that the error will be shown.
+<br/>
+<br/>
+In addition to the options described above, still in the same section, there are other options such as:
+* `LDAP_Enable_LDAP_Roles_To_RC_Roles`: Enable or disable this feature;
+* `LDAP_Validate_Roles_For_Each_Login`: If the validation should occurs for each login (**Be careful with this setting because it will overwrite 
+the user roles in each login, otherwise this will be validated only at the moment of user creation**);
+* `LDAP_Default_Role_To_User`: The default Rocket.Chat role to be defined, if any LDAP role that the user has, is not mapped;
+* `LDAP_Query_To_Get_User_Groups`: The LDAP query to get the LDAP groups that the user is part of;
diff --git a/ee/app/ldap-enterprise/server/hooks/beforeSearchAll.js b/ee/app/ldap-enterprise/server/hooks/beforeSearchAll.js
new file mode 100644
index 000000000000..c046bc60d72b
--- /dev/null
+++ b/ee/app/ldap-enterprise/server/hooks/beforeSearchAll.js
@@ -0,0 +1,13 @@
+import { callbacks } from '../../../../../app/callbacks';
+
+callbacks.add('ldap.beforeSearchAll', (searchParams) => {
+	const { options } = searchParams;
+
+	if (!Array.isArray(options.attributes)) {
+		options.attributes = options.attributes ? [options.attributes] : ['*'];
+	}
+
+	options.attributes.push('pwdAccountLockedTime');
+
+	return searchParams;
+}, callbacks.priority.MEDIUM, 'ldap-return-attribute-AccountLockedTime');
diff --git a/ee/app/ldap-enterprise/server/hooks/syncExistentUser.js b/ee/app/ldap-enterprise/server/hooks/syncExistentUser.js
new file mode 100644
index 000000000000..e5d82fec6fe6
--- /dev/null
+++ b/ee/app/ldap-enterprise/server/hooks/syncExistentUser.js
@@ -0,0 +1,12 @@
+import { callbacks } from '../../../../../app/callbacks';
+import { logger } from '../../../../../app/ldap/server/sync';
+import { setUserActiveStatus } from '../../../../../app/lib/server/functions/setUserActiveStatus';
+
+callbacks.add('ldap.afterSyncExistentUser', ({ ldapUser, user }) => {
+	const activate = !!ldapUser && !ldapUser.pwdAccountLockedTime;
+
+	if (activate !== user.active) {
+		setUserActiveStatus(user._id, activate);
+		logger.info(`${ activate ? 'Activating' : 'Deactivating' } user ${ user.name } (${ user._id })`);
+	}
+}, callbacks.priority.MEDIUM, 'ldap-disable-enable-users');
diff --git a/ee/app/ldap-enterprise/server/index.js b/ee/app/ldap-enterprise/server/index.js
new file mode 100644
index 000000000000..66314d8fc6fe
--- /dev/null
+++ b/ee/app/ldap-enterprise/server/index.js
@@ -0,0 +1,19 @@
+import { Meteor } from 'meteor/meteor';
+
+import './hooks/syncExistentUser';
+import './hooks/beforeSearchAll';
+
+import { callbacks } from '../../../../app/callbacks/server';
+import { onLicense } from '../../license/server';
+
+onLicense('ldap-enterprise', () => {
+	const { createSettings } = require('./settings');
+	const { validateLDAPRolesMappingChanges } = require('./ldapEnterprise');
+	const { onLdapLogin } = require('./listener');
+
+	Meteor.startup(function() {
+		createSettings();
+		validateLDAPRolesMappingChanges();
+		callbacks.add('afterLDAPLogin', onLdapLogin);
+	});
+});
diff --git a/ee/app/ldap-enterprise/server/ldapEnterprise.js b/ee/app/ldap-enterprise/server/ldapEnterprise.js
new file mode 100644
index 000000000000..476ff404c6dd
--- /dev/null
+++ b/ee/app/ldap-enterprise/server/ldapEnterprise.js
@@ -0,0 +1,73 @@
+import { Meteor } from 'meteor/meteor';
+
+import { Roles } from '../../../../app/models';
+import { Logger } from '../../../../app/logger';
+import { settings } from '../../../../app/settings';
+
+const logger = new Logger('ldapEnterprise');
+
+const mustBeAnArrayOfStrings = (array) => Array.isArray(array) && array.length && array.every((item) => typeof item === 'string');
+
+const validateRoleMapping = (mappedRoles) => {
+	const allRocketChatUserRoles = Roles.find({ scope: 'Users' }).fetch().map((role) => role._id);
+	const mappedRocketChatRoles = Object.values(mappedRoles);
+	const validRolesMapping = mappedRocketChatRoles.every((roles) => roles.every((role) => allRocketChatUserRoles.includes(role)));
+	if (!validRolesMapping) {
+		throw new Error('Please verify your mapping for LDAP X RocketChat Roles. There is some invalid Rocket Chat Role.');
+	}
+};
+
+const validateLDAPRolesMappingStructure = (mappedRoles) => {
+	const mappedRocketChatRoles = Object.values(mappedRoles);
+	const validStructureMapping = mappedRocketChatRoles.every(mustBeAnArrayOfStrings);
+	if (!validStructureMapping) {
+		throw new Error('Please verify your mapping for LDAP X RocketChat Roles. The structure is invalid, the structure should be an object like: {key: LdapRole, value: [An array of rocket.chat roles]}');
+	}
+};
+
+export const getLdapRolesByUsername = (username, ldap) => {
+	const searchOptions = {
+		filter: settings.get('LDAP_Query_To_Get_User_Groups').replace(/#{username}/g, username),
+		scope: ldap.options.User_Search_Scope || 'sub',
+		sizeLimit: ldap.options.Search_Size_Limit,
+	};
+	const getLdapRoles = (ldapUserGroups) => ldapUserGroups.filter((field) => field && field.ou).map((field) => field.ou);
+	const ldapUserGroups = ldap.searchAllSync(ldap.options.BaseDN, searchOptions);
+	return Array.isArray(ldapUserGroups) ? getLdapRoles(ldapUserGroups) : [];
+};
+
+export const getRocketChatRolesByLdapRoles = (mappedRoles, ldapUserRoles) => {
+	const mappedLdapRoles = Object.keys(mappedRoles);
+	if (!ldapUserRoles.length) {
+		logger.error('The LDAP user has no role, so we set the default role value');
+		return [settings.get('LDAP_Default_Role_To_User')];
+	}
+	const unmappedLdapRoles = ldapUserRoles.filter((ldapRole) => !mappedLdapRoles.includes(ldapRole));
+	const getRocketChatMappedRoles = (acc, role) => acc.concat(mappedRoles[role]);
+	const removeRepeatedRoles = (acc, role) => (acc.includes(role) ? acc : acc.concat(role));
+	if (unmappedLdapRoles.length) {
+		logger.error(`The following LDAP roles is/are not mapped in Rocket.Chat: "${ unmappedLdapRoles.join(', ') }". Because it, we set the default LDAP role.`);
+		return [settings.get('LDAP_Default_Role_To_User')];
+	}
+	return ldapUserRoles
+		.reduce(getRocketChatMappedRoles, [])
+		.reduce(removeRepeatedRoles, []);
+};
+
+export const updateUserUsingMappedLdapRoles = (userId, roles) => {
+	Meteor.users.update({ _id: userId }, { $set: { roles } });
+};
+
+export const validateLDAPRolesMappingChanges = () => {
+	settings.get('LDAP_Roles_To_Rocket_Chat_Roles', (key, value) => {
+		try {
+			if (value) {
+				const mappedRoles = JSON.parse(value);
+				validateLDAPRolesMappingStructure(mappedRoles);
+				validateRoleMapping(mappedRoles);
+			}
+		} catch (error) {
+			logger.error(error);
+		}
+	});
+};
diff --git a/ee/app/ldap-enterprise/server/listener.js b/ee/app/ldap-enterprise/server/listener.js
new file mode 100644
index 000000000000..e930e2a194d4
--- /dev/null
+++ b/ee/app/ldap-enterprise/server/listener.js
@@ -0,0 +1,13 @@
+import { settings } from '../../../../app/settings';
+import { getLdapRolesByUsername, getRocketChatRolesByLdapRoles, updateUserUsingMappedLdapRoles } from './ldapEnterprise';
+
+export const onLdapLogin = ({ user, ldapUser, ldap }) => {
+	const validateLdapRolesForEachLogin = settings.get('LDAP_Validate_Roles_For_Each_Login');
+	const userExists = user._id;
+	const userId = userExists ? user._id : user.userId;
+	const ldapUserRoles = getLdapRolesByUsername(ldapUser.uid, ldap);
+	if (!userExists || validateLdapRolesForEachLogin) {
+		const roles = getRocketChatRolesByLdapRoles(JSON.parse(settings.get('LDAP_Roles_To_Rocket_Chat_Roles')), ldapUserRoles);
+		updateUserUsingMappedLdapRoles(userId, roles);
+	}
+};
diff --git a/ee/app/ldap-enterprise/server/settings.js b/ee/app/ldap-enterprise/server/settings.js
new file mode 100644
index 000000000000..edb5587df2c9
--- /dev/null
+++ b/ee/app/ldap-enterprise/server/settings.js
@@ -0,0 +1,30 @@
+import { settings } from '../../../../app/settings';
+import { Roles } from '../../../../app/models';
+
+export const createSettings = () => {
+	settings.addGroup('LDAP', function() {
+		this.section('Role_Mapping', function() {
+			this.add('LDAP_Enable_LDAP_Roles_To_RC_Roles', false, {
+				type: 'boolean',
+				enableQuery: { _id: 'LDAP_Enable', value: true },
+			});
+			this.add('LDAP_Roles_To_Rocket_Chat_Roles', '{}', {
+				type: 'code',
+				enableQuery: { _id: 'LDAP_Enable_LDAP_Roles_To_RC_Roles', value: true },
+			});
+			this.add('LDAP_Validate_Roles_For_Each_Login', false, {
+				type: 'boolean',
+				enableQuery: { _id: 'LDAP_Enable_LDAP_Roles_To_RC_Roles', value: true },
+			});
+			this.add('LDAP_Default_Role_To_User', 'user', {
+				type: 'select',
+				values: Roles.find({ scope: 'Users' }).fetch().map((role) => ({ key: role._id, i18nLabel: role._id })),
+				enableQuery: { _id: 'LDAP_Enable_LDAP_Roles_To_RC_Roles', value: true },
+			});
+			this.add('LDAP_Query_To_Get_User_Groups', '(&(ou=*)(uniqueMember=uid=#{username},dc=example,dc=com))', {
+				type: 'string',
+				enableQuery: { _id: 'LDAP_Enable_LDAP_Roles_To_RC_Roles', value: true },
+			});
+		});
+	});
+};
diff --git a/ee/app/license/client/index.js b/ee/app/license/client/index.js
new file mode 100644
index 000000000000..d91d9614efad
--- /dev/null
+++ b/ee/app/license/client/index.js
@@ -0,0 +1,13 @@
+import { Meteor } from 'meteor/meteor';
+
+export function hasLicense(feature) {
+	return new Promise((resolve, reject) => {
+		Meteor.call('license:hasLicense', feature, (error, result) => {
+			if (error) {
+				return reject(error);
+			}
+
+			return resolve(result);
+		});
+	});
+}
diff --git a/ee/app/license/server/bundles.js b/ee/app/license/server/bundles.js
new file mode 100644
index 000000000000..361aede9b178
--- /dev/null
+++ b/ee/app/license/server/bundles.js
@@ -0,0 +1,46 @@
+const bundles = {
+	enterprise: [
+		'auditing',
+		'canned-responses',
+		'ldap-enterprise',
+		'livechat-enterprise',
+	],
+	pro: [
+	],
+};
+
+const getBundleFromModule = (moduleName) => {
+	const match = moduleName.match(/(.*):\*$/);
+	if (!match) {
+		return;
+	}
+
+	return match[1];
+};
+
+export function isBundle(moduleName) {
+	if (moduleName === '*') {
+		return true;
+	}
+
+	const bundle = getBundleFromModule(moduleName);
+	if (!bundle) {
+		return false;
+	}
+
+	return true;
+}
+
+export function getBundleModules(moduleName) {
+	if (moduleName === '*') {
+		return Object.keys(bundles)
+			.reduce((modules, bundle) => modules.concat(bundles[bundle]), []);
+	}
+
+	const bundle = getBundleFromModule(moduleName);
+	if (!bundle) {
+		return [];
+	}
+
+	return bundles[bundle];
+}
diff --git a/ee/app/license/server/decrypt.js b/ee/app/license/server/decrypt.js
new file mode 100644
index 000000000000..889f60e66fb5
--- /dev/null
+++ b/ee/app/license/server/decrypt.js
@@ -0,0 +1,9 @@
+import crypto from 'crypto';
+
+const publicKey = 'LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQ0lqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FnOEFNSUlDQ2dLQ0FnRUFxV1Nza2Q5LzZ6Ung4a3lQY2ljcwpiMzJ3Mnd4VnV3N3lCVDk2clEvOEQreU1lQ01POXdTU3BIYS85bkZ5d293RXRpZ3B0L3dyb1BOK1ZHU3didHdQCkZYQmVxRWxCbmRHRkFsODZlNStFbGlIOEt6L2hHbkNtSk5tWHB4RUsyUkUwM1g0SXhzWVg3RERCN010eC9pcXMKY2pCL091dlNCa2ppU2xlUzdibE5JVC9kQTdLNC9DSjNvaXUwMmJMNEV4Y2xDSGVwenFOTWVQM3dVWmdweE9uZgpOT3VkOElYWUs3M3pTY3VFOEUxNTdZd3B6Q0twVmFIWDdaSmY4UXVOc09PNVcvYUlqS2wzTDYyNjkrZUlPRXJHCndPTm1hSG56Zmc5RkxwSmh6Z3BPMzhhVm43NnZENUtLakJhaldza1krNGEyZ1NRbUtOZUZxYXFPb3p5RUZNMGUKY0ZXWlZWWjNMZWg0dkVNb1lWUHlJeng5Nng4ZjIveW1QbmhJdXZRdjV3TjRmeWVwYTdFWTVVQ2NwNzF6OGtmUAo0RmNVelBBMElEV3lNaWhYUi9HNlhnUVFaNEdiL3FCQmh2cnZpSkNGemZZRGNKZ0w3RmVnRllIUDNQR0wwN1FnCnZMZXZNSytpUVpQcnhyYnh5U3FkUE9rZ3VyS2pWclhUVXI0QTlUZ2lMeUlYNVVsSnEzRS9SVjdtZk9xWm5MVGEKU0NWWEhCaHVQbG5DR1pSMDFUb1RDZktoTUcxdTBDRm5MMisxNWhDOWZxT21XdjlRa2U0M3FsSjBQZ0YzVkovWAp1eC9tVHBuazlnbmJHOUpIK21mSDM5Um9GdlROaW5Zd1NNdll6dXRWT242OXNPemR3aERsYTkwbDNBQ2g0eENWCks3Sk9YK3VIa29OdTNnMmlWeGlaVU0wQ0F3RUFBUT09Ci0tLS0tRU5EIFBVQkxJQyBLRVktLS0tLQo=';
+
+export default function decrypt(encrypted) {
+	const decrypted = crypto.publicDecrypt(Buffer.from(publicKey, 'base64'), Buffer.from(encrypted, 'base64'));
+
+	return decrypted.toString('utf-8');
+}
diff --git a/ee/app/license/server/index.js b/ee/app/license/server/index.js
new file mode 100644
index 000000000000..1d19328f9b76
--- /dev/null
+++ b/ee/app/license/server/index.js
@@ -0,0 +1,6 @@
+import { onLicense } from './license';
+import './settings';
+import './methods';
+import './startup';
+
+export { onLicense };
diff --git a/ee/app/license/server/license.js b/ee/app/license/server/license.js
new file mode 100644
index 000000000000..77618e523224
--- /dev/null
+++ b/ee/app/license/server/license.js
@@ -0,0 +1,173 @@
+import EventEmiter from 'events';
+
+import { Users } from '../../../../app/models/server';
+import decrypt from './decrypt';
+import { getBundleModules, isBundle } from './bundles';
+
+const EnterpriseLicenses = new EventEmiter();
+
+const License = {
+	url: null,
+	licenses: [],
+	modules: {},
+
+	_validateExpiration(expiration) {
+		return new Date() > new Date(expiration);
+	},
+
+	_validateURL(licenseURL, url) {
+		licenseURL = licenseURL
+			.replace(/\./g, '\\.') // convert dots to literal
+			.replace(/\*/g, '.*'); // convert * to .*
+		const regex = new RegExp(`^${ licenseURL }$`, 'i');
+
+		return regex.exec(url);
+	},
+
+	_validModules(licenseModules) {
+		licenseModules.forEach((licenseModule) => {
+			const modules = isBundle(licenseModule)
+				? getBundleModules(licenseModule)
+				: [licenseModule];
+
+			modules.forEach((module) => {
+				this.modules[module] = 1;
+				EnterpriseLicenses.emit(`valid:${ module }`);
+			});
+		});
+	},
+
+	_invalidModules(licenseModules) {
+		licenseModules.forEach((licenseModule) => {
+			const modules = isBundle(licenseModule)
+				? getBundleModules(licenseModule)
+				: [licenseModule];
+
+			modules.forEach((module) => EnterpriseLicenses.emit(`invalid:${ module }`));
+		});
+	},
+
+	_hasValidNumberOfActiveUsers(maxActiveUsers) {
+		return Users.getActiveLocalUserCount() <= maxActiveUsers;
+	},
+
+	addLicense(license) {
+		this.licenses.push({
+			valid: null,
+			license,
+		});
+
+		this.validate();
+	},
+
+	hasModule(module) {
+		return typeof this.modules[module] !== 'undefined';
+	},
+
+	setURL(url) {
+		this.url = url.replace(/\/$/, '').replace(/^https?:\/\/(.*)$/, '$1');
+
+		this.validate();
+	},
+
+	validate() {
+		this.licenses = this.licenses.map((item) => {
+			const { license } = item;
+
+			if (license.url) {
+				if (!this.url) {
+					return item;
+				}
+				if (!this._validateURL(license.url, this.url)) {
+					license.valid = false;
+					this._invalidModules(license.modules);
+					return item;
+				}
+			}
+
+			if (license.expiry && this._validateExpiration(license.expiry)) {
+				license.valid = false;
+				this._invalidModules(license.modules);
+				return item;
+			}
+
+			if (license.maxActiveUsers && !this._hasValidNumberOfActiveUsers(parseInt(license.maxActiveUsers))) {
+				license.valid = false;
+				this._invalidModules(license.modules);
+				return item;
+			}
+
+			this._validModules(license.modules);
+
+			console.log('#### License validated:', license.modules.join(', '));
+
+			item.valid = true;
+			return item;
+		});
+
+		this.showLicenses();
+	},
+
+	showLicenses() {
+		if (!process.env.LICENSE_DEBUG || process.env.LICENSE_DEBUG === 'false') {
+			return;
+		}
+
+		this.licenses
+			.filter((item) => item.valid)
+			.forEach((item) => {
+				const { license } = item;
+
+				console.log('---- License enabled ----');
+				console.log('            url ->', license.url);
+				console.log('         expiry ->', license.expiry);
+				console.log(' maxActiveUsers ->', license.maxActiveUsers);
+				console.log('        modules ->', license.modules.join(', '));
+				console.log('-------------------------');
+			});
+	},
+};
+
+export function addLicense(encryptedLicense) {
+	if (!encryptedLicense || String(encryptedLicense).trim() === '') {
+		return;
+	}
+
+	console.log('### New Enteprise License');
+
+	try {
+		const decrypted = decrypt(encryptedLicense);
+		if (!decrypted) {
+			return;
+		}
+
+		if (process.env.LICENSE_DEBUG && process.env.LICENSE_DEBUG !== 'false') {
+			console.log('##### Raw license ->', decrypted);
+		}
+
+		License.addLicense(JSON.parse(decrypted));
+
+		return true;
+	} catch (e) {
+		console.error('##### Invalid license');
+		if (process.env.LICENSE_DEBUG && process.env.LICENSE_DEBUG !== 'false') {
+			console.error('##### Invalid raw license ->', encryptedLicense, e);
+		}
+	}
+}
+
+export function setURL(url) {
+	License.setURL(url);
+}
+
+export function hasLicense(feature) {
+	return License.hasModule(feature);
+}
+
+export function onLicense(feature, cb) {
+	if (hasLicense(feature)) {
+		return cb();
+	}
+
+	EnterpriseLicenses.once(`valid:${ feature }`, cb);
+}
diff --git a/ee/app/license/server/methods.js b/ee/app/license/server/methods.js
new file mode 100644
index 000000000000..ed1e5eca4638
--- /dev/null
+++ b/ee/app/license/server/methods.js
@@ -0,0 +1,9 @@
+import { Meteor } from 'meteor/meteor';
+
+import { hasLicense } from './license';
+
+Meteor.methods({
+	'license:hasLicense'(feature) {
+		return hasLicense(feature);
+	},
+});
diff --git a/ee/app/license/server/settings.js b/ee/app/license/server/settings.js
new file mode 100644
index 000000000000..b7e8c841ff2c
--- /dev/null
+++ b/ee/app/license/server/settings.js
@@ -0,0 +1,40 @@
+import { Meteor } from 'meteor/meteor';
+
+import { settings } from '../../../../app/settings/server';
+import { Settings } from '../../../../app/models/server';
+import { addLicense } from './license';
+
+Meteor.startup(function() {
+	settings.addGroup('Enterprise', function() {
+		this.section('License', function() {
+			this.add('Enterprise_License', '', {
+				type: 'string',
+				i18nLabel: 'Enterprise_License',
+			});
+			this.add('Enterprise_License_Status', '', {
+				readonly: true,
+				type: 'string',
+				i18nLabel: 'Status',
+			});
+		});
+	});
+});
+
+settings.get('Enterprise_License', (key, license) => {
+	if (!license || String(license).trim() === '') {
+		return;
+	}
+
+	if (!addLicense(license)) {
+		Settings.updateValueById('Enterprise_License_Status', 'Invalid');
+		return;
+	}
+
+	Settings.updateValueById('Enterprise_License_Status', 'Valid');
+});
+
+if (process.env.ROCKETCHAT_LICENSE) {
+	Meteor.startup(() => {
+		Settings.updateValueById('Enterprise_License', process.env.ROCKETCHAT_LICENSE);
+	});
+}
diff --git a/ee/app/license/server/startup.js b/ee/app/license/server/startup.js
new file mode 100644
index 000000000000..e1d75d6d193d
--- /dev/null
+++ b/ee/app/license/server/startup.js
@@ -0,0 +1,22 @@
+import { settings } from '../../../../app/settings/server';
+import { getWorkspaceLicense } from '../../../../app/cloud/server';
+import { callbacks } from '../../../../app/callbacks';
+import { addLicense, setURL } from './license';
+import './settings';
+import './methods';
+
+settings.get('Site_Url', (key, value) => {
+	if (value) {
+		setURL(value);
+	}
+});
+
+const { license } = getWorkspaceLicense();
+
+if (license) {
+	addLicense(license);
+}
+
+callbacks.add('workspaceLicenseChanged', (updatedLicense) => {
+	addLicense(updatedLicense);
+});
diff --git a/ee/app/livechat-enterprise/client/index.js b/ee/app/livechat-enterprise/client/index.js
new file mode 100644
index 000000000000..a27fe5c4e8df
--- /dev/null
+++ b/ee/app/livechat-enterprise/client/index.js
@@ -0,0 +1,16 @@
+import { hasLicense } from '../../license/client';
+import './views/livechatMonitors';
+import './views/livechatUnits';
+import './views/livechatUnitForm';
+import './route';
+import './views/livechatTags';
+import './views/livechatTagForm';
+
+hasLicense('livechat-enterprise').then((enabled) => {
+	if (!enabled) {
+		return;
+	}
+
+	require('./views/app/registerCustomTemplates');
+	require('./views/livechatSideNavItems');
+});
diff --git a/ee/app/livechat-enterprise/client/route.js b/ee/app/livechat-enterprise/client/route.js
new file mode 100644
index 000000000000..d09afeced6a4
--- /dev/null
+++ b/ee/app/livechat-enterprise/client/route.js
@@ -0,0 +1,58 @@
+import { AccountBox } from '../../../../app/ui-utils';
+import { livechatManagerRoutes } from '../../../../app/livechat/client/route';
+
+AccountBox.addRoute({
+	name: 'livechat-monitors',
+	path: '/monitors',
+	sideNav: 'livechatFlex',
+	i18nPageTitle: 'Livechat_Monitors',
+	pageTemplate: 'livechatMonitors',
+}, livechatManagerRoutes);
+
+AccountBox.addRoute({
+	name: 'livechat-units',
+	path: '/units',
+	sideNav: 'livechatFlex',
+	i18nPageTitle: 'Units',
+	pageTemplate: 'livechatUnits',
+}, livechatManagerRoutes);
+
+AccountBox.addRoute({
+	name: 'livechat-unit-edit',
+	path: '/units/:_id/edit',
+	sideNav: 'livechatFlex',
+	i18nPageTitle: 'Edit_Unit',
+	pageTemplate: 'livechatUnitForm',
+}, livechatManagerRoutes);
+
+AccountBox.addRoute({
+	name: 'livechat-unit-new',
+	path: '/units/new',
+	sideNav: 'livechatFlex',
+	i18nPageTitle: 'New_Unit',
+	pageTemplate: 'livechatUnitForm',
+}, livechatManagerRoutes);
+
+AccountBox.addRoute({
+	name: 'livechat-tags',
+	path: '/tags',
+	sideNav: 'livechatFlex',
+	i18nPageTitle: 'Tags',
+	pageTemplate: 'livechatTags',
+}, livechatManagerRoutes);
+
+AccountBox.addRoute({
+	name: 'livechat-tag-edit',
+	path: '/tags/:_id/edit',
+	sideNav: 'livechatFlex',
+	i18nPageTitle: 'Edit_Tag',
+	pageTemplate: 'livechatTagForm',
+}, livechatManagerRoutes);
+
+AccountBox.addRoute({
+	name: 'livechat-tag-new',
+	path: '/tags/new',
+	sideNav: 'livechatFlex',
+	i18nPageTitle: 'New_Tag',
+	pageTemplate: 'livechatTagForm',
+}, livechatManagerRoutes);
diff --git a/ee/app/livechat-enterprise/client/views/app/customTemplates/livechatAgentEditCustomFieldsForm.html b/ee/app/livechat-enterprise/client/views/app/customTemplates/livechatAgentEditCustomFieldsForm.html
new file mode 100644
index 000000000000..8b2131b710cd
--- /dev/null
+++ b/ee/app/livechat-enterprise/client/views/app/customTemplates/livechatAgentEditCustomFieldsForm.html
@@ -0,0 +1,12 @@
+<template name="livechatAgentEditCustomFieldsForm" args="agentId">
+	<div class="rc-form-group rc-form-group--small">
+		<div class="rc-input">
+			<label class="rc-input__label">
+				<div class="rc-input__title">{{_ "Max_number_of_chats_per_agent"}}</div>
+				<div class="rc-input__wrapper">
+					<input type="number" class="rc-input__element rc-input__element--small customFormField" name="maxNumberSimultaneousChat" value="{{data.maxNumberSimultaneousChat}}" />
+				</div>
+			</label>
+		</div>
+	</div>
+</template>
diff --git a/ee/app/livechat-enterprise/client/views/app/customTemplates/livechatAgentEditCustomFieldsForm.js b/ee/app/livechat-enterprise/client/views/app/customTemplates/livechatAgentEditCustomFieldsForm.js
new file mode 100644
index 000000000000..fd3c10fb2a46
--- /dev/null
+++ b/ee/app/livechat-enterprise/client/views/app/customTemplates/livechatAgentEditCustomFieldsForm.js
@@ -0,0 +1,21 @@
+import { ReactiveVar } from 'meteor/reactive-var';
+import { Template } from 'meteor/templating';
+
+import './livechatAgentEditCustomFieldsForm.html';
+
+Template.livechatAgentEditCustomFieldsForm.helpers({
+	data() {
+		const { livechat } = Template.instance().agent.get();
+		return livechat;
+	},
+});
+
+Template.livechatAgentEditCustomFieldsForm.onCreated(function() {
+	this.agent = new ReactiveVar({});
+
+	this.autorun(() => {
+		// To make this template reactive we expect a ReactiveVar through the data property,
+		// because the parent form may not be rerender, only the dynamic template data
+		this.agent.set(this.data.get());
+	});
+});
diff --git a/ee/app/livechat-enterprise/client/views/app/customTemplates/livechatAgentInfoCustomFieldsForm.html b/ee/app/livechat-enterprise/client/views/app/customTemplates/livechatAgentInfoCustomFieldsForm.html
new file mode 100644
index 000000000000..1cf0f2fc3eb5
--- /dev/null
+++ b/ee/app/livechat-enterprise/client/views/app/customTemplates/livechatAgentInfoCustomFieldsForm.html
@@ -0,0 +1,6 @@
+<template name="livechatAgentInfoCustomFieldsForm" args="agentId">
+	<div class="rc-user-info-details__item">
+		<label class="rc-user-info-details__label">{{_ "Max_number_of_chats_per_agent"}}</label>
+		<p class="rc-user-info-details__info">{{data.maxNumberSimultaneousChat}}</p>
+	</div>
+</template>
diff --git a/ee/app/livechat-enterprise/client/views/app/customTemplates/livechatAgentInfoCustomFieldsForm.js b/ee/app/livechat-enterprise/client/views/app/customTemplates/livechatAgentInfoCustomFieldsForm.js
new file mode 100644
index 000000000000..8cfed1cb41d1
--- /dev/null
+++ b/ee/app/livechat-enterprise/client/views/app/customTemplates/livechatAgentInfoCustomFieldsForm.js
@@ -0,0 +1,24 @@
+import { ReactiveVar } from 'meteor/reactive-var';
+import { Template } from 'meteor/templating';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
+
+import './livechatAgentInfoCustomFieldsForm.html';
+
+Template.livechatAgentInfoCustomFieldsForm.helpers({
+	data() {
+		const { livechat: { maxNumberSimultaneousChat } = {} } = Template.instance().agent.get();
+		return {
+			maxNumberSimultaneousChat: maxNumberSimultaneousChat || TAPi18n.__('Undefined'),
+		};
+	},
+});
+
+Template.livechatAgentInfoCustomFieldsForm.onCreated(function() {
+	this.agent = new ReactiveVar({});
+
+	this.autorun(() => {
+		// To make this template reactive we expect a ReactiveVar through the data property,
+		// because the parent form may not be rerender, only the dynamic template data
+		this.agent.set(this.data.get());
+	});
+});
diff --git a/ee/app/livechat-enterprise/client/views/app/customTemplates/livechatDepartmentCustomFieldsForm.html b/ee/app/livechat-enterprise/client/views/app/customTemplates/livechatDepartmentCustomFieldsForm.html
new file mode 100644
index 000000000000..38d41dda64d5
--- /dev/null
+++ b/ee/app/livechat-enterprise/client/views/app/customTemplates/livechatDepartmentCustomFieldsForm.html
@@ -0,0 +1,14 @@
+<template name="livechatDepartmentCustomFieldsForm" args="deptId">
+	<div class="input-line">
+		<label>{{_ "Max_number_of_chats_per_agent_description"}}</label>
+		<div>
+			<input type="number" class="rc-input__element customFormField" name="maxNumberSimultaneousChat" value="{{department.maxNumberSimultaneousChat}}" placeholder="{{_ "Max_number_of_chats_per_agent"}}" />
+		</div>
+	</div>
+	<div class="input-line">
+		<label>{{_ "Waiting_queue_message"}}</label>
+		<div>
+      		<textarea class="rc-input__element customFormField" name="waitingQueueMessage" rows="4">{{department.waitingQueueMessage}}</textarea>
+		</div>
+	</div>
+</template>
diff --git a/ee/app/livechat-enterprise/client/views/app/customTemplates/livechatDepartmentCustomFieldsForm.js b/ee/app/livechat-enterprise/client/views/app/customTemplates/livechatDepartmentCustomFieldsForm.js
new file mode 100644
index 000000000000..71ffdfde7384
--- /dev/null
+++ b/ee/app/livechat-enterprise/client/views/app/customTemplates/livechatDepartmentCustomFieldsForm.js
@@ -0,0 +1,24 @@
+import { ReactiveVar } from 'meteor/reactive-var';
+import { Template } from 'meteor/templating';
+
+import { APIClient } from '../../../../../../../app/utils/client';
+import './livechatDepartmentCustomFieldsForm.html';
+
+Template.livechatDepartmentCustomFieldsForm.helpers({
+	department() {
+		return Template.instance().department.get();
+	},
+});
+
+Template.livechatDepartmentCustomFieldsForm.onCreated(function() {
+	const { id: _id, department: contextDepartment } = this.data;
+
+	this.department = new ReactiveVar(contextDepartment);
+
+	if (!contextDepartment && _id) {
+		this.autorun(async () => {
+			const { department } = await APIClient.v1.get(`livechat/department/${ _id }`);
+			this.department.set(department);
+		});
+	}
+});
diff --git a/ee/app/livechat-enterprise/client/views/app/registerCustomTemplates.js b/ee/app/livechat-enterprise/client/views/app/registerCustomTemplates.js
new file mode 100644
index 000000000000..cc965f4f7008
--- /dev/null
+++ b/ee/app/livechat-enterprise/client/views/app/registerCustomTemplates.js
@@ -0,0 +1,8 @@
+import { addCustomFormTemplate } from '../../../../../../app/livechat/client/views/app/customTemplates/register';
+import './customTemplates/livechatDepartmentCustomFieldsForm';
+import './customTemplates/livechatAgentEditCustomFieldsForm';
+import './customTemplates/livechatAgentInfoCustomFieldsForm';
+
+addCustomFormTemplate('livechatDepartmentForm', 'livechatDepartmentCustomFieldsForm');
+addCustomFormTemplate('livechatAgentEditForm', 'livechatAgentEditCustomFieldsForm');
+addCustomFormTemplate('livechatAgentInfoForm', 'livechatAgentInfoCustomFieldsForm');
diff --git a/ee/app/livechat-enterprise/client/views/livechatMonitors.html b/ee/app/livechat-enterprise/client/views/livechatMonitors.html
new file mode 100644
index 000000000000..4b6a5c193002
--- /dev/null
+++ b/ee/app/livechat-enterprise/client/views/livechatMonitors.html
@@ -0,0 +1,91 @@
+<template name="livechatMonitors">
+	{{#if hasLicense}}
+		{{#requiresPermission 'manage-livechat-monitors'}}
+			<form id="form-monitor" class="form-inline">
+				<div class="form-group">
+					{{> livechatAutocompleteUser
+						onClickTag=onClickTagMonitors
+						list=selectedMonitors
+						deleteLastItem=deleteLastMonitor
+						onSelect=onSelectMonitors
+						collection='UserAndRoom'
+						endpoint='users.autocomplete'
+						field='username'
+						sort='username'
+						label="Search_by_username"
+						placeholder="Search_by_username"
+						name="username"
+						exceptions=exceptionsMonitors
+						icon="at"
+						noMatchTemplate="userSearchEmpty"
+						templateItem="popupList_item_default"
+						modifier=monitorModifier
+					}}
+				</div>
+				<div class="form-group">
+					<button name="add" class="rc-button rc-button--primary add" disabled='{{isloading}}'>{{_ "Add"}}</button>
+				</div>
+			</form>
+
+			<div class="rc-table-content">
+				<form class="search-form" role="form">
+						<div class="rc-input__wrapper">
+							<div class="rc-input__icon">
+								{{#if isloading}}
+									{{> loading }}
+								{{else}}
+									{{> icon block="rc-input__icon-svg" icon="magnifier" }}
+								{{/if}}
+							</div>
+							<input id="monitor-filter" type="text" class="rc-input__element"
+									placeholder="{{_ "Search"}}" autofocus dir="auto">
+							</div>
+				</form>
+				<div class="results">
+					{{{_ "Showing_results" monitors.length}}}
+				</div>
+
+				{{#table fixed='true' onScroll=onTableScroll}}
+					<thead>
+						<tr>
+							<th><div class="table-fake-th">{{_ "Name"}}</div></th>
+							<th width="33%"><div class="table-fake-th">{{_ "Username"}}</div></th>
+							<th width="33%"><div class="table-fake-th">{{_ "Email"}}</div></th>
+							<th width='40px'><div class="table-fake-th">&nbsp;</div></th>
+						</tr>
+					</thead>
+					<tbody>
+						{{#each monitors}}
+							<tr class="rc-table-tr user-info row-link" data-id="{{_id}}">
+								<td>
+									<div class="rc-table-wrapper">
+										<div class="rc-table-avatar user-image status-{{status}}">{{> avatar username=username}}</div>
+										<div class="rc-table-info">
+											<span class="rc-table-title">
+												{{name}}
+											</span>
+										</div>
+									</div>
+									<div class="rc-table-wrapper">
+										<div class="rc-table-info">
+											<span class="rc-table-title">
+												{{fname}}
+											</span>
+										</div>
+									</div>
+								</td>
+								<td>{{username}}</td>
+								<td>{{emailAddress}}</td>
+								<td>
+									<a href="#remove" class="remove-monitor">
+										<i class="icon-trash"></i>
+									</a>
+								</td>
+							</tr>
+						{{/each}}
+					</tbody>
+				{{/table}}
+			</div>
+		{{/requiresPermission}}
+	{{/if}}
+</template>
diff --git a/ee/app/livechat-enterprise/client/views/livechatMonitors.js b/ee/app/livechat-enterprise/client/views/livechatMonitors.js
new file mode 100644
index 000000000000..9830327e5a75
--- /dev/null
+++ b/ee/app/livechat-enterprise/client/views/livechatMonitors.js
@@ -0,0 +1,200 @@
+import { Meteor } from 'meteor/meteor';
+import { Template } from 'meteor/templating';
+import { ReactiveVar } from 'meteor/reactive-var';
+import { ReactiveDict } from 'meteor/reactive-dict';
+import _ from 'underscore';
+
+import { modal, call } from '../../../../../app/ui-utils';
+import { t, handleError, APIClient } from '../../../../../app/utils';
+import { hasLicense } from '../../../license/client';
+import './livechatMonitors.html';
+
+const licenseEnabled = new ReactiveVar(false);
+
+hasLicense('livechat-enterprise').then((enabled) => {
+	licenseEnabled.set(enabled);
+});
+
+const ITEMS_COUNT = 50;
+const DEBOUNCE_TIME_TO_SEARCH_IN_MS = 300;
+
+const getUsername = (user) => user.username;
+Template.livechatMonitors.helpers({
+	exceptionsMonitors() {
+		const { selectedMonitors, monitors } = Template.instance();
+		return monitors
+			.get()
+			.map(getUsername)
+			.concat(selectedMonitors.get().map(getUsername));
+	},
+	deleteLastMonitor() {
+		const i = Template.instance();
+		return () => {
+			const arr = i.selectedMonitors.curValue;
+			arr.pop();
+			i.selectedMonitors.set(arr);
+		};
+	},
+	isLoading() {
+		return Template.instance().state.get('loading');
+	},
+	monitors() {
+		return Template.instance().monitors.get();
+	},
+	emailAddress() {
+		if (this.emails && this.emails.length > 0) {
+			return this.emails[0].address;
+		}
+	},
+	monitorModifier() {
+		return (filter, text = '') => {
+			const f = filter.get();
+			return `@${
+				f.length === 0
+					? text
+					: text.replace(
+						new RegExp(filter.get()),
+						(part) => `<strong>${ part }</strong>`,
+					)
+			}`;
+		};
+	},
+	onSelectMonitors() {
+		return Template.instance().onSelectMonitors;
+	},
+	selectedMonitors() {
+		return Template.instance().selectedMonitors.get();
+	},
+	onClickTagMonitors() {
+		return Template.instance().onClickTagMonitors;
+	},
+	onTableScroll() {
+		const instance = Template.instance();
+		return function(currentTarget) {
+			if (currentTarget.offsetHeight + currentTarget.scrollTop < currentTarget.scrollHeight - 100) {
+				return;
+			}
+			const monitors = instance.monitors.get();
+			if (instance.total.get() > monitors.length) {
+				instance.offset.set(instance.offset.get() + ITEMS_COUNT);
+			}
+		};
+	},
+	hasLicense() {
+		return licenseEnabled.get();
+	},
+});
+
+Template.livechatMonitors.events({
+	'click .remove-monitor'(e, instance) {
+		e.preventDefault();
+
+		modal.open(
+			{
+				title: t('Are_you_sure'),
+				type: 'warning',
+				showCancelButton: true,
+				confirmButtonColor: '#DD6B55',
+				confirmButtonText: t('Yes'),
+				cancelButtonText: t('Cancel'),
+				closeOnConfirm: false,
+				html: false,
+			},
+			() => {
+				Meteor.call('livechat:removeMonitor', this.username, function(
+					error, /* , result*/
+				) {
+					if (error) {
+						return handleError(error);
+					}
+					instance.offset.set(0);
+					instance.loadMonitors(instance.filter.get(), instance.offset.get());
+					modal.open({
+						title: t('Removed'),
+						text: t('Monitor_removed'),
+						type: 'success',
+						timer: 1000,
+						showConfirmButton: false,
+					});
+				});
+			},
+		);
+	},
+
+	async 'submit #form-monitor'(e, instance) {
+		e.preventDefault();
+		const { selectedMonitors, state } = instance;
+
+		const users = selectedMonitors.get();
+
+		if (!users.length) {
+			return;
+		}
+
+		state.set('loading', true);
+		try {
+			await Promise.all(
+				users.map(({ username }) => call('livechat:addMonitor', username)),
+			);
+			selectedMonitors.set([]);
+		} finally {
+			state.set('loading', false);
+			instance.offset.set(0);
+			instance.loadMonitors(instance.filter.get(), instance.offset.get());
+		}
+	},
+	'keydown #monitor-filter'(e) {
+		if (e.which === 13) {
+			e.stopPropagation();
+			e.preventDefault();
+		}
+	},
+	'keyup #monitor-filter': _.debounce((e, t) => {
+		e.stopPropagation();
+		e.preventDefault();
+		t.filter.set(e.currentTarget.value);
+		t.offset.set(0);
+	}, DEBOUNCE_TIME_TO_SEARCH_IN_MS),
+});
+
+Template.livechatMonitors.onCreated(function() {
+	const instance = this;
+	this.offset = new ReactiveVar(0);
+	this.filter = new ReactiveVar('');
+	this.state = new ReactiveDict({
+		loading: false,
+	});
+	this.total = new ReactiveVar(0);
+	this.monitors = new ReactiveVar([]);
+	this.selectedMonitors = new ReactiveVar([]);
+
+	this.onSelectMonitors = ({ item: monitor }) => {
+		this.selectedMonitors.set([...this.selectedMonitors.curValue, monitor]);
+	};
+
+	this.onClickTagMonitors = ({ username }) => {
+		this.selectedMonitors.set(this.selectedMonitors.curValue.filter((user) => user.username !== username));
+	};
+
+	this.loadMonitors = _.debounce(async (filter, offset) => {
+		this.state.set('loading', true);
+		let url = `livechat/monitors.list?count=${ ITEMS_COUNT }&offset=${ offset }`;
+		if (filter) {
+			url += `&text=${ encodeURIComponent(filter) }`;
+		}
+		const { monitors, total } = await APIClient.v1.get(url);
+		this.total.set(total);
+		if (offset === 0) {
+			this.monitors.set(monitors);
+		} else {
+			this.monitors.set(this.monitors.get().concat(monitors));
+		}
+		this.state.set('loading', false);
+	}, DEBOUNCE_TIME_TO_SEARCH_IN_MS);
+
+	this.autorun(async () => {
+		const filter = instance.filter.get();
+		const offset = instance.offset.get();
+		return this.loadMonitors(filter, offset);
+	});
+});
diff --git a/ee/app/livechat-enterprise/client/views/livechatSideNavItems.js b/ee/app/livechat-enterprise/client/views/livechatSideNavItems.js
new file mode 100644
index 000000000000..3934b2347566
--- /dev/null
+++ b/ee/app/livechat-enterprise/client/views/livechatSideNavItems.js
@@ -0,0 +1,5 @@
+import { addSidebarItem } from '../../../../../app/livechat/client/views/sideNav/livechatSideNavItems';
+
+addSidebarItem('Monitors', 'livechat-monitors', 'manage-livechat-monitors');
+addSidebarItem('Units', 'livechat-units', 'manage-livechat-units');
+addSidebarItem('Tags', 'livechat-tags', 'manage-livechat-tags');
diff --git a/ee/app/livechat-enterprise/client/views/livechatTagForm.html b/ee/app/livechat-enterprise/client/views/livechatTagForm.html
new file mode 100644
index 000000000000..6e8e73838e09
--- /dev/null
+++ b/ee/app/livechat-enterprise/client/views/livechatTagForm.html
@@ -0,0 +1,77 @@
+<template name="livechatTagForm">
+	{{#if hasLicense}}
+		{{#requiresPermission 'manage-livechat-tags'}}
+			<form id="tag-form" data-id="{{tag._id}}">
+				<div class="rocket-form">
+					{{#if Template.subscriptionsReady}}
+						<fieldset>
+							<div class="input-line">
+								<label>{{_ "Name"}}</label>
+								<div>
+									<input type="text" class="rc-input__element" name="name" value="{{tag.name}}" placeholder="{{_ "Name"}}" />
+								</div>
+	        				</div>
+	            			<div class="input-line">
+	              				<label>{{_ "Description"}}</label>
+	              				<div>
+	                				<textarea name="description" class="rc-input__element" rows="6">{{tag.description}}</textarea>
+	              				</div>
+	            			</div>
+							<hr />
+						</fieldset>
+						<h2>{{_ "Departments"}}</h2>
+							<fieldset>
+								<legend>{{_ "Available_departments"}}</legend>
+
+								{{#if hasAvailableDepartments }}
+									<ul class="tag-departments available-departments">
+										{{#each availableDepartments}}
+											<li><i class="icon-plus-circled"></i>{{name}}</li>
+										{{/each}}
+									</ul>
+								{{else}}
+									{{_ "There_are_no_departments_available"}}
+								{{/if}}
+							</fieldset>
+
+							<fieldset>
+								<legend>{{_ "Selected_departments"}}</legend>
+
+								{{#if selectedDepartments}}
+									<div class="list">
+										<table>
+											<thead>
+												<tr>
+													<th width="75%">{{_ "Name"}}</th>
+													<th>&nbsp;</th>
+												</tr>
+											</thead>
+											<tbody>
+												{{#each selectedDepartments}}
+													<tr class="department-info">
+														<td>{{name}}</td>
+														<td><a href="#remove" class="remove-department"><i class="icon-trash"></i></a></td>
+													</tr>
+												{{/each}}
+											</tbody>
+										</table>
+									</div>
+								{{else}}
+									{{_ "There_are_no_departments_added_to_this_tag_yet"}}
+								{{/if}}
+
+							</fieldset>
+
+
+						<div class="rc-button__group">
+							<button class="rc-button back" type="button"><i class="icon-left-big"></i><span>{{_ "Back"}}</span></button>
+							<button class="rc-button rc-button--primary save"><i class="icon-floppy"></i><span>{{_ "Save"}}</span></button>
+						</div>
+					{{else}}
+						{{> loading}}
+					{{/if}}
+				</div>
+			</form>
+		{{/requiresPermission}}
+	{{/if}}
+</template>
diff --git a/ee/app/livechat-enterprise/client/views/livechatTagForm.js b/ee/app/livechat-enterprise/client/views/livechatTagForm.js
new file mode 100644
index 000000000000..094e9c1fa330
--- /dev/null
+++ b/ee/app/livechat-enterprise/client/views/livechatTagForm.js
@@ -0,0 +1,116 @@
+import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Template } from 'meteor/templating';
+import _ from 'underscore';
+import toastr from 'toastr';
+
+import { t, handleError, APIClient } from '../../../../../app/utils';
+import { hasLicense } from '../../../license/client';
+import './livechatTagForm.html';
+
+const licenseEnabled = new ReactiveVar(false);
+
+hasLicense('livechat-enterprise').then((enabled) => {
+	licenseEnabled.set(enabled);
+});
+
+const availableDepartments = () => {
+	const selected = Template.instance().selectedDepartments.get().map((dept) => dept._id);
+	const enabledDepartments = Template.instance().availableDepartments.get().filter((dept) => dept.enabled === true);
+	if (selected && selected.length) {
+		return enabledDepartments.filter((dept) => !selected.includes(dept._id));
+	}
+	return enabledDepartments;
+};
+
+Template.livechatTagForm.helpers({
+	tag() {
+		return Template.instance().tag.get();
+	},
+	departments() {
+		return Template.instance().tag && !_.isEmpty(Template.instance().tag.get()) ? Template.instance().tag.get().departments : [];
+	},
+	selectedDepartments() {
+		return _.sortBy(Template.instance().selectedDepartments.get(), 'name');
+	},
+	availableDepartments,
+	hasAvailableDepartments() {
+		return availableDepartments().length > 0;
+	},
+	hasLicense() {
+		return licenseEnabled.get();
+	},
+});
+
+Template.livechatTagForm.events({
+	'submit #tag-form'(e, instance) {
+		e.preventDefault();
+		const $btn = instance.$('button.save');
+
+		const _id = $(e.currentTarget).data('id');
+		const name = instance.$('input[name=name]').val();
+
+		if (name.trim() === '') {
+			return toastr.error(t('Please_fill_a_name'));
+		}
+
+		const description = instance.$('textarea[name=description]').val();
+
+		const oldBtnValue = $btn.html();
+		$btn.html(t('Saving'));
+
+		const tagData = {
+			name: name.trim(),
+			description: description.trim(),
+		};
+
+		const tagDepartments = _.pluck(Template.instance().selectedDepartments.get(), '_id');
+		Meteor.call('livechat:saveTag', _id, tagData, tagDepartments, function(error/* , result*/) {
+			$btn.html(oldBtnValue);
+			if (error) {
+				return handleError(error);
+			}
+
+			toastr.success(t('Saved'));
+			FlowRouter.go('livechat-tags');
+		});
+	},
+
+	'click button.back'(e/* , instance*/) {
+		e.preventDefault();
+		FlowRouter.go('livechat-tags');
+	},
+
+	'click .remove-department'(e, instance) {
+		e.preventDefault();
+
+		let selectedDepartments = instance.selectedDepartments.get();
+		selectedDepartments = _.reject(selectedDepartments, (department) => department._id === this._id);
+		instance.selectedDepartments.set(selectedDepartments);
+	},
+
+	'click .available-departments li'(e, instance) {
+		const selectedDepartments = instance.selectedDepartments.get();
+		selectedDepartments.push(this);
+		instance.selectedDepartments.set(selectedDepartments);
+	},
+});
+
+Template.livechatTagForm.onCreated(function() {
+	this.tag = new ReactiveVar(null);
+	this.selectedDepartments = new ReactiveVar([]);
+	this.availableDepartments = new ReactiveVar([]);
+
+	this.autorun(async () => {
+		const id = FlowRouter.getParam('_id');
+		const { departments } = await APIClient.v1.get('livechat/department');
+		this.availableDepartments.set(departments);
+		if (id) {
+			const tag = await APIClient.v1.get(`livechat/tags.getOne?tagId=${ id }`);
+			this.tag.set(tag);
+			const { departments: tagDepartments = [] } = tag;
+			this.selectedDepartments.set(departments.filter((dept) => tagDepartments.includes(dept._id)));
+		}
+	});
+});
diff --git a/ee/app/livechat-enterprise/client/views/livechatTags.html b/ee/app/livechat-enterprise/client/views/livechatTags.html
new file mode 100644
index 000000000000..d6bad7f41053
--- /dev/null
+++ b/ee/app/livechat-enterprise/client/views/livechatTags.html
@@ -0,0 +1,30 @@
+<template name="livechatTags">
+	{{#if hasLicense}}
+		{{#requiresPermission 'manage-livechat-tags'}}
+			<div class="rc-table-content">
+				{{#table fixed='true' onScroll=onTableScroll}}
+					<thead>
+						<tr>
+							<th><div class="table-fake-th">{{_ "Name"}}</div></th>
+							<th width="60%"><div class="table-fake-th">{{_ "Description"}}</div></th>
+							<th width='40px'><div class="table-fake-th">&nbsp;</div></th>
+						</tr>
+					</thead>
+					<tbody>
+						{{#each tags}}
+							<tr class="tag-info row-link" data-id="{{_id}}">
+								<td><div class="rc-table-wrapper">
+									<div class="rc-table-info"><span class="rc-table-title">{{name}}</span></div></div></td>
+								<td>{{description}}</td>
+								<td><a href="#remove" class="remove-tag"><i class="icon-trash"></i></a></td>
+							</tr>
+						{{/each}}
+					</tbody>
+				{{/table}}
+			</div>
+			<div class="rc-button__group">
+				<a href="{{pathFor 'livechat-tag-new'}}" class="rc-button rc-button--primary">{{_ "New_Tag"}}</a>
+			</div>
+		{{/requiresPermission}}
+	{{/if}}
+</template>
diff --git a/ee/app/livechat-enterprise/client/views/livechatTags.js b/ee/app/livechat-enterprise/client/views/livechatTags.js
new file mode 100644
index 000000000000..7d3920637e27
--- /dev/null
+++ b/ee/app/livechat-enterprise/client/views/livechatTags.js
@@ -0,0 +1,97 @@
+import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Template } from 'meteor/templating';
+
+import { modal } from '../../../../../app/ui-utils';
+import { t, handleError, APIClient } from '../../../../../app/utils';
+import { hasLicense } from '../../../license/client';
+import './livechatTags.html';
+
+const ITEMS_COUNT = 50;
+const licenseEnabled = new ReactiveVar(false);
+
+hasLicense('livechat-enterprise').then((enabled) => {
+	licenseEnabled.set(enabled);
+});
+
+Template.livechatTags.helpers({
+	tags() {
+		return Template.instance().tags.get();
+	},
+	onTableScroll() {
+		const instance = Template.instance();
+		return function(currentTarget) {
+			if (currentTarget.offsetHeight + currentTarget.scrollTop < currentTarget.scrollHeight - 100) {
+				return;
+			}
+			const tags = instance.tags.get();
+			if (instance.total.get() > tags.length) {
+				instance.offset.set(instance.offset.get() + ITEMS_COUNT);
+			}
+		};
+	},
+	hasLicense() {
+		return licenseEnabled.get();
+	},
+});
+
+Template.livechatTags.events({
+	'click .remove-tag'(e, instance) {
+		e.preventDefault();
+		e.stopPropagation();
+
+		modal.open({
+			title: t('Are_you_sure'),
+			type: 'warning',
+			showCancelButton: true,
+			confirmButtonColor: '#DD6B55',
+			confirmButtonText: t('Yes'),
+			cancelButtonText: t('Cancel'),
+			closeOnConfirm: false,
+			html: false,
+		}, () => {
+			Meteor.call('livechat:removeTag', this._id, function(error/* , result*/) {
+				if (error) {
+					return handleError(error);
+				}
+				instance.offset.set(0);
+				instance.loadTags(instance.offset.get());
+				modal.open({
+					title: t('Removed'),
+					text: t('Tag_removed'),
+					type: 'success',
+					timer: 1000,
+					showConfirmButton: false,
+				});
+			});
+		});
+	},
+
+	'click .tag-info'(e/* , instance*/) {
+		e.preventDefault();
+		FlowRouter.go('livechat-tag-edit', { _id: this._id });
+	},
+
+});
+
+Template.livechatTags.onCreated(function() {
+	this.tags = new ReactiveVar([]);
+	this.offset = new ReactiveVar(0);
+	this.total = new ReactiveVar(0);
+
+	this.loadTags = async (offset) => {
+		const { tags, total } = await APIClient.v1.get(`livechat/tags.list?count=${ ITEMS_COUNT }&offset=${ offset }`);
+		this.total.set(total);
+		if (offset === 0) {
+			this.tags.set(tags);
+		} else {
+			this.tags.set(this.tags.get().concat(tags));
+		}
+	};
+
+	this.autorun(async () => {
+		const offset = this.offset.get();
+		this.loadTags(offset);
+	});
+});
diff --git a/ee/app/livechat-enterprise/client/views/livechatUnitForm.html b/ee/app/livechat-enterprise/client/views/livechatUnitForm.html
new file mode 100644
index 000000000000..7127248005c5
--- /dev/null
+++ b/ee/app/livechat-enterprise/client/views/livechatUnitForm.html
@@ -0,0 +1,135 @@
+<template name="livechatUnitForm">
+	{{#if hasLicense}}
+		{{#requiresPermission 'manage-livechat-units'}}
+			<form id="unit-form" data-id="{{unit._id}}">
+				<div class="rocket-form">
+					{{#if Template.subscriptionsReady}}
+						<fieldset>
+							<div class="input-line">
+								<label>{{_ "Name"}}</label>
+								<div>
+									<input type="text" class="rc-input__element" name="name" value="{{unit.name}}" placeholder="{{_ "Name"}}" />
+								</div>
+							</div>
+							<div class="input-line">
+								<label>{{_ "Visibility"}}</label>
+								<div>
+									<label><input type="radio" name="visibility" value="public" checked="{{$eq unit.visibility 'public'}}" /> {{_ "Public"}}</label>
+									<label><input type="radio" name="visibility" value="private" checked="{{$eq unit.visibility 'private'}}" /> {{_ "Private"}}</label>
+								</div>
+							</div>
+							<hr />
+						</fieldset>
+						<h2>{{_ "Monitors"}}</h2>
+							<fieldset>
+								<label>{{_ "Add_monitor"}}</label>
+								<span>
+									{{> livechatAutocompleteUser
+										collection="UserAndRoom"
+										endpoint="users.autocomplete"
+										field="username"
+										sort='username'
+										label="Search_by_username"
+										placeholder="Search_by_username"
+										name="username"
+										exceptions=monitorAutocompleteExceptions
+										noMatchTemplate="userSearchEmpty"
+										templateItem="popupList_item_default"
+										icon="at"
+										modifier=monitorModifier
+										onSelect=onSelectMonitors
+										deleteLastItem=deleteLastMonitor
+										list=monitorsBeingSelected
+										onClickTag=onClickTagMonitors
+									}}
+									<button name="add" class="button secondary add-monitor">{{_ "Add"}}</button>
+								</span>
+							</fieldset>
+
+							<fieldset>
+								<legend>{{_ "Selected_monitors"}}</legend>
+
+								{{#if selectedMonitors}}
+									<div class="list">
+										<table>
+											<thead>
+												<tr>
+													<th width="75%"></th>
+													<th>&nbsp;</th>
+												</tr>
+											</thead>
+											<tbody>
+												{{#each selectedMonitors}}
+													<tr class="monitor-info">
+														<td>{{username}}</td>
+														<td><a href="#remove" class="remove-monitor"><i class="icon-trash"></i></a></td>
+													</tr>
+												{{/each}}
+											</tbody>
+										</table>
+									</div>
+								{{else}}
+									<tr>
+										<td colspan="2">{{_ "There_are_no_monitors_added_to_this_unit_yet"}}</td>
+									</tr>
+								{{/if}}
+								<hr />
+							</fieldset>
+
+						<h2>{{_ "Departments"}}</h2>
+
+							<fieldset>
+								<legend>{{_ "Available_departments"}}</legend>
+
+								{{#if hasAvailableDepartments }}
+									<ul class="unit-departments available-departments">
+										{{#each availableDepartments}}
+											<li><i class="icon-plus-circled"></i>{{name}}</li>
+										{{/each}}
+									</ul>
+								{{else}}
+									{{_ "There_are_no_departments_available"}}
+								{{/if}}
+							</fieldset>
+
+							<fieldset>
+								<legend>{{_ "Selected_departments"}}</legend>
+
+								{{#if selectedDepartments}}
+									<div class="list">
+										<table>
+											<thead>
+												<tr>
+													<th width="75%">{{_ "Name"}}</th>
+													<th>&nbsp;</th>
+												</tr>
+											</thead>
+											<tbody>
+												{{#each selectedDepartments}}
+													<tr class="department-info">
+														<td>{{name}}</td>
+														<td><a href="#remove" class="remove-department"><i class="icon-trash"></i></a></td>
+													</tr>
+												{{/each}}
+											</tbody>
+										</table>
+									</div>
+								{{else}}
+									{{_ "There_are_no_departments_added_to_this_unit_yet"}}
+								{{/if}}
+
+							</fieldset>
+
+
+						<div class="rc-button__group">
+							<button class="rc-button back" type="button"><i class="icon-left-big"></i><span>{{_ "Back"}}</span></button>
+							<button class="rc-button rc-button--primary save"><i class="icon-floppy"></i><span>{{_ "Save"}}</span></button>
+						</div>
+					{{else}}
+						{{> loading}}
+					{{/if}}
+				</div>
+			</form>
+		{{/requiresPermission}}
+	{{/if}}
+</template>
diff --git a/ee/app/livechat-enterprise/client/views/livechatUnitForm.js b/ee/app/livechat-enterprise/client/views/livechatUnitForm.js
new file mode 100644
index 000000000000..ca5e42d18b8a
--- /dev/null
+++ b/ee/app/livechat-enterprise/client/views/livechatUnitForm.js
@@ -0,0 +1,249 @@
+import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Template } from 'meteor/templating';
+import _ from 'underscore';
+import toastr from 'toastr';
+
+import { t, handleError, APIClient } from '../../../../../app/utils';
+import { hasLicense } from '../../../license/client';
+import './livechatUnitForm.html';
+
+const licenseEnabled = new ReactiveVar(false);
+
+hasLicense('livechat-enterprise').then((enabled) => {
+	licenseEnabled.set(enabled);
+});
+
+const availableDepartments = () => {
+	const unit = Template.instance().unit.get();
+	const selected = Template.instance().selectedDepartments.get().map((dept) => dept.departmentId);
+	const enabledDepartments = Template.instance().availableDepartments.get().filter((dept) => dept.enabled === true);
+	let availableDepartments = enabledDepartments;
+
+	if (selected && selected.length) {
+		availableDepartments = availableDepartments.filter((dept) => !selected.includes(dept._id));
+	}
+	if (unit && unit._id) {
+		availableDepartments = availableDepartments.filter((dept) => !dept.parentId || dept.parentId === unit._id);
+	} else {
+		availableDepartments = availableDepartments.filter((dept) => !dept.parentId);
+	}
+	return availableDepartments;
+};
+
+Template.livechatUnitForm.helpers({
+	unit() {
+		return Template.instance().unit.get();
+	},
+	monitors() {
+		return Template.instance().unit && !_.isEmpty(Template.instance().unit.get()) ? Template.instance().unit.get().monitors : [];
+	},
+	departments() {
+		return Template.instance().unit && !_.isEmpty(Template.instance().unit.get()) ? Template.instance().unit.get().departments : [];
+	},
+	selectedMonitors() {
+		return _.sortBy(Template.instance().selectedMonitors.get(), 'username');
+	},
+	monitorsBeingSelected() {
+		return _.sortBy(Template.instance().monitorsBeingSelected.get(), 'username');
+	},
+	selectedDepartments() {
+		return _.sortBy(Template.instance().selectedDepartments.get(), 'name');
+	},
+	availableDepartments,
+	hasAvailableDepartments() {
+		return availableDepartments().length > 0;
+	},
+	monitorAutocompleteExceptions() {
+		return _.pluck(Template.instance().selectedMonitors.get(), 'username').concat(_.pluck(Template.instance().monitorsBeingSelected.get(), 'username'));
+	},
+	monitorModifier() {
+		return (filter, text = '') => {
+			const f = filter.get();
+			return `@${
+				f.length === 0
+					? text
+					: text.replace(
+						new RegExp(filter.get()),
+						(part) => `<strong>${ part }</strong>`,
+					)
+			}`;
+		};
+	},
+	onSelectMonitors() {
+		return Template.instance().onSelectMonitors;
+	},
+	availableMonitors() {
+		return Template.instance().availableMonitors.get();
+	},
+	onClickTagMonitors() {
+		return Template.instance().onClickTagMonitors;
+	},
+	hasLicense() {
+		return licenseEnabled.get();
+	},
+});
+
+Template.livechatUnitForm.events({
+	'submit #unit-form'(e, instance) {
+		e.preventDefault();
+		const $btn = instance.$('button.save');
+
+		const _id = $(e.currentTarget).data('id');
+		const visibility = instance.$('input[name=visibility]:checked').val();
+		const name = instance.$('input[name=name]').val();
+
+		if (visibility !== 'private' && visibility !== 'public') {
+			return toastr.error(t('Please_select_visibility'));
+		}
+
+		if (name.trim() === '') {
+			return toastr.error(t('Please_fill_a_name'));
+		}
+
+		const oldBtnValue = $btn.html();
+		$btn.html(t('Saving'));
+
+		const unitData = {
+			visibility,
+			name: name.trim(),
+		};
+
+		const unitMonitors = [];
+
+		instance.selectedMonitors.get().forEach((monitor) => {
+			unitMonitors.push(monitor);
+		});
+
+		const unitDepartments = [];
+		instance.selectedDepartments.get().forEach((department) => {
+			unitDepartments.push(department);
+		});
+
+		Meteor.call('livechat:saveUnit', _id, unitData, unitMonitors, unitDepartments, function(error/* , result*/) {
+			$btn.html(oldBtnValue);
+			if (error) {
+				return handleError(error);
+			}
+
+			toastr.success(t('Saved'));
+			FlowRouter.go('livechat-units');
+		});
+	},
+
+	async 'click .add-monitor'(e, instance) {
+		e.preventDefault();
+
+		const monitors = instance.monitorsBeingSelected.curValue;
+		if (!monitors.length) {
+			return toastr.error(t('Please_fill_a_username'));
+		}
+
+		try {
+			const newMonitorList = [];
+			const selectedMonitors = instance.selectedMonitors.get();
+
+			for (const monitor of monitors) {
+				const monitorData = await APIClient.v1.get(`livechat/monitors.getOne?username=${monitor.username}`); //eslint-disable-line
+				if (!monitorData || !monitorData._id) {
+					toastr.error(t('The_selected_user_is_not_a_monitor'));
+					newMonitorList.push(monitor);
+					continue;
+				}
+
+				const monitorId = monitorData._id;
+
+				for (const oldMonitor of selectedMonitors) {
+					if (oldMonitor.monitorId === monitorId) {
+						toastr.error(t('This_monitor_was_already_selected'));
+						newMonitorList.push(monitor);
+						continue;
+					}
+				}
+
+				const newMonitor = _.clone(monitorData);
+				newMonitor.monitorId = monitorId;
+				delete newMonitor._id;
+				selectedMonitors.push(newMonitor);
+			}
+
+			instance.selectedMonitors.set(selectedMonitors);
+			instance.monitorsBeingSelected.set(newMonitorList);
+		} catch (e) {
+			console.error(e);
+			return toastr.error(t('Failed_to_add_monitor'));
+		}
+	},
+
+	'click button.back'(e/* , instance*/) {
+		e.preventDefault();
+		FlowRouter.go('livechat-units');
+	},
+
+	'click .remove-monitor'(e, instance) {
+		e.preventDefault();
+
+		let selectedMonitors = instance.selectedMonitors.get();
+		selectedMonitors = _.reject(selectedMonitors, (monitor) => monitor.monitorId === this.monitorId);
+		instance.selectedMonitors.set(selectedMonitors);
+	},
+
+	'click .remove-department'(e, instance) {
+		e.preventDefault();
+
+		let selectedDepartments = instance.selectedDepartments.get();
+		selectedDepartments = _.reject(selectedDepartments, (department) => department.departmentId === this.departmentId);
+		instance.selectedDepartments.set(selectedDepartments);
+	},
+
+	'click .available-departments li'(e, instance) {
+		const selectedDepartments = instance.selectedDepartments.get();
+		const department = _.clone(this);
+		department.departmentId = this._id;
+		delete department._id;
+		selectedDepartments.push(department);
+		instance.selectedDepartments.set(selectedDepartments);
+	},
+});
+
+Template.livechatUnitForm.onCreated(function() {
+	this.unit = new ReactiveVar({ enabled: true });
+	this.selectedMonitors = new ReactiveVar([]);
+	this.monitorsBeingSelected = new ReactiveVar([]);
+	this.selectedDepartments = new ReactiveVar([]);
+	this.availableDepartments = new ReactiveVar([]);
+
+	this.onSelectMonitors = ({ item: monitor }) => {
+		this.monitorsBeingSelected.set([...this.monitorsBeingSelected.curValue, monitor]);
+	};
+
+	this.onClickTagMonitors = ({ username }) => {
+		this.monitorsBeingSelected.set(this.monitorsBeingSelected.curValue.filter((user) => user.username !== username));
+	};
+
+	this.autorun(async () => {
+		const id = FlowRouter.getParam('_id');
+		const { departments } = await APIClient.v1.get('livechat/department');
+		this.availableDepartments.set(departments);
+		if (id) {
+			const unit = await APIClient.v1.get(`livechat/units.getOne?unitId=${ id }`);
+			this.unit.set(unit);
+			const { monitors } = await APIClient.v1.get(`livechat/unitMonitors.list?unitId=${ id }`);
+			const newSelectedDepartments = [];
+			const newSelectedMonitors = [];
+			monitors.filter((monitor) => monitor.unitId === unit._id).forEach((monitor) => {
+				newSelectedMonitors.push(monitor);
+			});
+			departments.filter((dept) => dept.parentId === unit._id).forEach((department) => {
+				const newDepartment = {
+					departmentId: department._id,
+					name: department.name,
+				};
+				newSelectedDepartments.push(newDepartment);
+			});
+			this.selectedMonitors.set(newSelectedMonitors);
+			this.selectedDepartments.set(newSelectedDepartments);
+		}
+	});
+});
diff --git a/ee/app/livechat-enterprise/client/views/livechatUnits.html b/ee/app/livechat-enterprise/client/views/livechatUnits.html
new file mode 100644
index 000000000000..5984f701b991
--- /dev/null
+++ b/ee/app/livechat-enterprise/client/views/livechatUnits.html
@@ -0,0 +1,30 @@
+<template name="livechatUnits">
+	{{#if hasLicense}}
+		{{#requiresPermission 'manage-livechat-units'}}
+			<div class="rc-table-content">
+				{{#table fixed='true' onScroll=onTableScroll}}
+					<thead>
+						<tr>
+							<th><div class="table-fake-th">{{_ "Name"}}</div></th>
+							<th width="30%"><div class="table-fake-th">{{_ "Visibility"}}</div></th>
+							<th width='40px'><div class="table-fake-th">&nbsp;</div></th>
+						</tr>
+					</thead>
+					<tbody>
+						{{#each units}}
+							<tr class="unit-info row-link" data-id="{{_id}}">
+								<td><div class="rc-table-wrapper">
+									<div class="rc-table-info"><span class="rc-table-title">{{name}}</span></div></div></td>
+								<td>{{visibility}}</td>
+								<td><a href="#remove" class="remove-unit"><i class="icon-trash"></i></a></td>
+							</tr>
+						{{/each}}
+					</tbody>
+				{{/table}}
+			</div>
+			<div class="rc-button__group">
+				<a href="{{pathFor 'livechat-unit-new'}}" class="rc-button rc-button--primary">{{_ "New_Unit"}}</a>
+			</div>
+		{{/requiresPermission}}
+	{{/if}}
+</template>
diff --git a/ee/app/livechat-enterprise/client/views/livechatUnits.js b/ee/app/livechat-enterprise/client/views/livechatUnits.js
new file mode 100644
index 000000000000..ba9f17344ff5
--- /dev/null
+++ b/ee/app/livechat-enterprise/client/views/livechatUnits.js
@@ -0,0 +1,96 @@
+import { Meteor } from 'meteor/meteor';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Template } from 'meteor/templating';
+import { ReactiveVar } from 'meteor/reactive-var';
+
+import { modal } from '../../../../../app/ui-utils';
+import { t, handleError, APIClient } from '../../../../../app/utils';
+import { hasLicense } from '../../../license/client';
+import './livechatUnits.html';
+
+const ITEMS_COUNT = 50;
+const licenseEnabled = new ReactiveVar(false);
+
+hasLicense('livechat-enterprise').then((enabled) => {
+	licenseEnabled.set(enabled);
+});
+
+Template.livechatUnits.helpers({
+	units() {
+		return Template.instance().units.get();
+	},
+	onTableScroll() {
+		const instance = Template.instance();
+		return function(currentTarget) {
+			if (currentTarget.offsetHeight + currentTarget.scrollTop < currentTarget.scrollHeight - 100) {
+				return;
+			}
+			const units = instance.units.get();
+			if (instance.total.get() > units.length) {
+				instance.offset.set(instance.offset.get() + ITEMS_COUNT);
+			}
+		};
+	},
+	hasLicense() {
+		return licenseEnabled.get();
+	},
+});
+
+Template.livechatUnits.events({
+	'click .remove-unit'(e, instance) {
+		e.preventDefault();
+		e.stopPropagation();
+
+		modal.open({
+			title: t('Are_you_sure'),
+			type: 'warning',
+			showCancelButton: true,
+			confirmButtonColor: '#DD6B55',
+			confirmButtonText: t('Yes'),
+			cancelButtonText: t('Cancel'),
+			closeOnConfirm: false,
+			html: false,
+		}, () => {
+			Meteor.call('livechat:removeUnit', this._id, function(error/* , result*/) {
+				if (error) {
+					return handleError(error);
+				}
+				instance.offset.set(0);
+				instance.loadUnits(instance.offset.get());
+				modal.open({
+					title: t('Removed'),
+					text: t('Unit_removed'),
+					type: 'success',
+					timer: 1000,
+					showConfirmButton: false,
+				});
+			});
+		});
+	},
+
+	'click .unit-info'(e/* , instance*/) {
+		e.preventDefault();
+		FlowRouter.go('livechat-unit-edit', { _id: this._id });
+	},
+});
+
+Template.livechatUnits.onCreated(function() {
+	this.units = new ReactiveVar([]);
+	this.offset = new ReactiveVar(0);
+	this.total = new ReactiveVar(0);
+
+	this.loadUnits = async (offset) => {
+		const { units, total } = await APIClient.v1.get(`livechat/units.list?count=${ ITEMS_COUNT }&offset=${ offset }`);
+		this.total.set(total);
+		if (offset === 0) {
+			this.units.set(units);
+		} else {
+			this.units.set(this.units.get().concat(units));
+		}
+	};
+
+	this.autorun(async () => {
+		const offset = this.offset.get();
+		this.loadUnits(offset);
+	});
+});
diff --git a/ee/app/livechat-enterprise/server/agentStatus.js b/ee/app/livechat-enterprise/server/agentStatus.js
new file mode 100644
index 000000000000..3f5774cb0faa
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/agentStatus.js
@@ -0,0 +1,15 @@
+import { UserPresenceMonitor } from 'meteor/konecty:user-presence';
+
+import { hasRole } from '../../../../app/authorization';
+import { checkWaitingQueue } from './lib/Helper';
+import { RoutingManager } from '../../../../app/livechat/server/lib/RoutingManager';
+
+UserPresenceMonitor.onSetUserStatus((user, status) => {
+	if (hasRole(user._id, 'livechat-agent') && status === 'online') {
+		if (!RoutingManager.getConfig().autoAssignAgent) {
+			return;
+		}
+
+		checkWaitingQueue();
+	}
+});
diff --git a/ee/app/livechat-enterprise/server/api/agents.js b/ee/app/livechat-enterprise/server/api/agents.js
new file mode 100644
index 000000000000..21f1986cb7d8
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/api/agents.js
@@ -0,0 +1,114 @@
+import { Match, check } from 'meteor/check';
+
+import { API } from '../../../../../app/api/server';
+import { hasPermission } from '../../../../../app/authorization/server';
+import { findAllAverageServiceTime, findAllServiceTime, findAvailableServiceTimeHistory } from '../../../../../app/livechat/server/lib/analytics/agents';
+
+API.v1.addRoute('livechat/analytics/agents/average-service-time', { authRequired: true }, {
+	get() {
+		if (!hasPermission(this.userId, 'view-livechat-manager')) {
+			return API.v1.unauthorized();
+		}
+		const { offset, count } = this.getPaginationItems();
+		let { start, end } = this.requestParams();
+
+		check(start, String);
+		check(end, String);
+
+		if (isNaN(Date.parse(start))) {
+			return API.v1.failure('The "start" query parameter must be a valid date.');
+		}
+		start = new Date(start);
+
+		if (isNaN(Date.parse(end))) {
+			return API.v1.failure('The "end" query parameter must be a valid date.');
+		}
+		end = new Date(end);
+
+		const { agents, total } = findAllAverageServiceTime({
+			start,
+			end,
+			options: { offset, count },
+		});
+		return API.v1.success({
+			agents,
+			count: agents.length,
+			offset,
+			total,
+		});
+	},
+});
+
+API.v1.addRoute('livechat/analytics/agents/total-service-time', { authRequired: true }, {
+	get() {
+		if (!hasPermission(this.userId, 'view-livechat-manager')) {
+			return API.v1.unauthorized();
+		}
+		const { offset, count } = this.getPaginationItems();
+		let { start, end } = this.requestParams();
+
+		check(start, String);
+		check(end, String);
+
+		if (isNaN(Date.parse(start))) {
+			return API.v1.failure('The "start" query parameter must be a valid date.');
+		}
+		start = new Date(start);
+
+		if (isNaN(Date.parse(end))) {
+			return API.v1.failure('The "end" query parameter must be a valid date.');
+		}
+		end = new Date(end);
+
+		const { agents, total } = findAllServiceTime({
+			start,
+			end,
+			options: { offset, count },
+		});
+		return API.v1.success({
+			agents,
+			count: agents.length,
+			offset,
+			total,
+		});
+	},
+});
+
+
+API.v1.addRoute('livechat/analytics/agents/available-for-service-history', { authRequired: true }, {
+	get() {
+		if (!hasPermission(this.userId, 'view-livechat-manager')) {
+			return API.v1.unauthorized();
+		}
+		const { offset, count } = this.getPaginationItems();
+		let { start, end } = this.requestParams();
+		const { fullReport } = this.requestParams();
+
+		check(start, String);
+		check(end, String);
+		check(fullReport, Match.Maybe(String));
+
+		if (isNaN(Date.parse(start))) {
+			return API.v1.failure('The "start" query parameter must be a valid date.');
+		}
+		start = new Date(start);
+
+		if (isNaN(Date.parse(end))) {
+			return API.v1.failure('The "end" query parameter must be a valid date.');
+		}
+		end = new Date(end);
+
+		const { agents, total } = findAvailableServiceTimeHistory({
+			start,
+			end,
+			fullReport: fullReport && fullReport === 'true',
+			options: { offset, count },
+		});
+		return API.v1.success({
+			agents,
+			count: agents.length,
+			offset,
+			total,
+		});
+	},
+});
diff --git a/ee/app/livechat-enterprise/server/api/departments.js b/ee/app/livechat-enterprise/server/api/departments.js
new file mode 100644
index 000000000000..e9a40f8119f9
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/api/departments.js
@@ -0,0 +1,320 @@
+import { Match, check } from 'meteor/check';
+
+import { API } from '../../../../../app/api/server';
+import { hasPermission } from '../../../../../app/authorization/server';
+import {
+	findAllRooms,
+	findAllAverageServiceTime,
+	findAllServiceTime,
+	findAllAverageWaitingTime,
+	findAllNumberOfTransferredRooms,
+	findAllNumberOfAbandonedRooms,
+	findPercentageOfAbandonedRooms,
+	findAllAverageOfChatDurationTime,
+} from '../../../../../app/livechat/server/lib/analytics/departments';
+
+API.v1.addRoute('livechat/analytics/departments/amount-of-chats', { authRequired: true }, {
+	get() {
+		if (!hasPermission(this.userId, 'view-livechat-manager')) {
+			return API.v1.unauthorized();
+		}
+		const { offset, count } = this.getPaginationItems();
+		let { start, end } = this.requestParams();
+		const { answered, departmentId } = this.requestParams();
+
+		check(start, String);
+		check(end, String);
+		check(answered, Match.Maybe(String));
+		check(departmentId, Match.Maybe(String));
+
+		if (isNaN(Date.parse(start))) {
+			return API.v1.failure('The "start" query parameter must be a valid date.');
+		}
+		start = new Date(start);
+
+		if (isNaN(Date.parse(end))) {
+			return API.v1.failure('The "end" query parameter must be a valid date.');
+		}
+		end = new Date(end);
+
+		const { departments, total } = findAllRooms({
+			start,
+			end,
+			answered: answered && answered === 'true',
+			departmentId,
+			options: { offset, count },
+		});
+		return API.v1.success({
+			departments,
+			count: departments.length,
+			offset,
+			total,
+		});
+	},
+});
+
+API.v1.addRoute('livechat/analytics/departments/average-service-time', { authRequired: true }, {
+	get() {
+		if (!hasPermission(this.userId, 'view-livechat-manager')) {
+			return API.v1.unauthorized();
+		}
+		const { offset, count } = this.getPaginationItems();
+		let { start, end } = this.requestParams();
+		const { departmentId } = this.requestParams();
+
+		check(start, String);
+		check(end, String);
+		check(departmentId, Match.Maybe(String));
+
+		if (isNaN(Date.parse(start))) {
+			return API.v1.failure('The "start" query parameter must be a valid date.');
+		}
+		start = new Date(start);
+
+		if (isNaN(Date.parse(end))) {
+			return API.v1.failure('The "end" query parameter must be a valid date.');
+		}
+		end = new Date(end);
+
+		const { departments, total } = findAllAverageServiceTime({
+			start,
+			end,
+			departmentId,
+			options: { offset, count },
+		});
+		return API.v1.success({
+			departments,
+			count: departments.length,
+			offset,
+			total,
+		});
+	},
+});
+
+API.v1.addRoute('livechat/analytics/departments/average-chat-duration-time', { authRequired: true }, {
+	get() {
+		if (!hasPermission(this.userId, 'view-livechat-manager')) {
+			return API.v1.unauthorized();
+		}
+		const { offset, count } = this.getPaginationItems();
+		let { start, end } = this.requestParams();
+		const { departmentId } = this.requestParams();
+
+		check(start, String);
+		check(end, String);
+		check(departmentId, Match.Maybe(String));
+
+		if (isNaN(Date.parse(start))) {
+			return API.v1.failure('The "start" query parameter must be a valid date.');
+		}
+		start = new Date(start);
+
+		if (isNaN(Date.parse(end))) {
+			return API.v1.failure('The "end" query parameter must be a valid date.');
+		}
+		end = new Date(end);
+
+		const { departments, total } = findAllAverageOfChatDurationTime({
+			start,
+			end,
+			departmentId,
+			options: { offset, count },
+		});
+		return API.v1.success({
+			departments,
+			count: departments.length,
+			offset,
+			total,
+		});
+	},
+});
+
+API.v1.addRoute('livechat/analytics/departments/total-service-time', { authRequired: true }, {
+	get() {
+		if (!hasPermission(this.userId, 'view-livechat-manager')) {
+			return API.v1.unauthorized();
+		}
+		const { offset, count } = this.getPaginationItems();
+		let { start, end } = this.requestParams();
+		const { departmentId } = this.requestParams();
+
+		check(start, String);
+		check(end, String);
+		check(departmentId, Match.Maybe(String));
+
+		if (isNaN(Date.parse(start))) {
+			return API.v1.failure('The "start" query parameter must be a valid date.');
+		}
+		start = new Date(start);
+
+		if (isNaN(Date.parse(end))) {
+			return API.v1.failure('The "end" query parameter must be a valid date.');
+		}
+		end = new Date(end);
+
+		const { departments, total } = findAllServiceTime({
+			start,
+			end,
+			departmentId,
+			options: { offset, count },
+		});
+		return API.v1.success({
+			departments,
+			count: departments.length,
+			offset,
+			total,
+		});
+	},
+});
+
+API.v1.addRoute('livechat/analytics/departments/average-waiting-time', { authRequired: true }, {
+	get() {
+		if (!hasPermission(this.userId, 'view-livechat-manager')) {
+			return API.v1.unauthorized();
+		}
+		const { offset, count } = this.getPaginationItems();
+		let { start, end } = this.requestParams();
+		const { departmentId } = this.requestParams();
+
+		check(start, String);
+		check(end, String);
+		check(departmentId, Match.Maybe(String));
+
+		if (isNaN(Date.parse(start))) {
+			return API.v1.failure('The "start" query parameter must be a valid date.');
+		}
+		start = new Date(start);
+
+		if (isNaN(Date.parse(end))) {
+			return API.v1.failure('The "end" query parameter must be a valid date.');
+		}
+		end = new Date(end);
+
+		const { departments, total } = findAllAverageWaitingTime({
+			start,
+			end,
+			departmentId,
+			options: { offset, count },
+		});
+		return API.v1.success({
+			departments,
+			count: departments.length,
+			offset,
+			total,
+		});
+	},
+});
+
+API.v1.addRoute('livechat/analytics/departments/total-transferred-chats', { authRequired: true }, {
+	get() {
+		if (!hasPermission(this.userId, 'view-livechat-manager')) {
+			return API.v1.unauthorized();
+		}
+		const { offset, count } = this.getPaginationItems();
+		let { start, end } = this.requestParams();
+		const { departmentId } = this.requestParams();
+
+		check(start, String);
+		check(end, String);
+		check(departmentId, Match.Maybe(String));
+
+		if (isNaN(Date.parse(start))) {
+			return API.v1.failure('The "start" query parameter must be a valid date.');
+		}
+		start = new Date(start);
+
+		if (isNaN(Date.parse(end))) {
+			return API.v1.failure('The "end" query parameter must be a valid date.');
+		}
+		end = new Date(end);
+
+		const { departments, total } = findAllNumberOfTransferredRooms({
+			start,
+			end,
+			departmentId,
+			options: { offset, count },
+		});
+		return API.v1.success({
+			departments,
+			count: departments.length,
+			offset,
+			total,
+		});
+	},
+});
+
+API.v1.addRoute('livechat/analytics/departments/total-abandoned-chats', { authRequired: true }, {
+	get() {
+		if (!hasPermission(this.userId, 'view-livechat-manager')) {
+			return API.v1.unauthorized();
+		}
+		const { offset, count } = this.getPaginationItems();
+		let { start, end } = this.requestParams();
+		const { departmentId } = this.requestParams();
+
+		check(start, String);
+		check(end, String);
+		check(departmentId, Match.Maybe(String));
+
+		if (isNaN(Date.parse(start))) {
+			return API.v1.failure('The "start" query parameter must be a valid date.');
+		}
+		start = new Date(start);
+
+		if (isNaN(Date.parse(end))) {
+			return API.v1.failure('The "end" query parameter must be a valid date.');
+		}
+		end = new Date(end);
+
+		const { departments, total } = findAllNumberOfAbandonedRooms({
+			start,
+			end,
+			departmentId,
+			options: { offset, count },
+		});
+		return API.v1.success({
+			departments,
+			count: departments.length,
+			offset,
+			total,
+		});
+	},
+});
+
+API.v1.addRoute('livechat/analytics/departments/percentage-abandoned-chats', { authRequired: true }, {
+	get() {
+		if (!hasPermission(this.userId, 'view-livechat-manager')) {
+			return API.v1.unauthorized();
+		}
+		const { offset, count } = this.getPaginationItems();
+		let { start, end } = this.requestParams();
+		const { departmentId } = this.requestParams();
+
+		check(start, String);
+		check(end, String);
+		check(departmentId, Match.Maybe(String));
+
+		if (isNaN(Date.parse(start))) {
+			return API.v1.failure('The "start" query parameter must be a valid date.');
+		}
+		start = new Date(start);
+
+		if (isNaN(Date.parse(end))) {
+			return API.v1.failure('The "end" query parameter must be a valid date.');
+		}
+		end = new Date(end);
+
+		const { departments, total } = findPercentageOfAbandonedRooms({
+			start,
+			end,
+			departmentId,
+			options: { offset, count },
+		});
+		return API.v1.success({
+			departments,
+			count: departments.length,
+			offset,
+			total,
+		});
+	},
+});
diff --git a/ee/app/livechat-enterprise/server/api/index.js b/ee/app/livechat-enterprise/server/api/index.js
new file mode 100644
index 000000000000..6f107fc466de
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/api/index.js
@@ -0,0 +1,5 @@
+import './agents';
+import './departments';
+import './monitors';
+import './tags';
+import './units';
diff --git a/ee/app/livechat-enterprise/server/api/lib/monitors.js b/ee/app/livechat-enterprise/server/api/lib/monitors.js
new file mode 100644
index 000000000000..24a98423879b
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/api/lib/monitors.js
@@ -0,0 +1,62 @@
+import s from 'underscore.string';
+
+import { hasPermissionAsync } from '../../../../../../app/authorization/server/functions/hasPermission';
+import { Users } from '../../../../../../app/models/server/raw';
+
+export async function findMonitors({ userId, text, pagination: { offset, count, sort } }) {
+	if (!await hasPermissionAsync(userId, 'manage-livechat-monitors')) {
+		throw new Error('error-not-authorized');
+	}
+	const query = {};
+	if (text) {
+		const filterReg = new RegExp(s.escapeRegExp(text), 'i');
+		Object.assign(query, { $or: [{ username: filterReg }, { name: filterReg }, { 'emails.address': filterReg }] });
+	}
+
+	const cursor = Users.findUsersInRolesWithQuery('livechat-monitor', query, {
+		sort: sort || { name: 1 },
+		skip: offset,
+		limit: count,
+		fields: {
+			username: 1,
+			name: 1,
+			status: 1,
+			statusLivechat: 1,
+			emails: 1,
+			livechat: 1,
+		},
+	});
+
+	const total = await cursor.count();
+
+	const monitors = await cursor.toArray();
+
+	return {
+		monitors,
+		count: monitors.length,
+		offset,
+		total,
+	};
+}
+
+export async function findMonitorByUsername({ userId, username }) {
+	if (!await hasPermissionAsync(userId, 'manage-livechat-monitors')) {
+		throw new Error('error-not-authorized');
+	}
+	const user = await Users.findOne({ username }, {
+		fields: {
+			username: 1,
+			name: 1,
+			status: 1,
+			statusLivechat: 1,
+			emails: 1,
+			livechat: 1,
+		},
+	});
+
+	if (!user || !await Users.isUserInRole(user._id, 'livechat-monitor')) {
+		throw new Error('invalid-user');
+	}
+
+	return user;
+}
diff --git a/ee/app/livechat-enterprise/server/api/lib/tags.js b/ee/app/livechat-enterprise/server/api/lib/tags.js
new file mode 100644
index 000000000000..c3f126fcbc7f
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/api/lib/tags.js
@@ -0,0 +1,31 @@
+import { hasPermissionAsync } from '../../../../../../app/authorization/server/functions/hasPermission';
+import LivechatTag from '../../../../models/server/raw/LivechatTag';
+
+export async function findTags({ userId, pagination: { offset, count, sort } }) {
+	if (!await hasPermissionAsync(userId, 'manage-livechat-tags')) {
+		throw new Error('error-not-authorized');
+	}
+	const cursor = LivechatTag.find({}, {
+		sort: sort || { name: 1 },
+		skip: offset,
+		limit: count,
+	});
+
+	const total = await cursor.count();
+
+	const tags = await cursor.toArray();
+
+	return {
+		tags,
+		count: tags.length,
+		offset,
+		total,
+	};
+}
+
+export async function findTagById({ userId, tagId }) {
+	if (!await hasPermissionAsync(userId, 'manage-livechat-tags')) {
+		throw new Error('error-not-authorized');
+	}
+	return LivechatTag.findOneById(tagId);
+}
diff --git a/ee/app/livechat-enterprise/server/api/lib/units.js b/ee/app/livechat-enterprise/server/api/lib/units.js
new file mode 100644
index 000000000000..f8714bb9156b
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/api/lib/units.js
@@ -0,0 +1,43 @@
+import { hasPermissionAsync } from '../../../../../../app/authorization/server/functions/hasPermission';
+import LivechatUnit from '../../../../models/server/models/LivechatUnit';
+import LivechatUnitMonitors from '../../../../models/server/models/LivechatUnitMonitors';
+
+export async function findUnits({ userId, pagination: { offset, count, sort } }) {
+	if (!await hasPermissionAsync(userId, 'manage-livechat-units')) {
+		throw new Error('error-not-authorized');
+	}
+	const cursor = LivechatUnit.find({}, {
+		sort: sort || { name: 1 },
+		skip: offset,
+		limit: count,
+	});
+
+	const total = cursor.count();
+
+	const units = cursor.fetch();
+
+	return {
+		units,
+		count: units.length,
+		offset,
+		total,
+	};
+}
+
+export async function findUnitMonitors({ userId, unitId }) {
+	if (!await hasPermissionAsync(userId, 'manage-livechat-monitors')) {
+		throw new Error('error-not-authorized');
+	}
+	const monitors = LivechatUnitMonitors.find({ unitId }).fetch();
+
+	return {
+		monitors,
+	};
+}
+
+export async function findUnitById({ userId, unitId }) {
+	if (!await hasPermissionAsync(userId, 'manage-livechat-units')) {
+		throw new Error('error-not-authorized');
+	}
+	return LivechatUnit.findOneById(unitId);
+}
diff --git a/ee/app/livechat-enterprise/server/api/monitors.js b/ee/app/livechat-enterprise/server/api/monitors.js
new file mode 100644
index 000000000000..57a06a0a8081
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/api/monitors.js
@@ -0,0 +1,31 @@
+import { API } from '../../../../../app/api/server';
+import { findMonitors, findMonitorByUsername } from './lib/monitors';
+
+API.v1.addRoute('livechat/monitors.list', { authRequired: true }, {
+	get() {
+		const { offset, count } = this.getPaginationItems();
+		const { sort } = this.parseJsonQuery();
+		const { text } = this.queryParams;
+
+		return API.v1.success(Promise.await(findMonitors({
+			userId: this.userId,
+			text,
+			pagination: {
+				offset,
+				count,
+				sort,
+			},
+		})));
+	},
+});
+
+API.v1.addRoute('livechat/monitors.getOne', { authRequired: true }, {
+	get() {
+		const { username } = this.queryParams;
+
+		return API.v1.success(Promise.await(findMonitorByUsername({
+			userId: this.userId,
+			username,
+		})));
+	},
+});
diff --git a/ee/app/livechat-enterprise/server/api/tags.js b/ee/app/livechat-enterprise/server/api/tags.js
new file mode 100644
index 000000000000..ff1abe1cd84d
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/api/tags.js
@@ -0,0 +1,29 @@
+import { API } from '../../../../../app/api/server';
+import { findTags, findTagById } from './lib/tags';
+
+API.v1.addRoute('livechat/tags.list', { authRequired: true }, {
+	get() {
+		const { offset, count } = this.getPaginationItems();
+		const { sort } = this.parseJsonQuery();
+
+		return API.v1.success(Promise.await(findTags({
+			userId: this.userId,
+			pagination: {
+				offset,
+				count,
+				sort,
+			},
+		})));
+	},
+});
+
+API.v1.addRoute('livechat/tags.getOne', { authRequired: true }, {
+	get() {
+		const { tagId } = this.queryParams;
+
+		return API.v1.success(Promise.await(findTagById({
+			userId: this.userId,
+			tagId,
+		})));
+	},
+});
diff --git a/ee/app/livechat-enterprise/server/api/units.js b/ee/app/livechat-enterprise/server/api/units.js
new file mode 100644
index 000000000000..fc5a3219f5a9
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/api/units.js
@@ -0,0 +1,40 @@
+import { API } from '../../../../../app/api/server';
+import { findUnits, findUnitById, findUnitMonitors } from './lib/units';
+
+API.v1.addRoute('livechat/units.list', { authRequired: true }, {
+	get() {
+		const { offset, count } = this.getPaginationItems();
+		const { sort } = this.parseJsonQuery();
+
+		return API.v1.success(Promise.await(findUnits({
+			userId: this.userId,
+			pagination: {
+				offset,
+				count,
+				sort,
+			},
+		})));
+	},
+});
+
+API.v1.addRoute('livechat/units.getOne', { authRequired: true }, {
+	get() {
+		const { unitId } = this.queryParams;
+
+		return API.v1.success(Promise.await(findUnitById({
+			userId: this.userId,
+			unitId,
+		})));
+	},
+});
+
+API.v1.addRoute('livechat/unitMonitors.list', { authRequired: true }, {
+	get() {
+		const { unitId } = this.queryParams;
+
+		return API.v1.success(Promise.await(findUnitMonitors({
+			userId: this.userId,
+			unitId,
+		})));
+	},
+});
diff --git a/ee/app/livechat-enterprise/server/hooks/addDepartmentAncestors.js b/ee/app/livechat-enterprise/server/hooks/addDepartmentAncestors.js
new file mode 100644
index 000000000000..2d6c21871729
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/hooks/addDepartmentAncestors.js
@@ -0,0 +1,20 @@
+import { callbacks } from '../../../../../app/callbacks';
+import LivechatRooms from '../../../../../app/models/server/models/LivechatRooms';
+import LivechatDepartment from '../../../../../app/models/server/models/LivechatDepartment';
+
+callbacks.add('livechat.newRoom', (room) => {
+	if (!room.departmentId) {
+		return room;
+	}
+
+	const department = LivechatDepartment.findOneById(room.departmentId, { fields: { ancestors: 1 } });
+	if (!department || !department.ancestors) {
+		return room;
+	}
+
+	const { ancestors } = department;
+	LivechatRooms.updateDepartmentAncestorsById(room._id, ancestors);
+
+
+	return room;
+}, callbacks.priority.MEDIUM, 'livechat-add-department-ancestors');
diff --git a/ee/app/livechat-enterprise/server/hooks/afterTakeInquiry.js b/ee/app/livechat-enterprise/server/hooks/afterTakeInquiry.js
new file mode 100644
index 000000000000..177c78159b43
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/hooks/afterTakeInquiry.js
@@ -0,0 +1,19 @@
+import { callbacks } from '../../../../../app/callbacks';
+import { settings } from '../../../../../app/settings';
+import { checkWaitingQueue, dispatchWaitingQueueStatus } from '../lib/Helper';
+
+callbacks.add('livechat.afterTakeInquiry', async (inquiry) => {
+	if (!settings.get('Livechat_waiting_queue')) {
+		return inquiry;
+	}
+
+	if (!inquiry) {
+		return null;
+	}
+
+	const { department } = inquiry;
+	await dispatchWaitingQueueStatus(department);
+	await checkWaitingQueue(department);
+
+	return inquiry;
+}, callbacks.priority.MEDIUM, 'livechat-after-take-inquiry');
diff --git a/ee/app/livechat-enterprise/server/hooks/beforeListTags.js b/ee/app/livechat-enterprise/server/hooks/beforeListTags.js
new file mode 100644
index 000000000000..a4bb50b447ff
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/hooks/beforeListTags.js
@@ -0,0 +1,6 @@
+import { callbacks } from '../../../../../app/callbacks';
+import LivechatTag from '../../../models/server/models/LivechatTag';
+
+callbacks.add('livechat.beforeListTags', () =>
+	LivechatTag.find({}, { fields: { name: 1, departments: 1 } }).fetch(),
+callbacks.priority.LOW, 'livechat-before-list-tags');
diff --git a/ee/app/livechat-enterprise/server/hooks/beforeRoutingChat.js b/ee/app/livechat-enterprise/server/hooks/beforeRoutingChat.js
new file mode 100644
index 000000000000..aec059e67649
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/hooks/beforeRoutingChat.js
@@ -0,0 +1,31 @@
+import { callbacks } from '../../../../../app/callbacks';
+import { settings } from '../../../../../app/settings';
+import { LivechatInquiry } from '../../../../../app/models/server';
+import { dispatchInquiryPosition, checkWaitingQueue } from '../lib/Helper';
+
+callbacks.add('livechat.beforeRouteChat', async (inquiry) => {
+	if (!settings.get('Livechat_waiting_queue')) {
+		return inquiry;
+	}
+
+	if (!inquiry) {
+		return inquiry;
+	}
+
+	const { _id, status, department } = inquiry;
+
+	if (status !== 'ready') {
+		return inquiry;
+	}
+
+	LivechatInquiry.queueInquiry(_id);
+
+	const [inq] = await LivechatInquiry.getCurrentSortedQueueAsync({ _id });
+	if (inq) {
+		dispatchInquiryPosition(inq);
+	}
+
+	checkWaitingQueue(department);
+
+	return LivechatInquiry.findOneById(_id);
+}, callbacks.priority.HIGH, 'livechat-before-routing-chat');
diff --git a/ee/app/livechat-enterprise/server/hooks/checkAgentBeforeTakeInquiry.js b/ee/app/livechat-enterprise/server/hooks/checkAgentBeforeTakeInquiry.js
new file mode 100644
index 000000000000..4cbdd304f043
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/hooks/checkAgentBeforeTakeInquiry.js
@@ -0,0 +1,43 @@
+import { Meteor } from 'meteor/meteor';
+
+import { callbacks } from '../../../../../app/callbacks';
+import { Users } from '../../../../../app/models/server/raw';
+import { settings } from '../../../../../app/settings';
+import { allowAgentSkipQueue, getMaxNumberSimultaneousChat } from '../lib/Helper';
+import { RoutingManager } from '../../../../../app/livechat/server/lib/RoutingManager';
+
+callbacks.add('livechat.checkAgentBeforeTakeInquiry', async (agent, inquiry) => {
+	if (!settings.get('Livechat_waiting_queue')) {
+		return agent;
+	}
+
+	if (!inquiry || !agent) {
+		return null;
+	}
+
+	if (allowAgentSkipQueue(agent)) {
+		return agent;
+	}
+
+	const { department: departmentId } = inquiry;
+	const { agentId } = agent;
+
+	const maxNumberSimultaneousChat = getMaxNumberSimultaneousChat({ agentId, departmentId });
+	if (maxNumberSimultaneousChat === 0) {
+		return agent;
+	}
+
+	const user = await Users.getAgentAndAmountOngoingChats(agentId);
+	if (!user) {
+		return null;
+	}
+
+	const { queueInfo: { chats = 0 } = {} } = user;
+	if (maxNumberSimultaneousChat <= chats) {
+		if (!RoutingManager.getConfig().autoAssignAgent) {
+			throw new Meteor.Error('error-max-number-simultaneous-chats-reached', 'Not allowed');
+		}
+		return null;
+	}
+	return agent;
+}, callbacks.priority.MEDIUM, 'livechat-before-take-inquiry');
diff --git a/ee/app/livechat-enterprise/server/hooks/onCloseLivechat.js b/ee/app/livechat-enterprise/server/hooks/onCloseLivechat.js
new file mode 100644
index 000000000000..17fde85ca367
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/hooks/onCloseLivechat.js
@@ -0,0 +1,22 @@
+import { callbacks } from '../../../../../app/callbacks';
+import { settings } from '../../../../../app/settings';
+import { checkWaitingQueue, dispatchWaitingQueueStatus } from '../lib/Helper';
+import { RoutingManager } from '../../../../../app/livechat/server/lib/RoutingManager';
+
+const onCloseLivechat = (room) => {
+	if (!settings.get('Livechat_waiting_queue')) {
+		return room;
+	}
+
+	const { departmentId } = room || {};
+	if (!RoutingManager.getConfig().autoAssignAgent) {
+		dispatchWaitingQueueStatus(departmentId);
+		return room;
+	}
+
+	checkWaitingQueue(departmentId);
+
+	return room;
+};
+
+callbacks.add('livechat.closeRoom', onCloseLivechat, callbacks.priority.HIGH, 'livechat-waiting-queue-monitor-close-room');
diff --git a/ee/app/livechat-enterprise/server/hooks/onLoadConfigApi.js b/ee/app/livechat-enterprise/server/hooks/onLoadConfigApi.js
new file mode 100644
index 000000000000..b05a0a2b5a6b
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/hooks/onLoadConfigApi.js
@@ -0,0 +1,35 @@
+import { callbacks } from '../../../../../app/callbacks';
+import { settings } from '../../../../../app/settings';
+import { LivechatInquiry } from '../../../../../app/models/server';
+import { normalizeQueueInfo } from '../lib/Helper';
+
+callbacks.add('livechat.onLoadConfigApi', async (room) => {
+	if (!room) {
+		return null;
+	}
+
+	if (!settings.get('Livechat_waiting_queue')) {
+		return null;
+	}
+
+	const { _id: rid } = room;
+	const inquiry = LivechatInquiry.findOneByRoomId(rid);
+	if (!inquiry) {
+		return null;
+	}
+
+	const { _id, status } = inquiry;
+	if (status !== 'queued') {
+		return null;
+	}
+
+	const [inq] = await LivechatInquiry.getCurrentSortedQueueAsync({ _id });
+
+	let queueInfo;
+	if (inq) {
+		const { position, department } = inq;
+		queueInfo = await normalizeQueueInfo({ position, department });
+	}
+
+	return { queueInfo };
+}, callbacks.priority.MEDIUM, 'livechat-on-load-config-api');
diff --git a/ee/app/livechat-enterprise/server/hooks/onSetUserStatusLivechat.js b/ee/app/livechat-enterprise/server/hooks/onSetUserStatusLivechat.js
new file mode 100644
index 000000000000..ade5eacdff2e
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/hooks/onSetUserStatusLivechat.js
@@ -0,0 +1,30 @@
+import { Match, check } from 'meteor/check';
+
+import { callbacks } from '../../../../../app/callbacks';
+import { settings } from '../../../../../app/settings';
+import { checkWaitingQueue } from '../lib/Helper';
+import { RoutingManager } from '../../../../../app/livechat/server/lib/RoutingManager';
+
+callbacks.add('livechat.setUserStatusLivechat', (user) => {
+	check(user, Match.ObjectIncluding({
+		userId: String,
+		status: String,
+	}));
+
+	const { status } = user;
+	if (status !== 'available') {
+		return user;
+	}
+
+	if (!settings.get('Livechat_waiting_queue')) {
+		return user;
+	}
+
+	if (!RoutingManager.getConfig().autoAssignAgent) {
+		return user;
+	}
+
+	checkWaitingQueue();
+
+	return user;
+}, callbacks.priority.MEDIUM, 'livechat-set-user-status');
diff --git a/ee/app/livechat-enterprise/server/index.js b/ee/app/livechat-enterprise/server/index.js
new file mode 100644
index 000000000000..1736a7ca38ad
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/index.js
@@ -0,0 +1,41 @@
+import { Meteor } from 'meteor/meteor';
+
+import './hooks/addDepartmentAncestors';
+import './hooks/beforeListTags';
+import './methods/addMonitor';
+import './methods/getUnitsFromUserRoles';
+import './methods/removeMonitor';
+import './methods/removeTag';
+import './methods/saveTag';
+import './methods/removeUnit';
+import './methods/saveUnit';
+import LivechatUnit from '../../models/server/models/LivechatUnit';
+import LivechatTag from '../../models/server/models/LivechatTag';
+import LivechatUnitMonitors from '../../models/server/models/LivechatUnitMonitors';
+import './agentStatus';
+import './startup';
+import './hooks/afterTakeInquiry';
+import './hooks/beforeRoutingChat';
+import './hooks/checkAgentBeforeTakeInquiry';
+import './hooks/onLoadConfigApi';
+import './hooks/onSetUserStatusLivechat';
+import './hooks/onCloseLivechat';
+import './lib/routing/LoadBalancing';
+import { onLicense } from '../../license/server';
+
+onLicense('livechat-enterprise', () => {
+	require('./api');
+	const { createPermissions } = require('./permissions');
+	const { createSettings } = require('./settings');
+
+	Meteor.startup(function() {
+		createSettings();
+		createPermissions();
+	});
+});
+
+export {
+	LivechatUnit,
+	LivechatTag,
+	LivechatUnitMonitors,
+};
diff --git a/ee/app/livechat-enterprise/server/lib/Helper.js b/ee/app/livechat-enterprise/server/lib/Helper.js
new file mode 100644
index 000000000000..e13dc640baed
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/lib/Helper.js
@@ -0,0 +1,139 @@
+import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
+
+import { hasRole } from '../../../../../app/authorization';
+import { LivechatDepartment, Users, LivechatInquiry } from '../../../../../app/models/server';
+import { Rooms as RoomRaw } from '../../../../../app/models/server/raw';
+import { settings } from '../../../../../app/settings';
+import { Livechat } from '../../../../../app/livechat/server/lib/Livechat';
+import { RoutingManager } from '../../../../../app/livechat/server/lib/RoutingManager';
+import { dispatchAgentDelegated } from '../../../../../app/livechat/server/lib/Helper';
+
+export const getMaxNumberSimultaneousChat = ({ agentId, departmentId }) => {
+	if (agentId) {
+		const user = Users.getAgentInfo(agentId);
+		const { livechat: { maxNumberSimultaneousChat } = {} } = user || {};
+		if (maxNumberSimultaneousChat > 0) {
+			return maxNumberSimultaneousChat;
+		}
+	}
+
+	if (departmentId) {
+		const department = LivechatDepartment.findOneById(departmentId);
+		const { maxNumberSimultaneousChat } = department || {};
+		if (maxNumberSimultaneousChat > 0) {
+			return maxNumberSimultaneousChat;
+		}
+	}
+
+	return settings.get('Livechat_maximum_chats_per_agent');
+};
+
+const getWaitingQueueMessage = (departmentId) => {
+	const department = departmentId && LivechatDepartment.findOneById(departmentId);
+	if (department && department.waitingQueueMessage) {
+		return department.waitingQueueMessage;
+	}
+
+	return settings.get('Livechat_waiting_queue_message');
+};
+
+const getQueueInfo = async (department) => {
+	const numberMostRecentChats = settings.get('Livechat_number_most_recent_chats_estimate_wait_time');
+	const statistics = await RoomRaw.getMostRecentAverageChatDurationTime(numberMostRecentChats, department);
+	const text = getWaitingQueueMessage(department);
+	const message = {
+		text,
+		user: { _id: 'rocket.cat', username: 'rocket.cat' },
+	};
+	return { message, statistics, numberMostRecentChats };
+};
+
+const getSpotEstimatedWaitTime = (spot, maxNumberSimultaneousChat, avgChatDuration) => {
+	if (!maxNumberSimultaneousChat || !avgChatDuration) {
+		return;
+	}
+	// X = spot
+	// N = maxNumberSimultaneousChat
+	// Estimated Wait Time = ([(N-1)/X]+1) *Average Chat Time of Most Recent X(Default = 100) Chats
+	return (((spot - 1) / maxNumberSimultaneousChat) + 1) * avgChatDuration;
+};
+
+export const normalizeQueueInfo = async ({ position, queueInfo, department }) => {
+	if (!queueInfo) {
+		queueInfo = await getQueueInfo(department);
+	}
+
+	const { message, numberMostRecentChats, statistics: { avgChatDuration } = { } } = queueInfo;
+	const spot = position + 1;
+	const estimatedWaitTimeSeconds = getSpotEstimatedWaitTime(spot, numberMostRecentChats, avgChatDuration);
+	return { spot, message, estimatedWaitTimeSeconds };
+};
+
+export const dispatchInquiryPosition = async (inquiry, queueInfo) => {
+	const { position, department } = inquiry;
+	const data = await normalizeQueueInfo({ position, queueInfo, department });
+	const propagateInquiryPosition = Meteor.bindEnvironment((inquiry) => {
+		Livechat.stream.emit(inquiry.rid, {
+			type: 'queueData',
+			data,
+		});
+	});
+
+	return setTimeout(() => {
+		propagateInquiryPosition(inquiry);
+	}, 1000);
+};
+
+export const dispatchWaitingQueueStatus = async (department) => {
+	const queue = await LivechatInquiry.getCurrentSortedQueueAsync({ department });
+	const queueInfo = await getQueueInfo(department);
+	queue.forEach((inquiry) => {
+		dispatchInquiryPosition(inquiry, queueInfo);
+	});
+};
+
+const processWaitingQueue = async (department) => {
+	const inquiry = LivechatInquiry.getNextInquiryQueued(department);
+	if (!inquiry) {
+		return;
+	}
+
+	const room = await RoutingManager.delegateInquiry(inquiry);
+
+	const propagateAgentDelegated = Meteor.bindEnvironment((rid, agentId) => {
+		dispatchAgentDelegated(rid, agentId);
+	});
+
+	if (room && room.servedBy) {
+		const { _id: rid, servedBy: { _id: agentId } } = room;
+
+		return setTimeout(() => {
+			propagateAgentDelegated(rid, agentId);
+		}, 1000);
+	}
+
+	const { departmentId } = room || {};
+	await dispatchWaitingQueueStatus(departmentId);
+};
+
+export const checkWaitingQueue = (department) => {
+	if (!settings.get('Livechat_waiting_queue')) {
+		return;
+	}
+
+	const departments = (department && [department]) || LivechatDepartment.findEnabledWithAgents().fetch().map((department) => department._id);
+	if (departments.length === 0) {
+		return processWaitingQueue();
+	}
+
+	departments.forEach((department) => processWaitingQueue(department));
+};
+
+export const allowAgentSkipQueue = (agent) => {
+	check(agent, Match.ObjectIncluding({
+		agentId: String,
+	}));
+
+	return settings.get('Livechat_assign_new_conversation_to_bot') && hasRole(agent.agentId, 'bot');
+};
diff --git a/ee/app/livechat-enterprise/server/lib/LivechatEnterprise.js b/ee/app/livechat-enterprise/server/lib/LivechatEnterprise.js
new file mode 100644
index 000000000000..7a4cb8bfb6b1
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/lib/LivechatEnterprise.js
@@ -0,0 +1,116 @@
+import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
+
+import { Users } from '../../../../../app/models';
+import LivechatUnit from '../../../models/server/models/LivechatUnit';
+import LivechatTag from '../../../models/server/models/LivechatTag';
+import { addUserRoles, removeUserFromRoles } from '../../../../../app/authorization/server';
+
+export const LivechatEnterprise = {
+	addMonitor(username) {
+		check(username, String);
+
+		const user = Users.findOneByUsername(username, { fields: { _id: 1, username: 1 } });
+
+		if (!user) {
+			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'livechat:addMonitor' });
+		}
+
+		if (addUserRoles(user._id, 'livechat-monitor')) {
+			return user;
+		}
+
+		return false;
+	},
+
+	removeMonitor(username) {
+		check(username, String);
+
+		const user = Users.findOneByUsername(username, { fields: { _id: 1 } });
+
+		if (!user) {
+			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'livechat:removeMonitor' });
+		}
+
+		if (removeUserFromRoles(user._id, 'livechat-monitor')) {
+			return true;
+		}
+
+		return false;
+	},
+
+	removeUnit(_id) {
+		check(_id, String);
+
+		const unit = LivechatUnit.findOneById(_id, { fields: { _id: 1 } });
+
+		if (!unit) {
+			throw new Meteor.Error('unit-not-found', 'Unit not found', { method: 'livechat:removeUnit' });
+		}
+
+		return LivechatUnit.removeById(_id);
+	},
+
+	saveUnit(_id, unitData, unitMonitors, unitDepartments) {
+		check(_id, Match.Maybe(String));
+
+		check(unitData, {
+			name: String,
+			visibility: String,
+			enabled: Match.Optional(Boolean),
+			description: Match.Optional(String),
+			email: Match.Optional(String),
+			showOnOfflineForm: Match.Optional(Boolean),
+		});
+
+		check(unitMonitors, [
+			Match.ObjectIncluding({
+				monitorId: String,
+				username: String,
+			}),
+		]);
+
+		check(unitDepartments, [
+			Match.ObjectIncluding({
+				departmentId: String,
+			}),
+		]);
+
+		let ancestors = [];
+		if (_id) {
+			const unit = LivechatUnit.findOneById(_id);
+			if (!unit) {
+				throw new Meteor.Error('error-unit-not-found', 'Unit not found', { method: 'livechat:saveUnit' });
+			}
+
+			ancestors = unit.ancestors;
+		}
+
+		return LivechatUnit.createOrUpdateUnit(_id, unitData, ancestors, unitMonitors, unitDepartments);
+	},
+
+	removeTag(_id) {
+		check(_id, String);
+
+		const tag = LivechatTag.findOneById(_id, { fields: { _id: 1 } });
+
+		if (!tag) {
+			throw new Meteor.Error('tag-not-found', 'Tag not found', { method: 'livechat:removeTag' });
+		}
+
+		return LivechatTag.removeById(_id);
+	},
+
+	saveTag(_id, tagData, tagDepartments) {
+		check(_id, Match.Maybe(String));
+
+		check(tagData, {
+			name: String,
+			description: Match.Optional(String),
+		});
+
+		check(tagDepartments, [String]);
+
+		return LivechatTag.createOrUpdateTag(_id, tagData, tagDepartments);
+	},
+};
diff --git a/ee/app/livechat-enterprise/server/lib/logger.js b/ee/app/livechat-enterprise/server/lib/logger.js
new file mode 100644
index 000000000000..8880d1c07360
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/lib/logger.js
@@ -0,0 +1,7 @@
+import { Logger } from '../../../../../app/logger/server/server';
+
+export const logger = new Logger('LivechatEnterprise', {
+	sections: {
+		queries: 'Queries',
+	},
+});
diff --git a/ee/app/livechat-enterprise/server/lib/query.helper.js b/ee/app/livechat-enterprise/server/lib/query.helper.js
new file mode 100644
index 000000000000..ed512db92422
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/lib/query.helper.js
@@ -0,0 +1,33 @@
+import { getUnitsFromUser } from './units';
+
+// TODO: We need to add a new index in the departmentAncestors field
+
+export const addQueryRestrictionsToRoomsModel = (originalQuery = {}) => {
+	const query = { ...originalQuery };
+
+	const units = getUnitsFromUser();
+	if (!Array.isArray(units)) {
+		return query;
+	}
+
+	const expressions = query.$and || [];
+	const condition = {
+		$or: [
+			{ departmentAncestors: { $in: units } },
+			{ departmentId: { $in: units } },
+		],
+	};
+	query.$and = [condition, ...expressions];
+	return query;
+};
+
+export const addQueryRestrictionsToDepartmentsModel = (originalQuery = {}) => {
+	const query = { ...originalQuery, type: { $ne: 'u' } };
+
+	const units = getUnitsFromUser();
+	if (Array.isArray(units)) {
+		query.ancestors = { $in: units };
+	}
+
+	return query;
+};
diff --git a/ee/app/livechat-enterprise/server/lib/routing/LoadBalancing.js b/ee/app/livechat-enterprise/server/lib/routing/LoadBalancing.js
new file mode 100644
index 000000000000..7bac91ec8c13
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/lib/routing/LoadBalancing.js
@@ -0,0 +1,36 @@
+import { RoutingManager } from '../../../../../../app/livechat/server/lib/RoutingManager';
+import { Users } from '../../../../../../app/models/server/raw';
+
+/* Load Balancing Queuing method:
+	*
+	* default method where the agent with the least number
+	* of open chats is paired with the incoming livechat
+*/
+class LoadBalancing {
+	constructor() {
+		this.config = {
+			previewRoom: false,
+			showConnecting: false,
+			showQueue: false,
+			showQueueLink: false,
+			returnQueue: false,
+			enableTriggerAction: true,
+			autoAssignAgent: true,
+		};
+	}
+
+	async getNextAgent(department) {
+		const nextAgent = await Users.getNextLeastBusyAgent(department);
+		if (!nextAgent) {
+			return;
+		}
+		const { agentId, username } = nextAgent;
+		return { agentId, username };
+	}
+
+	delegateAgent(agent) {
+		return agent;
+	}
+}
+
+RoutingManager.registerMethod('Load_Balancing', LoadBalancing);
diff --git a/ee/app/livechat-enterprise/server/lib/runEndpointsAsUser.js b/ee/app/livechat-enterprise/server/lib/runEndpointsAsUser.js
new file mode 100644
index 000000000000..a40f12ad9f2d
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/lib/runEndpointsAsUser.js
@@ -0,0 +1,18 @@
+import { Meteor } from 'meteor/meteor';
+
+const replaceOriginalActionToRunAsUser = (route, endpointsToRunAsUser) => {
+	endpointsToRunAsUser[route.path].forEach((action) => {
+		if (route.endpoints[action]) {
+			const originalAction = route.endpoints[action].action;
+			route.endpoints[action].action = function _internalRouteActionHandler() {
+				return Meteor.runAsUser(this.userId, () => originalAction.apply(this));
+			};
+		}
+	});
+};
+
+export function runEndpointsAsUser({ originalAPIRoutes, endpointsToRunAsUser }) {
+	originalAPIRoutes
+		.filter((route) => Object.keys(endpointsToRunAsUser).includes(route.path))
+		.forEach((route) => replaceOriginalActionToRunAsUser(route, endpointsToRunAsUser));
+}
diff --git a/ee/app/livechat-enterprise/server/lib/units.js b/ee/app/livechat-enterprise/server/lib/units.js
new file mode 100644
index 000000000000..27ce27a880ce
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/lib/units.js
@@ -0,0 +1,15 @@
+import { Meteor } from 'meteor/meteor';
+
+import LivechatUnit from '../../../models/server/models/LivechatUnit';
+
+export function hasUnits() {
+	return LivechatUnit.unfilteredFind({ type: 'u' }).count() > 0;
+}
+
+export function getUnitsFromUser() {
+	if (!hasUnits()) {
+		return;
+	}
+
+	return Meteor.call('livechat:getUnitsFromUserRoles');
+}
diff --git a/ee/app/livechat-enterprise/server/methods/addMonitor.js b/ee/app/livechat-enterprise/server/methods/addMonitor.js
new file mode 100644
index 000000000000..7c6a976e3918
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/methods/addMonitor.js
@@ -0,0 +1,14 @@
+import { Meteor } from 'meteor/meteor';
+
+import { hasPermission } from '../../../../../app/authorization';
+import { LivechatEnterprise } from '../lib/LivechatEnterprise';
+
+Meteor.methods({
+	'livechat:addMonitor'(username) {
+		if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'manage-livechat-monitors')) {
+			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:addMonitor' });
+		}
+
+		return LivechatEnterprise.addMonitor(username);
+	},
+});
diff --git a/ee/app/livechat-enterprise/server/methods/getUnitsFromUserRoles.js b/ee/app/livechat-enterprise/server/methods/getUnitsFromUserRoles.js
new file mode 100644
index 000000000000..2fe7a4caa651
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/methods/getUnitsFromUserRoles.js
@@ -0,0 +1,15 @@
+import { Meteor } from 'meteor/meteor';
+
+import { hasRole } from '../../../../../app/authorization';
+import LivechatUnit from '../../../models/server/models/LivechatUnit';
+
+Meteor.methods({
+	'livechat:getUnitsFromUserRoles'() {
+		const user = Meteor.user();
+		if (!user || hasRole(user._id, ['admin', 'livechat-manager'])) {
+			return;
+		}
+
+		return hasRole(user._id, 'livechat-monitor') && LivechatUnit.findByMonitorId(user._id);
+	},
+});
diff --git a/ee/app/livechat-enterprise/server/methods/removeMonitor.js b/ee/app/livechat-enterprise/server/methods/removeMonitor.js
new file mode 100644
index 000000000000..59f683baf5ac
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/methods/removeMonitor.js
@@ -0,0 +1,14 @@
+import { Meteor } from 'meteor/meteor';
+
+import { hasPermission } from '../../../../../app/authorization';
+import { LivechatEnterprise } from '../lib/LivechatEnterprise';
+
+Meteor.methods({
+	'livechat:removeMonitor'(username) {
+		if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'manage-livechat-monitors')) {
+			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:removeMonitor' });
+		}
+
+		return LivechatEnterprise.removeMonitor(username);
+	},
+});
diff --git a/ee/app/livechat-enterprise/server/methods/removeTag.js b/ee/app/livechat-enterprise/server/methods/removeTag.js
new file mode 100644
index 000000000000..baf276844570
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/methods/removeTag.js
@@ -0,0 +1,14 @@
+import { Meteor } from 'meteor/meteor';
+
+import { hasPermission } from '../../../../../app/authorization';
+import { LivechatEnterprise } from '../lib/LivechatEnterprise';
+
+Meteor.methods({
+	'livechat:removeTag'(id) {
+		if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'manage-livechat-tags')) {
+			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:removeTag' });
+		}
+
+		return LivechatEnterprise.removeTag(id);
+	},
+});
diff --git a/ee/app/livechat-enterprise/server/methods/removeUnit.js b/ee/app/livechat-enterprise/server/methods/removeUnit.js
new file mode 100644
index 000000000000..9e5ab5ac1f98
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/methods/removeUnit.js
@@ -0,0 +1,14 @@
+import { Meteor } from 'meteor/meteor';
+
+import { hasPermission } from '../../../../../app/authorization';
+import { LivechatEnterprise } from '../lib/LivechatEnterprise';
+
+Meteor.methods({
+	'livechat:removeUnit'(id) {
+		if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'manage-livechat-units')) {
+			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:removeUnit' });
+		}
+
+		return LivechatEnterprise.removeUnit(id);
+	},
+});
diff --git a/ee/app/livechat-enterprise/server/methods/saveTag.js b/ee/app/livechat-enterprise/server/methods/saveTag.js
new file mode 100644
index 000000000000..404825c247c4
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/methods/saveTag.js
@@ -0,0 +1,14 @@
+import { Meteor } from 'meteor/meteor';
+
+import { hasPermission } from '../../../../../app/authorization';
+import { LivechatEnterprise } from '../lib/LivechatEnterprise';
+
+Meteor.methods({
+	'livechat:saveTag'(_id, tagData, tagDepartments) {
+		if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'manage-livechat-tags')) {
+			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:saveTags' });
+		}
+
+		return LivechatEnterprise.saveTag(_id, tagData, tagDepartments);
+	},
+});
diff --git a/ee/app/livechat-enterprise/server/methods/saveUnit.js b/ee/app/livechat-enterprise/server/methods/saveUnit.js
new file mode 100644
index 000000000000..c594e5e47e67
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/methods/saveUnit.js
@@ -0,0 +1,14 @@
+import { Meteor } from 'meteor/meteor';
+
+import { hasPermission } from '../../../../../app/authorization';
+import { LivechatEnterprise } from '../lib/LivechatEnterprise';
+
+Meteor.methods({
+	'livechat:saveUnit'(_id, unitData, unitMonitors, unitDepartments) {
+		if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'manage-livechat-units')) {
+			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:saveUnit' });
+		}
+
+		return LivechatEnterprise.saveUnit(_id, unitData, unitMonitors, unitDepartments);
+	},
+});
diff --git a/ee/app/livechat-enterprise/server/permissions.js b/ee/app/livechat-enterprise/server/permissions.js
new file mode 100644
index 000000000000..79f6b16c7657
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/permissions.js
@@ -0,0 +1,45 @@
+import _ from 'underscore';
+
+import { Permissions, Roles } from '../../../../app/models/server';
+
+export const createPermissions = () => {
+	if (!Permissions) {
+		return;
+	}
+
+	const livechatMonitorRole = 'livechat-monitor';
+	const livechatManagerRole = 'livechat-manager';
+	const adminRole = 'admin';
+
+	const roles = _.pluck(Roles.find().fetch(), 'name');
+	if (roles.indexOf(livechatMonitorRole) === -1) {
+		Roles.createOrUpdate(livechatMonitorRole);
+	}
+
+	const permissions = [
+		'view-l-room',
+		'view-livechat-rooms',
+		'close-livechat-room',
+		'close-others-livechat-room',
+		'save-others-livechat-room-info',
+		'remove-closed-livechat-rooms',
+		'view-livechat-analytics',
+		'add-livechat-department-agents',
+		'view-livechat-queue',
+		'transfer-livechat-guest',
+		'view-livechat-manager',
+		'view-livechat-departments',
+		'view-livechat-current-chats',
+		'view-livechat-analytics',
+		'view-livechat-real-time-monitoring',
+		'view-livechat-officeHours',
+		'manage-livechat-agents',
+	];
+
+
+	permissions.map((p) => Permissions.addRole(p, livechatMonitorRole));
+
+	Permissions.createOrUpdate('manage-livechat-units', [adminRole, livechatManagerRole]);
+	Permissions.createOrUpdate('manage-livechat-monitors', [adminRole, livechatManagerRole]);
+	Permissions.createOrUpdate('manage-livechat-tags', [adminRole, livechatManagerRole]);
+};
diff --git a/ee/app/livechat-enterprise/server/settings.js b/ee/app/livechat-enterprise/server/settings.js
new file mode 100644
index 000000000000..4ad2147cb830
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/settings.js
@@ -0,0 +1,40 @@
+import { settings } from '../../../../app/settings';
+import { Settings } from '../../../../app/models/server';
+
+export const createSettings = () => {
+	settings.add('Livechat_waiting_queue', false, {
+		type: 'boolean',
+		group: 'Omnichannel',
+		section: 'Routing',
+		i18nLabel: 'Waiting_queue',
+	});
+
+	settings.add('Livechat_waiting_queue_message', '', {
+		type: 'string',
+		group: 'Omnichannel',
+		section: 'Routing',
+		i18nLabel: 'Waiting_queue_message',
+		i18nDescription: 'Waiting_queue_message_description',
+		enableQuery: { _id: 'Livechat_waiting_queue', value: true },
+	});
+
+	settings.add('Livechat_maximum_chats_per_agent', 0, {
+		type: 'int',
+		group: 'Omnichannel',
+		section: 'Routing',
+		i18nLabel: 'Max_number_of_chats_per_agent',
+		i18nDescription: 'Max_number_of_chats_per_agent_description',
+		enableQuery: { _id: 'Livechat_waiting_queue', value: true },
+	});
+
+	settings.add('Livechat_number_most_recent_chats_estimate_wait_time', 100, {
+		type: 'int',
+		group: 'Omnichannel',
+		section: 'Routing',
+		i18nLabel: 'Number_of_most_recent_chats_estimate_wait_time',
+		i18nDescription: 'Number_of_most_recent_chats_estimate_wait_time_description',
+		enableQuery: { _id: 'Livechat_waiting_queue', value: true },
+	});
+
+	Settings.addOptionValueById('Livechat_Routing_Method', { key: 'Load_Balancing', i18nLabel: 'Load_Balancing' });
+};
diff --git a/ee/app/livechat-enterprise/server/startup.js b/ee/app/livechat-enterprise/server/startup.js
new file mode 100644
index 000000000000..3016268255ab
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/startup.js
@@ -0,0 +1,11 @@
+import { Meteor } from 'meteor/meteor';
+
+import { settings } from '../../../../app/settings';
+import { checkWaitingQueue } from './lib/Helper';
+import './lib/query.helper';
+
+Meteor.startup(function() {
+	settings.onload('Livechat_maximum_chats_per_agent', function(/* key, value */) {
+		checkWaitingQueue();
+	});
+});
diff --git a/ee/app/livechat/imports/server/rest/departments.js b/ee/app/livechat/imports/server/rest/departments.js
new file mode 100644
index 000000000000..4ec594c9051e
--- /dev/null
+++ b/ee/app/livechat/imports/server/rest/departments.js
@@ -0,0 +1,9 @@
+import { API } from '../../../../../../app/api';
+import { runEndpointsAsUser } from '../../../../livechat-enterprise/server/lib/runEndpointsAsUser';
+
+const endpointsToRunAsUser = {
+	'livechat/department': ['get', 'post'],
+	'livechat/department/:_id': ['get', 'put', 'delete'],
+};
+
+runEndpointsAsUser({ originalAPIRoutes: API.v1._routes, endpointsToRunAsUser });
diff --git a/ee/app/livechat/imports/server/rest/inquiries.js b/ee/app/livechat/imports/server/rest/inquiries.js
new file mode 100644
index 000000000000..3c9e6c314414
--- /dev/null
+++ b/ee/app/livechat/imports/server/rest/inquiries.js
@@ -0,0 +1,8 @@
+import { API } from '../../../../../../app/api';
+import { runEndpointsAsUser } from '../../../../livechat-enterprise/server/lib/runEndpointsAsUser';
+
+const endpointsToRunAsUser = {
+	'livechat/inquiries.list': ['get'],
+};
+
+runEndpointsAsUser({ originalAPIRoutes: API.v1._routes, endpointsToRunAsUser });
diff --git a/ee/app/livechat/imports/server/rest/rooms.js b/ee/app/livechat/imports/server/rest/rooms.js
new file mode 100644
index 000000000000..7d15bf85e2f9
--- /dev/null
+++ b/ee/app/livechat/imports/server/rest/rooms.js
@@ -0,0 +1,8 @@
+import { API } from '../../../../../../app/api';
+import { runEndpointsAsUser } from '../../../../livechat-enterprise/server/lib/runEndpointsAsUser';
+
+const endpointsToRunAsUser = {
+	'livechat/rooms': ['get'],
+};
+
+runEndpointsAsUser({ originalAPIRoutes: API.v1._routes, endpointsToRunAsUser });
diff --git a/ee/app/livechat/imports/server/rest/sms.js b/ee/app/livechat/imports/server/rest/sms.js
new file mode 100644
index 000000000000..982ddd7b2438
--- /dev/null
+++ b/ee/app/livechat/imports/server/rest/sms.js
@@ -0,0 +1,8 @@
+import { API } from '../../../../../../app/api';
+import { runEndpointsAsUser } from '../../../../livechat-enterprise/server/lib/runEndpointsAsUser';
+
+const endpointsToRunAsUser = {
+	'livechat/sms-incoming/:service': ['get'],
+};
+
+runEndpointsAsUser({ originalAPIRoutes: API.v1._routes, endpointsToRunAsUser });
diff --git a/ee/app/livechat/imports/server/rest/upload.js b/ee/app/livechat/imports/server/rest/upload.js
new file mode 100644
index 000000000000..8f87096af200
--- /dev/null
+++ b/ee/app/livechat/imports/server/rest/upload.js
@@ -0,0 +1,8 @@
+import { API } from '../../../../../../app/api';
+import { runEndpointsAsUser } from '../../../../livechat-enterprise/server/lib/runEndpointsAsUser';
+
+const endpointsToRunAsUser = {
+	'livechat/upload/:rid': ['post'],
+};
+
+runEndpointsAsUser({ originalAPIRoutes: API.v1._routes, endpointsToRunAsUser });
diff --git a/ee/app/livechat/index.js b/ee/app/livechat/index.js
new file mode 100644
index 000000000000..4ed364ea27fa
--- /dev/null
+++ b/ee/app/livechat/index.js
@@ -0,0 +1,5 @@
+import './imports/server/rest/departments.js';
+import './imports/server/rest/inquiries.js';
+import './imports/server/rest/rooms.js';
+import './imports/server/rest/sms.js';
+import './imports/server/rest/upload.js';
diff --git a/ee/app/models/index.js b/ee/app/models/index.js
new file mode 100644
index 000000000000..27b799c4d7d7
--- /dev/null
+++ b/ee/app/models/index.js
@@ -0,0 +1,5 @@
+import { Meteor } from 'meteor/meteor';
+
+if (Meteor.isServer) {
+	module.exports = require('./server/index.js');
+}
diff --git a/ee/app/models/server/index.js b/ee/app/models/server/index.js
new file mode 100644
index 000000000000..4be2f7ddf118
--- /dev/null
+++ b/ee/app/models/server/index.js
@@ -0,0 +1,21 @@
+import CannedResponse from './models/CannedResponse';
+import LivechatTag from './models/LivechatTag';
+import LivechatUnit from './models/LivechatUnit';
+import LivechatUnitMonitors from './models/LivechatUnitMonitors';
+import CannedResponseRaw from './raw/CannedResponse';
+import LivechatTagRaw from './raw/LivechatTag';
+import LivechatUnitMonitorsRaw from './raw/LivechatUnitMonitors';
+import './models/LivechatDepartment';
+import './models/LivechatRooms';
+import './raw/LivechatDepartment';
+import './raw/LivechatRooms';
+
+export {
+	CannedResponse,
+	LivechatTag,
+	LivechatUnit,
+	LivechatUnitMonitors,
+	CannedResponseRaw,
+	LivechatTagRaw,
+	LivechatUnitMonitorsRaw,
+};
diff --git a/ee/app/models/server/models/CannedResponse.js b/ee/app/models/server/models/CannedResponse.js
new file mode 100644
index 000000000000..aee66bcaf04f
--- /dev/null
+++ b/ee/app/models/server/models/CannedResponse.js
@@ -0,0 +1,62 @@
+import _ from 'underscore';
+
+import { Base } from '../../../../../app/models';
+/**
+ * Livechat Department model
+ */
+export class CannedResponse extends Base {
+	constructor() {
+		super('canned_response');
+
+		this.tryEnsureIndex({
+			shortcut: 1,
+		});
+	}
+
+	createOrUpdateCannedResponse(_id, { shortcut, text, scope, userId, departmentId, createdBy }) {
+		const record = {
+			shortcut,
+			text,
+			scope,
+			userId,
+			departmentId,
+			createdBy,
+		};
+
+		if (_id) {
+			this.update({ _id }, { $set: record });
+		} else {
+			_id = this.insert(record);
+		}
+
+		return _.extend(record, { _id });
+	}
+
+	// FIND
+	findOneById(_id, options) {
+		const query = { _id };
+
+		return this.findOne(query, options);
+	}
+
+	findByCannedResponseId(_id, options) {
+		const query = { _id };
+
+		return this.find(query, options);
+	}
+
+	findByShortcut(shortcut, options) {
+		const query = { shortcut };
+
+		return this.find(query, options);
+	}
+
+	// REMOVE
+	removeById(_id) {
+		const query = { _id };
+
+		return this.remove(query);
+	}
+}
+
+export default new CannedResponse();
diff --git a/ee/app/models/server/models/LivechatDepartment.js b/ee/app/models/server/models/LivechatDepartment.js
new file mode 100644
index 000000000000..0cb7a9206a65
--- /dev/null
+++ b/ee/app/models/server/models/LivechatDepartment.js
@@ -0,0 +1,75 @@
+import { LivechatDepartment } from '../../../../../app/models/server/models/LivechatDepartment';
+import { logger } from '../../../livechat-enterprise/server/lib/logger';
+import { addQueryRestrictionsToDepartmentsModel } from '../../../livechat-enterprise/server/lib/query.helper';
+import { onLicense } from '../../../license/server';
+
+const _find = LivechatDepartment.prototype.find;
+const _findOne = LivechatDepartment.prototype.findOne;
+const _update = LivechatDepartment.prototype.update;
+const _remove = LivechatDepartment.prototype.remove;
+const _createOrUpdateDepartment = LivechatDepartment.prototype.createOrUpdateDepartment;
+
+LivechatDepartment.prototype.unfilteredFind = function(...args) {
+	return _find.call(this, ...args);
+};
+
+LivechatDepartment.prototype.unfilteredFindOne = function(...args) {
+	return _findOne.call(this, ...args);
+};
+
+LivechatDepartment.prototype.unfilteredUpdate = function(...args) {
+	return _update.call(this, ...args);
+};
+
+LivechatDepartment.prototype.unfilteredRemove = function(...args) {
+	return _remove.call(this, ...args);
+};
+
+onLicense('livechat-enterprise', () => {
+	LivechatDepartment.prototype.find = function(originalQuery, ...args) {
+		const query = addQueryRestrictionsToDepartmentsModel(originalQuery);
+		logger.queries.debug('LivechatDepartment.find', JSON.stringify(query));
+		return _find.call(this, query, ...args);
+	};
+
+	LivechatDepartment.prototype.findOne = function(originalQuery, ...args) {
+		const query = addQueryRestrictionsToDepartmentsModel(originalQuery);
+		logger.queries.debug('LivechatDepartment.findOne', JSON.stringify(query));
+		return _findOne.call(this, query, ...args);
+	};
+
+	LivechatDepartment.prototype.update = function(originalQuery, ...args) {
+		const query = addQueryRestrictionsToDepartmentsModel(originalQuery);
+		logger.queries.debug('LivechatDepartment.update', JSON.stringify(query));
+		return _update.call(this, query, ...args);
+	};
+
+	LivechatDepartment.prototype.remove = function(originalQuery, ...args) {
+		const query = addQueryRestrictionsToDepartmentsModel(originalQuery);
+		logger.queries.debug('LivechatDepartment.remove', JSON.stringify(query));
+		return _remove.call(this, query, ...args);
+	};
+
+	LivechatDepartment.prototype.createOrUpdateDepartment = function(...args) {
+		if (args.length > 2 && !args[1].type) {
+			args[1].type = 'd';
+		}
+
+		return _createOrUpdateDepartment.apply(this, args);
+	};
+
+	LivechatDepartment.prototype.removeParentAndAncestorById = function(parentId) {
+		const query = {
+			parentId,
+		};
+
+		const update = {
+			$unset: { parentId: 1 },
+			$pull: { ancestors: parentId },
+		};
+
+		return this.update(query, update, { multi: true });
+	};
+});
+
+export default LivechatDepartment;
diff --git a/ee/app/models/server/models/LivechatRooms.js b/ee/app/models/server/models/LivechatRooms.js
new file mode 100644
index 000000000000..ab094ad7db67
--- /dev/null
+++ b/ee/app/models/server/models/LivechatRooms.js
@@ -0,0 +1,46 @@
+import { LivechatRooms } from '../../../../../app/models/server/models/LivechatRooms';
+import { logger } from '../../../livechat-enterprise/server/lib/logger';
+import { addQueryRestrictionsToRoomsModel } from '../../../livechat-enterprise/server/lib/query.helper';
+
+const _find = LivechatRooms.prototype.find;
+const _findOne = LivechatRooms.prototype.findOne;
+const _update = LivechatRooms.prototype.update;
+const _remove = LivechatRooms.prototype.remove;
+
+LivechatRooms.prototype.find = function(originalQuery, ...args) {
+	const query = addQueryRestrictionsToRoomsModel(originalQuery);
+	logger.queries.debug('LivechatRooms.find', JSON.stringify(query));
+	return _find.call(this, query, ...args);
+};
+
+LivechatRooms.prototype.findOne = function(originalQuery, ...args) {
+	const query = addQueryRestrictionsToRoomsModel(originalQuery);
+	logger.queries.debug('LivechatRooms.findOne', JSON.stringify(query));
+	return _findOne.call(this, query, ...args);
+};
+
+LivechatRooms.prototype.update = function(originalQuery, ...args) {
+	const query = addQueryRestrictionsToRoomsModel(originalQuery);
+	logger.queries.debug('LivechatRooms.update', JSON.stringify(query));
+	return _update.call(this, query, ...args);
+};
+
+LivechatRooms.prototype.remove = function(originalQuery, ...args) {
+	const query = addQueryRestrictionsToRoomsModel(originalQuery);
+	logger.queries.debug('LivechatRooms.remove', JSON.stringify(query));
+	return _remove.call(this, query, ...args);
+};
+
+LivechatRooms.prototype.updateDepartmentAncestorsById = function(_id, departmentAncestors) {
+	const query = {
+		_id,
+	};
+	const update = {
+		$set: {
+			departmentAncestors,
+		},
+	};
+	return this.update(query, update);
+};
+
+export default LivechatRooms;
diff --git a/ee/app/models/server/models/LivechatTag.js b/ee/app/models/server/models/LivechatTag.js
new file mode 100644
index 000000000000..f5d73bb487b3
--- /dev/null
+++ b/ee/app/models/server/models/LivechatTag.js
@@ -0,0 +1,46 @@
+import _ from 'underscore';
+
+import { Base } from '../../../../../app/models';
+/**
+ * Livechat Tag model
+ */
+export class LivechatTag extends Base {
+	constructor(modelOrName) {
+		super(modelOrName || 'livechat_tag');
+
+		this.tryEnsureIndex({ name: 1 }, { unique: true });
+	}
+
+	// FIND
+	findOneById(_id, options) {
+		const query = { _id };
+
+		return this.findOne(query, options);
+	}
+
+	createOrUpdateTag(_id, { name, description }, departments = []) {
+		const record = {
+			name,
+			description,
+			numDepartments: departments.length,
+			departments,
+		};
+
+		if (_id) {
+			this.update({ _id }, { $set: record });
+		} else {
+			_id = this.insert(record);
+		}
+
+		return _.extend(record, { _id });
+	}
+
+	// REMOVE
+	removeById(_id) {
+		const query = { _id };
+
+		return this.remove(query);
+	}
+}
+
+export default new LivechatTag();
diff --git a/ee/app/models/server/models/LivechatUnit.js b/ee/app/models/server/models/LivechatUnit.js
new file mode 100644
index 000000000000..ccbf44db1595
--- /dev/null
+++ b/ee/app/models/server/models/LivechatUnit.js
@@ -0,0 +1,150 @@
+import _ from 'underscore';
+
+import LivechatDepartmentInstance, { LivechatDepartment } from '../../../../../app/models/server/models/LivechatDepartment';
+import { getUnitsFromUser } from '../../../livechat-enterprise/server/lib/units';
+import { logger } from '../../../livechat-enterprise/server/lib/logger';
+import LivechatUnitMonitors from './LivechatUnitMonitors';
+
+const addQueryRestrictions = (originalQuery = {}) => {
+	const query = { ...originalQuery, type: 'u' };
+
+	const units = getUnitsFromUser();
+	if (Array.isArray(units)) {
+		query.ancestors = { $in: units };
+		const expressions = query.$and || [];
+		const condition = { $or: [{ ancestors: { $in: units } }, { _id: { $in: units } }] };
+		query.$and = [condition, ...expressions];
+	}
+
+	return query;
+};
+
+
+export class LivechatUnit extends LivechatDepartment {
+	find(originalQuery, ...args) {
+		const query = addQueryRestrictions(originalQuery);
+		logger.queries.debug('LivechatUnit.find', JSON.stringify(query));
+		return this.unfilteredFind(query, ...args);
+	}
+
+	findOne(originalQuery, ...args) {
+		const query = addQueryRestrictions(originalQuery);
+		logger.queries.debug('LivechatUnit.findOne', JSON.stringify(query));
+		return super.unfilteredFindOne(query, ...args);
+	}
+
+	findOneById(_id, options) {
+		const query = addQueryRestrictions({ _id });
+		return super.unfilteredFindOne(query, options);
+	}
+
+	update(...args) {
+		return this.unfilteredUpdate(...args);
+	}
+
+	createOrUpdateUnit(_id, { name, visibility }, ancestors, monitors, departments) {
+		monitors = [].concat(monitors || []);
+		ancestors = [].concat(ancestors || []);
+
+		const record = {
+			name,
+			visibility,
+			type: 'u',
+			numMonitors: monitors.length,
+			numDepartments: departments.length,
+		};
+
+		if (_id) {
+			this.update({ _id }, { $set: record });
+		} else {
+			_id = this.insert(record);
+		}
+
+		ancestors.splice(0, 0, _id);
+
+		const savedMonitors = _.pluck(LivechatUnitMonitors.findByUnitId(_id).fetch(), 'monitorId');
+		const monitorsToSave = _.pluck(monitors, 'monitorId');
+
+		// remove other monitors
+		_.difference(savedMonitors, monitorsToSave).forEach((monitorId) => {
+			LivechatUnitMonitors.removeByUnitIdAndMonitorId(_id, monitorId);
+		});
+
+		monitors.forEach((monitor) => {
+			LivechatUnitMonitors.saveMonitor({
+				monitorId: monitor.monitorId,
+				unitId: _id,
+				username: monitor.username,
+			});
+		});
+
+		const savedDepartments = _.pluck(LivechatDepartmentInstance.find({ parentId: _id }).fetch(), '_id');
+		const departmentsToSave = _.pluck(departments, 'departmentId');
+
+		// remove other departments
+		_.difference(savedDepartments, departmentsToSave).forEach((departmentId) => {
+			LivechatDepartmentInstance.update({ _id: departmentId }, { $set: {
+				parentId: null,
+				ancestors: null,
+			} });
+		});
+
+		departmentsToSave.forEach((departmentId) => {
+			LivechatDepartmentInstance.update({ _id: departmentId }, { $set: {
+				parentId: _id,
+				ancestors,
+			} });
+		});
+
+		return _.extend(record, { _id });
+	}
+
+	// REMOVE
+	remove(...args) {
+		return this.unfilteredRemove(...args);
+	}
+
+	removeParentAndAncestorById(parentId) {
+		const query = {
+			parentId,
+		};
+
+		const update = {
+			$unset: { parentId: 1 },
+			$pull: { ancestors: parentId },
+		};
+
+		return this.update(query, update, { multi: true });
+	}
+
+	removeById(_id) {
+		LivechatUnitMonitors.removeByUnitId(_id);
+		this.removeParentAndAncestorById(_id);
+
+		const query = { _id };
+		return this.remove(query);
+	}
+
+	findOneByIdOrName(_idOrName, options) {
+		const query = {
+			$or: [{
+				_id: _idOrName,
+			}, {
+				name: _idOrName,
+			}],
+		};
+
+		return this.findOne(query, options);
+	}
+
+	findByMonitorId(monitorId) {
+		const monitoredUnits = LivechatUnitMonitors.findByMonitorId(monitorId).fetch();
+		if (monitoredUnits.length === 0) {
+			return [];
+		}
+
+		return monitoredUnits.map((u) => u.unitId);
+	}
+}
+
+export default new LivechatUnit(LivechatDepartmentInstance.model);
diff --git a/ee/app/models/server/models/LivechatUnitMonitors.js b/ee/app/models/server/models/LivechatUnitMonitors.js
new file mode 100644
index 000000000000..126bd9cca275
--- /dev/null
+++ b/ee/app/models/server/models/LivechatUnitMonitors.js
@@ -0,0 +1,38 @@
+import { Base } from '../../../../../app/models';
+/**
+ * Livechat Unit Monitors model
+ */
+export class LivechatUnitMonitors extends Base {
+	constructor() {
+		super('livechat_unit_monitors');
+	}
+
+	findByUnitId(unitId) {
+		return this.find({ unitId });
+	}
+
+	findByMonitorId(monitorId) {
+		return this.find({ monitorId });
+	}
+
+	saveMonitor(monitor) {
+		return this.upsert({
+			monitorId: monitor.monitorId,
+			unitId: monitor.unitId,
+		}, {
+			$set: {
+				username: monitor.username,
+			},
+		});
+	}
+
+	removeByUnitIdAndMonitorId(unitId, monitorId) {
+		this.remove({ unitId, monitorId });
+	}
+
+	removeByUnitId(unitId) {
+		this.remove({ unitId });
+	}
+}
+
+export default new LivechatUnitMonitors();
diff --git a/ee/app/models/server/raw/CannedResponse.js b/ee/app/models/server/raw/CannedResponse.js
new file mode 100644
index 000000000000..6300ee67f023
--- /dev/null
+++ b/ee/app/models/server/raw/CannedResponse.js
@@ -0,0 +1,7 @@
+import { BaseRaw } from '../../../../../app/models/server/raw/BaseRaw';
+import CannedResponse from '../models/CannedResponse';
+
+export class CannedResponseRaw extends BaseRaw {
+}
+
+export default new CannedResponseRaw(CannedResponse.model.rawCollection());
diff --git a/ee/app/models/server/raw/LivechatDepartment.js b/ee/app/models/server/raw/LivechatDepartment.js
new file mode 100644
index 000000000000..7e27673f92dc
--- /dev/null
+++ b/ee/app/models/server/raw/LivechatDepartment.js
@@ -0,0 +1,32 @@
+import { LivechatDepartmentRaw } from '../../../../../app/models/server/raw/LivechatDepartment';
+import { logger } from '../../../livechat-enterprise/server/lib/logger';
+import { addQueryRestrictionsToDepartmentsModel } from '../../../livechat-enterprise/server/lib/query.helper';
+
+const _find = LivechatDepartmentRaw.prototype.find;
+const _findOne = LivechatDepartmentRaw.prototype.findOne;
+const _update = LivechatDepartmentRaw.prototype.update;
+const _remove = LivechatDepartmentRaw.prototype.remove;
+
+LivechatDepartmentRaw.prototype.find = function(originalQuery, ...args) {
+	const query = addQueryRestrictionsToDepartmentsModel(originalQuery);
+	logger.queries.debug('LivechatDepartmentRaw.find', JSON.stringify(query));
+	return _find.call(this, query, ...args);
+};
+
+LivechatDepartmentRaw.prototype.findOne = function(originalQuery, ...args) {
+	const query = addQueryRestrictionsToDepartmentsModel(originalQuery);
+	logger.queries.debug('LivechatDepartmentRaw.findOne', JSON.stringify(query));
+	return _findOne.call(this, query, ...args);
+};
+
+LivechatDepartmentRaw.prototype.update = function(originalQuery, ...args) {
+	const query = addQueryRestrictionsToDepartmentsModel(originalQuery);
+	logger.queries.debug('LivechatDepartmentRaw.update', JSON.stringify(query));
+	return _update.call(this, query, ...args);
+};
+
+LivechatDepartmentRaw.prototype.remove = function(originalQuery, ...args) {
+	const query = addQueryRestrictionsToDepartmentsModel(originalQuery);
+	logger.queries.debug('LivechatDepartmentRaw.remove', JSON.stringify(query));
+	return _remove.call(this, query, ...args);
+};
diff --git a/ee/app/models/server/raw/LivechatRooms.js b/ee/app/models/server/raw/LivechatRooms.js
new file mode 100644
index 000000000000..3b02434b450e
--- /dev/null
+++ b/ee/app/models/server/raw/LivechatRooms.js
@@ -0,0 +1,32 @@
+import { LivechatRoomsRaw } from '../../../../../app/models/server/raw/LivechatRooms';
+import { logger } from '../../../livechat-enterprise/server/lib/logger';
+import { addQueryRestrictionsToRoomsModel } from '../../../livechat-enterprise/server/lib/query.helper';
+
+const _find = LivechatRoomsRaw.prototype.find;
+const _findOne = LivechatRoomsRaw.prototype.findOne;
+const _update = LivechatRoomsRaw.prototype.update;
+const _remove = LivechatRoomsRaw.prototype.remove;
+
+LivechatRoomsRaw.prototype.find = function(originalQuery, ...args) {
+	const query = addQueryRestrictionsToRoomsModel(originalQuery);
+	logger.queries.debug('LivechatRoomsRaw.find', JSON.stringify(query));
+	return _find.call(this, query, ...args);
+};
+
+LivechatRoomsRaw.prototype.findOne = function(originalQuery, ...args) {
+	const query = addQueryRestrictionsToRoomsModel(originalQuery);
+	logger.queries.debug('LivechatRoomsRaw.findOne', JSON.stringify(query));
+	return _findOne.call(this, query, ...args);
+};
+
+LivechatRoomsRaw.prototype.update = function(originalQuery, ...args) {
+	const query = addQueryRestrictionsToRoomsModel(originalQuery);
+	logger.queries.debug('LivechatRoomsRaw.update', JSON.stringify(query));
+	return _update.call(this, query, ...args);
+};
+
+LivechatRoomsRaw.prototype.remove = function(originalQuery, ...args) {
+	const query = addQueryRestrictionsToRoomsModel(originalQuery);
+	logger.queries.debug('LivechatRoomsRaw.remove', JSON.stringify(query));
+	return _remove.call(this, query, ...args);
+};
diff --git a/ee/app/models/server/raw/LivechatTag.js b/ee/app/models/server/raw/LivechatTag.js
new file mode 100644
index 000000000000..528b2a989737
--- /dev/null
+++ b/ee/app/models/server/raw/LivechatTag.js
@@ -0,0 +1,7 @@
+import { BaseRaw } from '../../../../../app/models/server/raw/BaseRaw';
+import LivechatTag from '../models/LivechatTag';
+
+export class LivechatTagRaw extends BaseRaw {
+}
+
+export default new LivechatTagRaw(LivechatTag.model.rawCollection());
diff --git a/ee/app/models/server/raw/LivechatUnitMonitors.js b/ee/app/models/server/raw/LivechatUnitMonitors.js
new file mode 100644
index 000000000000..9199323f5513
--- /dev/null
+++ b/ee/app/models/server/raw/LivechatUnitMonitors.js
@@ -0,0 +1,7 @@
+import { BaseRaw } from '../../../../../app/models/server/raw/BaseRaw';
+import LivechatUnitMonitors from '../models/LivechatUnitMonitors';
+
+export class LivechatUnitMonitorsRaw extends BaseRaw {
+}
+
+export default new LivechatUnitMonitorsRaw(LivechatUnitMonitors.model.rawCollection());
diff --git a/ee/client/index.js b/ee/client/index.js
new file mode 100644
index 000000000000..8e58d438ebd3
--- /dev/null
+++ b/ee/client/index.js
@@ -0,0 +1,4 @@
+import '../app/auditing/client/index';
+import '../app/canned-responses/client/index';
+import '../app/license/client/index';
+import '../app/livechat-enterprise/client/index';
diff --git a/ee/i18n/en.i18n.json b/ee/i18n/en.i18n.json
new file mode 100644
index 000000000000..ed956b7152c6
--- /dev/null
+++ b/ee/i18n/en.i18n.json
@@ -0,0 +1,61 @@
+{
+  "error-canned-response-not-found": "Canned Response Not Found",
+  "error-max-number-simultaneous-chats-reached": "The maximum number of simultaneous chats per agent has been reached.",
+  "Add_monitor": "Add monitor",
+  "Available_departments": "Available Departments",
+  "Canned Responses": "Canned Responses",
+  "Canned_Response_Removed": "Canned Response Removed",
+  "Canned_Responses_Enable": "Enable Canned Responses",
+  "Edit_Tag": "Edit Tag",
+  "Edit_Unit": "Edit Unit",
+  "Enterprise_License": "Enterprise License",
+  "Failed_to_add_monitor": "Failed to add monitor",
+  "Invalid Canned Response": "Invalid Canned Response",
+  "Invalid_Department": "Invalid Department",
+  "LDAP_Default_Role_To_User": "Default role to user",
+  "LDAP_Default_Role_To_User_Description": "The default RC role to be applied to user if the user has some LDAP role that is not mapped.",
+  "LDAP_Enable_LDAP_Roles_To_RC_Roles": "Enable role mapping from LDAP to Rocket.Chat",
+  "LDAP_Query_To_Get_User_Groups": "LDAP query to get user groups",
+  "LDAP_Query_To_Get_User_Groups_Description": "LDAP query to get the LDAP groups that the user is part of.",
+  "LDAP_Roles_To_Rocket_Chat_Roles": "Role mapping from LDAP to Rocket.Chat.",
+  "LDAP_Roles_To_Rocket_Chat_Roles_Description": "Role mapping in object format where the object key must be the LDAP role and the object value must be an array of RC roles. Example: { 'ldapRole': ['rcRole', 'anotherRCRole'] }",
+  "LDAP_Validate_Roles_For_Each_Login": "Validate mapping for each login",
+  "LDAP_Validate_Roles_For_Each_Login_Description": "If the validation should occurs for each login (Be careful with this setting because it will overwrite the user roles in each login, otherwise this will be validated only at the moment of user creation).",
+  "Livechat_Monitors": "Monitors",
+  "Livechat_monitors": "Livechat monitors",
+  "Max_number_of_chats_per_agent": "Max. number of simultaneous chats",
+  "Max_number_of_chats_per_agent_description": "The max. number of simultaneous chats that the agents can attend",
+  "Me": "Me",
+  "Message_auditing": "Message auditing",
+  "Message_auditing_log": "Message auditing log",
+  "Monitor_removed": "Monitor removed",
+  "Monitors": "Monitors",
+  "New_Canned_Response": "New Canned Response",
+  "New_Tag": "New Tag",
+  "New_Unit": "New Unit",
+  "No_Canned_Responses": "No Canned Responses",
+  "Number_of_most_recent_chats_estimate_wait_time": "Number of recent chats to calculate estimate wait time",
+  "Number_of_most_recent_chats_estimate_wait_time_description": "This number defines the number of last served rooms that will be used to calculate queue wait times.",
+  "Others": "Others",
+  "Please_select_visibility": "Please select a visibility",
+  "Role_Mapping": "Role mapping",
+  "Selected_departments": "Selected Departments",
+  "Selected_monitors": "Selected Monitors",
+  "Shortcut": "Shortcut",
+  "Tag_removed": "Tag Removed",
+  "The_selected_user_is_not_a_monitor": "The selected user is not a monitor",
+  "There_are_no_available_monitors": "There are no available monitors",
+  "There_are_no_departments_added_to_this_tag_yet": "There are no departments added to this tag yet",
+  "There_are_no_departments_added_to_this_unit_yet": "There are no departments added to this unit yet",
+  "There_are_no_departments_available": "There are no departments available",
+  "There_are_no_monitors_added_to_this_unit_yet": "There are no monitors added to this unit yet",
+  "This_monitor_was_already_selected": "This monitor was already selected",
+  "Unit_removed": "Unit Removed",
+  "Use_this_response": "Use this response",
+  "view-canned-responses": "View Canned Responses",
+  "view-livechat-monitor": "View Livechat Monitors",
+  "view-livechat-unit": "View Livechat Units",
+  "Waiting_queue": "Waiting queue",
+  "Waiting_queue_message": "Waiting queue message",
+  "Waiting_queue_message_description": "Message that will be displayed to the visitors when they get in the queue"
+}
diff --git a/ee/i18n/pt-BR.i18n.json b/ee/i18n/pt-BR.i18n.json
new file mode 100644
index 000000000000..7a3fd7bedbb9
--- /dev/null
+++ b/ee/i18n/pt-BR.i18n.json
@@ -0,0 +1,49 @@
+{
+  "error-max-number-simultaneous-chats-reached": "O número máximo de bate-papos simultâneos por agente foi atingido.",
+  "Add_monitor": "Adicionar Monitor",
+  "Available_departments": "Departamentos disponíveis",
+  "Edit_Tag": "Editar Tag",
+  "Edit_Unit": "Editar Unidade",
+  "Enterprise_License": "Licença Enterprise",
+  "LDAP_Default_Role_To_User": "Papel padrão para o usuário",
+  "LDAP_Default_Role_To_User_Description": "Papel padrão par ser aplicado ao usuário, caso ele tenha algum papel do LDAP que não esteja mapeado.",
+  "LDAP_Enable_LDAP_Roles_To_RC_Roles": "Habilitar o mapeamento de papéis do LDAP para o Rocket.Chat",
+  "LDAP_Query_To_Get_User_Groups": "Consulta LDAP para pegar os grupos de usuários",
+  "LDAP_Query_To_Get_User_Groups_Description": "Consulta para pegar os grupos em que o usuário faz parte.",
+  "LDAP_Roles_To_Rocket_Chat_Roles": "Mapeamento dos papéis do LDAP para o Rocket.Chat",
+  "LDAP_Roles_To_Rocket_Chat_Roles_Description": "Mapeamento dos papéis que deve ser em formato de objeto onde a chave do objeto precisa ser o nome do papel LDAP e o valor deve ser um array de papéis Rocket.Chat. Exemplo: { 'ldapRole': ['rcRole', 'anotherRCRole'] }",
+  "LDAP_Validate_Roles_For_Each_Login": "Validar o mapeamento em cada login",
+  "LDAP_Validate_Roles_For_Each_Login_Description": " Se a validação deve ser feita a cada login(Tenha cuidado com essa configuração, pois ela vai sobrescrever os papéis de usuário a cada login, caso esteja desabilitado, a validação será feita apenas no momento da criação do usuário).",
+  "Livechat_Monitors": "Monitores",
+  "Livechat_monitors": "Monitores de Livechat",
+  "Max_number_of_chats_per_agent": "Número máximo de atendimentos simultâneos",
+  "Max_number_of_chats_per_agent_description": "Número máximo de atendimentos simultâneos que um agente pode atender",
+  "Message_auditing": "Auditoria",
+  "Message_auditing_log": "Log de auditoria",
+  "Monitor_removed": "Monitor removido",
+  "Monitors": "Monitores",
+  "New_Tag": "Nova Tag",
+  "New_Unit": "Nova Unidade",
+  "Number_of_most_recent_chats_estimate_wait_time": "Número de chats recentes para cálculo de tempo na fila",
+  "Number_of_most_recent_chats_estimate_wait_time_description": "Este numero define a quantidade de últimas salas atendidas que serão usadas para calculo de estimativa de tempo de espera da fila.",
+  "Others": "Outros",
+  "Please_select_visibility": "Por favor selecione o tipo de visibilidade",
+  "Role_Mapping": "Mapeamento de papéis",
+  "Selected_departments": "Departamentos selecionados",
+  "Selected_monitors": "Monitores selecionados",
+  "Shortcut": "Atalho",
+  "Tag_removed": "Tag Removida",
+  "The_selected_user_is_not_a_monitor": "O usuário selecionado não é um monitor",
+  "There_are_no_available_monitors": "Não há monotires disponíveis",
+  "There_are_no_departments_added_to_this_tag_yet": "Ainda não há departamentos adicionado nesta tag",
+  "There_are_no_departments_added_to_this_unit_yet": "Ainda não há departamentos adicionado nesta unidade",
+  "There_are_no_departments_available": "Não há departamentos disponíveis",
+  "There_are_no_monitors_added_to_this_unit_yet": "Ainda não há monitores adicionado nesta unidade",
+  "This_monitor_was_already_selected": "Este monitor já foi selecionado",
+  "Unit_removed": "Unidade Removida",
+  "view-livechat-monitor": "Visualizar Monitores de Livechat",
+  "view-livechat-unit": "Visualizar Unidades de Livechat",
+  "Waiting_queue": "Fila de espera",
+  "Waiting_queue_message": "Mensagem de fila de espera",
+  "Waiting_queue_message_description": "Mensagem que será exibida aos visitantes quando eles entrarem na fila de espera"
+}
diff --git a/ee/server/index.js b/ee/server/index.js
new file mode 100644
index 000000000000..81102e910545
--- /dev/null
+++ b/ee/server/index.js
@@ -0,0 +1,6 @@
+import '../app/models';
+import '../app/api-enterprise/server/index';
+import '../app/auditing/server/index';
+import '../app/canned-responses/server/index';
+import '../app/ldap-enterprise/server/index';
+import '../app/livechat-enterprise/server/index';
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index cfbcc744b4d9..3be08a149d94 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -1206,7 +1206,7 @@
   "Enter_Normal": "Modo normal (enviar com Enter)",
   "Enter_to": "Enter para",
   "Enter_your_E2E_password": "Digite sua senha E2E",
-  "Enterprise": "Empreendimento",
+  "Enterprise": "Enterprise",
   "Entertainment": "Diversão",
   "Error": "Erro",
   "error-action-not-allowed": "__action__ não é permitido",
diff --git a/server/main.js b/server/main.js
index 668302aeb400..72ffa6273ffd 100644
--- a/server/main.js
+++ b/server/main.js
@@ -74,3 +74,5 @@ import './routes/avatar';
 import './stream/messages';
 import './stream/rooms';
 import './stream/streamBroadcast';
+
+import '../ee/server';

From 55fd2d1068a107211ffad303b254509869a026b8 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Fri, 20 Mar 2020 19:59:18 -0300
Subject: [PATCH 043/223] Update presence package (#16786)

---
 .github/workflows/build_and_test.yml | 2 +-
 .meteor/versions                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 501d523aa7fa..6d0c06c5f360 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -245,7 +245,7 @@ jobs:
 
   build-image-pr:
     runs-on: ubuntu-latest
-    if: github.event_name == 'DEACTIVATED-pull_request'
+    if: github.event_name == 'pull_request'
 
     steps:
     - uses: actions/checkout@v1
diff --git a/.meteor/versions b/.meteor/versions
index f573d9fd4ab6..dd8bf4367eed 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -69,7 +69,7 @@ konecty:change-case@2.3.0
 konecty:delayed-task@1.0.0
 konecty:mongo-counter@0.0.5_3
 konecty:multiple-instances-status@1.1.0
-konecty:user-presence@2.6.1
+konecty:user-presence@2.6.3
 launch-screen@1.1.1
 less@2.8.0
 littledata:synced-cron@1.5.1

From caf630e993dabf375c5d4c6622e638e19105e271 Mon Sep 17 00:00:00 2001
From: Ashwani Yadav <ashyadavash@gmail.com>
Date: Sat, 21 Mar 2020 04:34:23 +0530
Subject: [PATCH 044/223] [FIX] Removed Reply in DM from livechat rooms
 (#16957)

---
 app/ui-utils/client/lib/MessageAction.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/ui-utils/client/lib/MessageAction.js b/app/ui-utils/client/lib/MessageAction.js
index 688838fd373c..5f201aa73e07 100644
--- a/app/ui-utils/client/lib/MessageAction.js
+++ b/app/ui-utils/client/lib/MessageAction.js
@@ -176,7 +176,7 @@ Meteor.startup(async function() {
 			if (subscription == null) {
 				return false;
 			}
-			if (room.t === 'd') {
+			if (room.t === 'd' || room.t === 'l') {
 				return false;
 			}
 			return true;

From ad176ef1fac698fc71b9d47c53e2fa0b3b7f7c42 Mon Sep 17 00:00:00 2001
From: Ashwani Yadav <ashyadavash@gmail.com>
Date: Sat, 21 Mar 2020 04:38:12 +0530
Subject: [PATCH 045/223] [NEW] Route to get updated roles after a date
 (#16610)

---
 app/api/server/v1/roles.js        | 17 +++++++++++++++++
 app/models/server/models/Roles.js |  8 ++++++++
 tests/end-to-end/api/13-roles.js  | 27 +++++++++++++++++++++++++++
 3 files changed, 52 insertions(+)

diff --git a/app/api/server/v1/roles.js b/app/api/server/v1/roles.js
index 22a0d543ce34..7772f80e29d7 100644
--- a/app/api/server/v1/roles.js
+++ b/app/api/server/v1/roles.js
@@ -13,6 +13,23 @@ API.v1.addRoute('roles.list', { authRequired: true }, {
 	},
 });
 
+API.v1.addRoute('roles.sync', { authRequired: true }, {
+	get() {
+		const { updatedSince } = this.queryParams;
+
+		if (isNaN(Date.parse(updatedSince))) {
+			throw new Meteor.Error('error-updatedSince-param-invalid', 'The "updatedSince" query parameter must be a valid date.');
+		}
+
+		return API.v1.success({
+			roles: {
+				update: Roles.findByUpdatedDate(new Date(updatedSince), { fields: API.v1.defaultFieldsToExclude }).fetch(),
+				remove: Roles.trashFindDeletedAfter(new Date(updatedSince)).fetch(),
+			},
+		});
+	},
+});
+
 API.v1.addRoute('roles.create', { authRequired: true }, {
 	post() {
 		check(this.bodyParams, {
diff --git a/app/models/server/models/Roles.js b/app/models/server/models/Roles.js
index a2e9fa3418f6..2715ab05d7c1 100644
--- a/app/models/server/models/Roles.js
+++ b/app/models/server/models/Roles.js
@@ -85,6 +85,14 @@ export class Roles extends Base {
 		return this.findOne(query, options);
 	}
 
+	findByUpdatedDate(updatedAfterDate, options) {
+		const query = {
+			_updatedAt: { $gte: new Date(updatedAfterDate) },
+		};
+
+		return this.find(query, options);
+	}
+
 	canAddUserToRole(uid, roleName, scope) {
 		const role = this.findOne({ _id: roleName }, { fields: { scope: 1 } });
 		if (!role) {
diff --git a/tests/end-to-end/api/13-roles.js b/tests/end-to-end/api/13-roles.js
index 26b867ee154a..b3a3b1611375 100644
--- a/tests/end-to-end/api/13-roles.js
+++ b/tests/end-to-end/api/13-roles.js
@@ -35,6 +35,33 @@ describe('[Roles]', function() {
 		});
 	});
 
+	describe('GET [/roles.sync]', () => {
+		it('should return an array of roles which are updated after updatedSice date when search by "updatedSince" query parameter', (done) => {
+			request.get(api('roles.sync?updatedSince=2018-11-27T13:52:01Z'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('roles');
+					expect(res.body.roles).to.have.property('update').and.to.be.an('array');
+					expect(res.body.roles).to.have.property('remove').and.to.be.an('array');
+				})
+				.end(done);
+		});
+
+		it('should return an error when updatedSince query parameter is not a valid ISODate string', (done) => {
+			request.get(api('roles.sync?updatedSince=fsafdf'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+				})
+				.end(done);
+		});
+	});
+
 	describe('POST [/roles.create]', () => {
 		it('should create a new role with Users scope', (done) => {
 			request.post(api('roles.create'))

From 187691801abee1953f252692df99b3bf326d40e7 Mon Sep 17 00:00:00 2001
From: Anton Kazarinov <askazarinov@gmail.com>
Date: Sat, 21 Mar 2020 04:11:15 +0500
Subject: [PATCH 046/223] fix(slack-bridge): messages doesn't send to slack
 after renaming channel (#16565)

---
 app/slackbridge/server/SlackAdapter.js | 33 +++++++++++++-------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/app/slackbridge/server/SlackAdapter.js b/app/slackbridge/server/SlackAdapter.js
index 7874a780b69f..a6d9268e1410 100644
--- a/app/slackbridge/server/SlackAdapter.js
+++ b/app/slackbridge/server/SlackAdapter.js
@@ -506,6 +506,7 @@ export default class SlackAdapter {
 	addSlackChannel(rocketChID, slackChID) {
 		const ch = this.getSlackChannel(rocketChID);
 		if (ch == null) {
+			logger.slack.debug('Added channel', { rocketChID, slackChID });
 			this.slackChannelRocketBotMembershipMap.set(rocketChID, { id: slackChID, family: slackChID.charAt(0) === 'C' ? 'channels' : 'groups' });
 		}
 	}
@@ -530,28 +531,28 @@ export default class SlackAdapter {
 
 	populateMembershipChannelMapByChannels() {
 		const channels = this.slackAPI.getChannels();
-		if (channels && channels.length > 0) {
-			for (const slackChannel of channels) {
-				const rocketchat_room = Rooms.findOneByName(slackChannel.name, { fields: { _id: 1 } });
-				if (rocketchat_room) {
-					if (slackChannel.is_member) {
-						this.addSlackChannel(rocketchat_room._id, slackChannel.id);
-					}
-				}
+		if (!channels || channels.length <= 0) {
+			return;
+		}
+
+		for (const slackChannel of channels) {
+			const rocketchat_room = Rooms.findOneByName(slackChannel.name, { fields: { _id: 1 } }) || Rooms.findOneByImportId(slackChannel.id, { fields: { _id: 1 } });
+			if (rocketchat_room && slackChannel.is_member) {
+				this.addSlackChannel(rocketchat_room._id, slackChannel.id);
 			}
 		}
 	}
 
 	populateMembershipChannelMapByGroups() {
 		const groups = this.slackAPI.getGroups();
-		if (groups && groups.length > 0) {
-			for (const slackGroup of groups) {
-				const rocketchat_room = Rooms.findOneByName(slackGroup.name, { fields: { _id: 1 } });
-				if (rocketchat_room) {
-					if (slackGroup.is_member) {
-						this.addSlackChannel(rocketchat_room._id, slackGroup.id);
-					}
-				}
+		if (!groups || groups.length <= 0) {
+			return;
+		}
+
+		for (const slackGroup of groups) {
+			const rocketchat_room = Rooms.findOneByName(slackGroup.name, { fields: { _id: 1 } }) || Rooms.findOneByImportId(slackGroup.id, { fields: { _id: 1 } });
+			if (rocketchat_room && slackGroup.is_member) {
+				this.addSlackChannel(rocketchat_room._id, slackGroup.id);
 			}
 		}
 	}

From b9591f75e2cc83a508f797eaca74ae231a4ea9e1 Mon Sep 17 00:00:00 2001
From: Rodriq <39289592+Rodriq@users.noreply.github.com>
Date: Sat, 21 Mar 2020 00:12:29 +0100
Subject: [PATCH 047/223] [FIX] Text formatted to remain within button even on
 screen resize  (#14136)

---
 app/theme/client/imports/general/base_old.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/theme/client/imports/general/base_old.css b/app/theme/client/imports/general/base_old.css
index 8be12ffeb98e..33c75af298e5 100644
--- a/app/theme/client/imports/general/base_old.css
+++ b/app/theme/client/imports/general/base_old.css
@@ -1521,6 +1521,7 @@ rc-old select,
 		}
 
 		.setting-action {
+			height: auto;
 			margin: 0 4px;
 		}
 

From 25d7e6e174c1d590bb1d7a2f6ed111e13540eb2a Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 20 Mar 2020 21:09:10 -0300
Subject: [PATCH 048/223] Update cypress to version 4.0.2 (#16685)

---
 package-lock.json | 728 ++++++++++++++++++++++++++++++----------------
 package.json      |   2 +-
 2 files changed, 485 insertions(+), 245 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bdb5822c96d0..2131987508a7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2846,6 +2846,15 @@
 			"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.3.0.tgz",
 			"integrity": "sha512-YAV5l6iVIWuileg5DOU/0NQ/23/AULEr8UblIUSF3OShPN8nWanGMdG0E6xFLyXT+KHvmvzhiQe0/ju3Tk7x8A=="
 		},
+		"@samverschueren/stream-to-observable": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz",
+			"integrity": "sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==",
+			"dev": true,
+			"requires": {
+				"any-observable": "^0.3.0"
+			}
+		},
 		"@settlin/spacebars-loader": {
 			"version": "1.0.7",
 			"resolved": "https://registry.npmjs.org/@settlin/spacebars-loader/-/spacebars-loader-1.0.7.tgz",
@@ -6825,6 +6834,12 @@
 				"entities": "^1.1.2"
 			}
 		},
+		"any-observable": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/any-observable/-/any-observable-0.3.0.tgz",
+			"integrity": "sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==",
+			"dev": true
+		},
 		"app-root-dir": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/app-root-dir/-/app-root-dir-1.0.2.tgz",
@@ -9792,13 +9807,10 @@
 			}
 		},
 		"cachedir": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/cachedir/-/cachedir-1.3.0.tgz",
-			"integrity": "sha512-O1ji32oyON9laVPJL1IZ5bmwd2cB46VfpxkDequezH+15FDzzVddEyrGEeX4WusDSqKxdyFdDQDEG1yo1GoWkg==",
-			"dev": true,
-			"requires": {
-				"os-homedir": "^1.0.1"
-			}
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz",
+			"integrity": "sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==",
+			"dev": true
 		},
 		"call-me-maybe": {
 			"version": "1.0.1",
@@ -10249,12 +10261,6 @@
 				"restore-cursor": "^3.1.0"
 			}
 		},
-		"cli-spinners": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-0.1.2.tgz",
-			"integrity": "sha1-u3ZNiOGF+54eaiofGXcjGPYF4xw=",
-			"dev": true
-		},
 		"cli-table3": {
 			"version": "0.5.1",
 			"resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz",
@@ -11837,146 +11843,243 @@
 			"dev": true
 		},
 		"cypress": {
-			"version": "3.8.3",
-			"resolved": "https://registry.npmjs.org/cypress/-/cypress-3.8.3.tgz",
-			"integrity": "sha512-I9L/d+ilTPPA4vq3NC1OPKmw7jJIpMKNdyfR8t1EXYzYCjyqbc59migOm1YSse/VRbISLJ+QGb5k4Y3bz2lkYw==",
+			"version": "4.0.2",
+			"resolved": "https://registry.npmjs.org/cypress/-/cypress-4.0.2.tgz",
+			"integrity": "sha512-WRzxOoSd+TxyXKa7Zi9orz3ii5VW7yhhVYstCU+EpOKfPan9x5Ww2Clucmy4H/W0GHUYAo7GYFZRD33ZCSNBQA==",
 			"dev": true,
 			"requires": {
 				"@cypress/listr-verbose-renderer": "0.4.1",
 				"@cypress/xvfb": "1.2.4",
 				"@types/sizzle": "2.3.2",
 				"arch": "2.1.1",
-				"bluebird": "3.5.0",
-				"cachedir": "1.3.0",
-				"chalk": "2.4.2",
+				"bluebird": "3.7.2",
+				"cachedir": "2.3.0",
+				"chalk": "3.0.0",
 				"check-more-types": "2.24.0",
-				"commander": "2.15.1",
+				"commander": "4.1.0",
 				"common-tags": "1.8.0",
-				"debug": "3.2.6",
+				"debug": "4.1.1",
 				"eventemitter2": "4.1.2",
-				"execa": "0.10.0",
+				"execa": "3.3.0",
 				"executable": "4.1.1",
 				"extract-zip": "1.6.7",
-				"fs-extra": "5.0.0",
-				"getos": "3.1.1",
-				"is-ci": "1.2.1",
+				"fs-extra": "8.1.0",
+				"getos": "3.1.4",
+				"is-ci": "2.0.0",
 				"is-installed-globally": "0.1.0",
 				"lazy-ass": "1.6.0",
-				"listr": "0.12.0",
+				"listr": "0.14.3",
 				"lodash": "4.17.15",
-				"log-symbols": "2.2.0",
+				"log-symbols": "3.0.0",
 				"minimist": "1.2.0",
 				"moment": "2.24.0",
-				"ramda": "0.24.1",
+				"ramda": "0.26.1",
 				"request": "2.88.0",
 				"request-progress": "3.0.0",
-				"supports-color": "5.5.0",
+				"supports-color": "7.1.0",
 				"tmp": "0.1.0",
-				"untildify": "3.0.3",
+				"untildify": "4.0.0",
 				"url": "0.11.0",
 				"yauzl": "2.10.0"
 			},
 			"dependencies": {
 				"ansi-styles": {
-					"version": "3.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-					"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+					"version": "4.2.1",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+					"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
 					"dev": true,
 					"requires": {
-						"color-convert": "^1.9.0"
+						"@types/color-name": "^1.1.1",
+						"color-convert": "^2.0.1"
 					}
 				},
+				"async": {
+					"version": "3.1.1",
+					"resolved": "https://registry.npmjs.org/async/-/async-3.1.1.tgz",
+					"integrity": "sha512-X5Dj8hK1pJNC2Wzo2Rcp9FBVdJMGRR/S7V+lH46s8GVFhtbo5O4Le5GECCF/8PISVdkUA6mMPvgz7qTTD1rf1g==",
+					"dev": true
+				},
 				"bluebird": {
-					"version": "3.5.0",
-					"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
-					"integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw=",
+					"version": "3.7.2",
+					"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+					"integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
 					"dev": true
 				},
 				"chalk": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+					"integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
 					"dev": true,
 					"requires": {
-						"ansi-styles": "^3.2.1",
-						"escape-string-regexp": "^1.0.5",
-						"supports-color": "^5.3.0"
+						"ansi-styles": "^4.1.0",
+						"supports-color": "^7.1.0"
 					}
 				},
+				"ci-info": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+					"integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+					"dev": true
+				},
 				"color-convert": {
-					"version": "1.9.3",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-					"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
 					"dev": true,
 					"requires": {
-						"color-name": "1.1.3"
+						"color-name": "~1.1.4"
 					}
 				},
-				"color-name": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-					"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-					"dev": true
-				},
 				"commander": {
-					"version": "2.15.1",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
-					"integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
+					"version": "4.1.0",
+					"resolved": "https://registry.npmjs.org/commander/-/commander-4.1.0.tgz",
+					"integrity": "sha512-NIQrwvv9V39FHgGFm36+U9SMQzbiHvU79k+iADraJTpmrFFfx7Ds0IvDoAdZsDrknlkRk14OYoWXb57uTh7/sw==",
 					"dev": true
 				},
+				"cross-spawn": {
+					"version": "7.0.1",
+					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz",
+					"integrity": "sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==",
+					"dev": true,
+					"requires": {
+						"path-key": "^3.1.0",
+						"shebang-command": "^2.0.0",
+						"which": "^2.0.1"
+					}
+				},
 				"debug": {
-					"version": "3.2.6",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+					"version": "4.1.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
 					"dev": true,
 					"requires": {
 						"ms": "^2.1.1"
 					}
 				},
-				"fd-slicer": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-					"integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+				"execa": {
+					"version": "3.3.0",
+					"resolved": "https://registry.npmjs.org/execa/-/execa-3.3.0.tgz",
+					"integrity": "sha512-j5Vit5WZR/cbHlqU97+qcnw9WHRCIL4V1SVe75VcHcD1JRBdt8fv0zw89b7CQHQdUHTt2VjuhcF5ibAgVOxqpg==",
 					"dev": true,
 					"requires": {
-						"pend": "~1.2.0"
+						"cross-spawn": "^7.0.0",
+						"get-stream": "^5.0.0",
+						"human-signals": "^1.1.1",
+						"is-stream": "^2.0.0",
+						"merge-stream": "^2.0.0",
+						"npm-run-path": "^4.0.0",
+						"onetime": "^5.1.0",
+						"p-finally": "^2.0.0",
+						"signal-exit": "^3.0.2",
+						"strip-final-newline": "^2.0.0"
 					}
 				},
-				"fs-extra": {
-					"version": "5.0.0",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
-					"integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
+				"get-stream": {
+					"version": "5.1.0",
+					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
+					"integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
 					"dev": true,
 					"requires": {
-						"graceful-fs": "^4.1.2",
-						"jsonfile": "^4.0.0",
-						"universalify": "^0.1.0"
+						"pump": "^3.0.0"
 					}
 				},
 				"getos": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/getos/-/getos-3.1.1.tgz",
-					"integrity": "sha512-oUP1rnEhAr97rkitiszGP9EgDVYnmchgFzfqRzSkgtfv7ai6tEi7Ko8GgjNXts7VLWEqrTWyhsOKLe5C5b/Zkg==",
+					"version": "3.1.4",
+					"resolved": "https://registry.npmjs.org/getos/-/getos-3.1.4.tgz",
+					"integrity": "sha512-UORPzguEB/7UG5hqiZai8f0vQ7hzynMQyJLxStoQ8dPGAcmgsfXOPA4iE/fGtweHYkK+z4zc9V0g+CIFRf5HYw==",
 					"dev": true,
 					"requires": {
-						"async": "2.6.1"
+						"async": "^3.1.0"
 					}
 				},
-				"jsonfile": {
+				"has-flag": {
 					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-					"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+					"dev": true
+				},
+				"is-ci": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
+					"integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
 					"dev": true,
 					"requires": {
-						"graceful-fs": "^4.1.6"
+						"ci-info": "^2.0.0"
 					}
 				},
+				"is-stream": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
+					"integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
+					"dev": true
+				},
 				"lodash": {
 					"version": "4.17.15",
 					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
 					"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
 					"dev": true
 				},
+				"log-symbols": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
+					"integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
+					"dev": true,
+					"requires": {
+						"chalk": "^2.4.2"
+					},
+					"dependencies": {
+						"ansi-styles": {
+							"version": "3.2.1",
+							"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+							"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+							"dev": true,
+							"requires": {
+								"color-convert": "^1.9.0"
+							}
+						},
+						"chalk": {
+							"version": "2.4.2",
+							"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+							"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+							"dev": true,
+							"requires": {
+								"ansi-styles": "^3.2.1",
+								"escape-string-regexp": "^1.0.5",
+								"supports-color": "^5.3.0"
+							}
+						},
+						"color-convert": {
+							"version": "1.9.3",
+							"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+							"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+							"dev": true,
+							"requires": {
+								"color-name": "1.1.3"
+							}
+						},
+						"color-name": {
+							"version": "1.1.3",
+							"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+							"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+							"dev": true
+						},
+						"has-flag": {
+							"version": "3.0.0",
+							"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+							"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+							"dev": true
+						},
+						"supports-color": {
+							"version": "5.5.0",
+							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+							"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+							"dev": true,
+							"requires": {
+								"has-flag": "^3.0.0"
+							}
+						}
+					}
+				},
 				"minimist": {
 					"version": "1.2.0",
 					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
@@ -11995,6 +12098,37 @@
 					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
 					"dev": true
 				},
+				"npm-run-path": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+					"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+					"dev": true,
+					"requires": {
+						"path-key": "^3.0.0"
+					}
+				},
+				"p-finally": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz",
+					"integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==",
+					"dev": true
+				},
+				"path-key": {
+					"version": "3.1.1",
+					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+					"dev": true
+				},
+				"pump": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+					"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+					"dev": true,
+					"requires": {
+						"end-of-stream": "^1.1.0",
+						"once": "^1.3.1"
+					}
+				},
 				"punycode": {
 					"version": "1.3.2",
 					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
@@ -12002,27 +12136,33 @@
 					"dev": true
 				},
 				"ramda": {
-					"version": "0.24.1",
-					"resolved": "https://registry.npmjs.org/ramda/-/ramda-0.24.1.tgz",
-					"integrity": "sha1-w7d1UZfzW43DUCIoJixMkd22uFc=",
+					"version": "0.26.1",
+					"resolved": "https://registry.npmjs.org/ramda/-/ramda-0.26.1.tgz",
+					"integrity": "sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ==",
 					"dev": true
 				},
-				"request-progress": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/request-progress/-/request-progress-3.0.0.tgz",
-					"integrity": "sha1-TKdUCBx/7GP1BeT6qCWqBs1mnb4=",
+				"shebang-command": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
 					"dev": true,
 					"requires": {
-						"throttleit": "^1.0.0"
+						"shebang-regex": "^3.0.0"
 					}
 				},
+				"shebang-regex": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+					"dev": true
+				},
 				"supports-color": {
-					"version": "5.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+					"version": "7.1.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+					"integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
 					"dev": true,
 					"requires": {
-						"has-flag": "^3.0.0"
+						"has-flag": "^4.0.0"
 					}
 				},
 				"url": {
@@ -12035,14 +12175,13 @@
 						"querystring": "0.2.0"
 					}
 				},
-				"yauzl": {
-					"version": "2.10.0",
-					"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-					"integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+				"which": {
+					"version": "2.0.2",
+					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
 					"dev": true,
 					"requires": {
-						"buffer-crc32": "~0.2.3",
-						"fd-slicer": "~1.1.0"
+						"isexe": "^2.0.0"
 					}
 				}
 			}
@@ -14232,6 +14371,17 @@
 				"debug": "2.6.9",
 				"mkdirp": "0.5.1",
 				"yauzl": "2.4.1"
+			},
+			"dependencies": {
+				"yauzl": {
+					"version": "2.4.1",
+					"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
+					"integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
+					"dev": true,
+					"requires": {
+						"fd-slicer": "~1.0.1"
+					}
+				}
 			}
 		},
 		"extsprintf": {
@@ -14845,6 +14995,34 @@
 			"resolved": "https://registry.npmjs.org/fs-copy-file-sync/-/fs-copy-file-sync-1.1.1.tgz",
 			"integrity": "sha512-2QY5eeqVv4m2PfyMiEuy9adxNP+ajf+8AR05cEi+OAzPcOj90hvFImeZhTmKLBgSd9EvG33jsD7ZRxsx9dThkQ=="
 		},
+		"fs-extra": {
+			"version": "8.1.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+			"integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+			"dev": true,
+			"requires": {
+				"graceful-fs": "^4.2.0",
+				"jsonfile": "^4.0.0",
+				"universalify": "^0.1.0"
+			},
+			"dependencies": {
+				"graceful-fs": {
+					"version": "4.2.3",
+					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
+					"integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
+					"dev": true
+				},
+				"jsonfile": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+					"integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
+					"dev": true,
+					"requires": {
+						"graceful-fs": "^4.1.6"
+					}
+				}
+			}
+		},
 		"fs-minipass": {
 			"version": "1.2.6",
 			"resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz",
@@ -16666,6 +16844,12 @@
 				}
 			}
 		},
+		"human-signals": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
+			"integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
+			"dev": true
+		},
 		"husky": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/husky/-/husky-1.2.0.tgz",
@@ -17704,6 +17888,15 @@
 			"integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=",
 			"dev": true
 		},
+		"is-observable": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/is-observable/-/is-observable-1.1.0.tgz",
+			"integrity": "sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==",
+			"dev": true,
+			"requires": {
+				"symbol-observable": "^1.1.0"
+			}
+		},
 		"is-path-inside": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
@@ -18748,56 +18941,20 @@
 			}
 		},
 		"listr": {
-			"version": "0.12.0",
-			"resolved": "https://registry.npmjs.org/listr/-/listr-0.12.0.tgz",
-			"integrity": "sha1-a84sD1YD+klYDqF81qAMwOX6RRo=",
+			"version": "0.14.3",
+			"resolved": "https://registry.npmjs.org/listr/-/listr-0.14.3.tgz",
+			"integrity": "sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==",
 			"dev": true,
 			"requires": {
-				"chalk": "^1.1.3",
-				"cli-truncate": "^0.2.1",
-				"figures": "^1.7.0",
-				"indent-string": "^2.1.0",
+				"@samverschueren/stream-to-observable": "^0.3.0",
+				"is-observable": "^1.1.0",
 				"is-promise": "^2.1.0",
 				"is-stream": "^1.1.0",
 				"listr-silent-renderer": "^1.1.1",
-				"listr-update-renderer": "^0.2.0",
-				"listr-verbose-renderer": "^0.4.0",
-				"log-symbols": "^1.0.2",
-				"log-update": "^1.0.2",
-				"ora": "^0.2.3",
-				"p-map": "^1.1.1",
-				"rxjs": "^5.0.0-beta.11",
-				"stream-to-observable": "^0.1.0",
-				"strip-ansi": "^3.0.1"
-			},
-			"dependencies": {
-				"indent-string": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-					"integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-					"dev": true,
-					"requires": {
-						"repeating": "^2.0.0"
-					}
-				},
-				"log-symbols": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
-					"integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
-					"dev": true,
-					"requires": {
-						"chalk": "^1.0.0"
-					}
-				},
-				"rxjs": {
-					"version": "5.5.12",
-					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz",
-					"integrity": "sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==",
-					"dev": true,
-					"requires": {
-						"symbol-observable": "1.0.1"
-					}
-				}
+				"listr-update-renderer": "^0.5.0",
+				"listr-verbose-renderer": "^0.5.0",
+				"p-map": "^2.0.0",
+				"rxjs": "^6.3.3"
 			}
 		},
 		"listr-silent-renderer": {
@@ -18807,9 +18964,9 @@
 			"dev": true
 		},
 		"listr-update-renderer": {
-			"version": "0.2.0",
-			"resolved": "https://registry.npmjs.org/listr-update-renderer/-/listr-update-renderer-0.2.0.tgz",
-			"integrity": "sha1-yoDhd5tOcCZoB+ju0a1qvjmFUPk=",
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz",
+			"integrity": "sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA==",
 			"dev": true,
 			"requires": {
 				"chalk": "^1.1.3",
@@ -18818,7 +18975,7 @@
 				"figures": "^1.7.0",
 				"indent-string": "^3.0.0",
 				"log-symbols": "^1.0.2",
-				"log-update": "^1.0.2",
+				"log-update": "^2.3.0",
 				"strip-ansi": "^3.0.1"
 			},
 			"dependencies": {
@@ -18834,46 +18991,102 @@
 			}
 		},
 		"listr-verbose-renderer": {
-			"version": "0.4.1",
-			"resolved": "https://registry.npmjs.org/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz",
-			"integrity": "sha1-ggb0z21S3cWCfl/RSYng6WWTOjU=",
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz",
+			"integrity": "sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==",
 			"dev": true,
 			"requires": {
-				"chalk": "^1.1.3",
-				"cli-cursor": "^1.0.2",
+				"chalk": "^2.4.1",
+				"cli-cursor": "^2.1.0",
 				"date-fns": "^1.27.2",
-				"figures": "^1.7.0"
+				"figures": "^2.0.0"
 			},
 			"dependencies": {
+				"ansi-styles": {
+					"version": "3.2.1",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+					"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+					"dev": true,
+					"requires": {
+						"color-convert": "^1.9.0"
+					}
+				},
+				"chalk": {
+					"version": "2.4.2",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+					"dev": true,
+					"requires": {
+						"ansi-styles": "^3.2.1",
+						"escape-string-regexp": "^1.0.5",
+						"supports-color": "^5.3.0"
+					}
+				},
 				"cli-cursor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
-					"integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+					"integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
 					"dev": true,
 					"requires": {
-						"restore-cursor": "^1.0.1"
+						"restore-cursor": "^2.0.0"
 					}
 				},
+				"color-convert": {
+					"version": "1.9.3",
+					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+					"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+					"dev": true,
+					"requires": {
+						"color-name": "1.1.3"
+					}
+				},
+				"color-name": {
+					"version": "1.1.3",
+					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+					"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+					"dev": true
+				},
 				"date-fns": {
 					"version": "1.30.1",
 					"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz",
 					"integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==",
 					"dev": true
 				},
+				"figures": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+					"integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+					"dev": true,
+					"requires": {
+						"escape-string-regexp": "^1.0.5"
+					}
+				},
 				"onetime": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
-					"integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-					"dev": true
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+					"integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+					"dev": true,
+					"requires": {
+						"mimic-fn": "^1.0.0"
+					}
 				},
 				"restore-cursor": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
-					"integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+					"integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
 					"dev": true,
 					"requires": {
-						"exit-hook": "^1.0.0",
-						"onetime": "^1.0.0"
+						"onetime": "^2.0.0",
+						"signal-exit": "^3.0.2"
+					}
+				},
+				"supports-color": {
+					"version": "5.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^3.0.0"
 					}
 				}
 			}
@@ -19192,44 +19405,89 @@
 			}
 		},
 		"log-update": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz",
-			"integrity": "sha1-GZKfZMQJPS0ucHWh2tivWcKWuNE=",
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz",
+			"integrity": "sha1-iDKP19HOeTiykoN0bwsbwSayRwg=",
 			"dev": true,
 			"requires": {
-				"ansi-escapes": "^1.0.0",
-				"cli-cursor": "^1.0.2"
+				"ansi-escapes": "^3.0.0",
+				"cli-cursor": "^2.0.0",
+				"wrap-ansi": "^3.0.1"
 			},
 			"dependencies": {
 				"ansi-escapes": {
-					"version": "1.4.0",
-					"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
-					"integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=",
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+					"integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
+					"dev": true
+				},
+				"ansi-regex": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
 					"dev": true
 				},
 				"cli-cursor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
-					"integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+					"integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
 					"dev": true,
 					"requires": {
-						"restore-cursor": "^1.0.1"
+						"restore-cursor": "^2.0.0"
 					}
 				},
-				"onetime": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
-					"integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
+				"is-fullwidth-code-point": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+					"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
 					"dev": true
 				},
+				"onetime": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+					"integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+					"dev": true,
+					"requires": {
+						"mimic-fn": "^1.0.0"
+					}
+				},
 				"restore-cursor": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
-					"integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+					"integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
 					"dev": true,
 					"requires": {
-						"exit-hook": "^1.0.0",
-						"onetime": "^1.0.0"
+						"onetime": "^2.0.0",
+						"signal-exit": "^3.0.2"
+					}
+				},
+				"string-width": {
+					"version": "2.1.1",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+					"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+					"dev": true,
+					"requires": {
+						"is-fullwidth-code-point": "^2.0.0",
+						"strip-ansi": "^4.0.0"
+					}
+				},
+				"strip-ansi": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+					"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+					"dev": true,
+					"requires": {
+						"ansi-regex": "^3.0.0"
+					}
+				},
+				"wrap-ansi": {
+					"version": "3.0.1",
+					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz",
+					"integrity": "sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo=",
+					"dev": true,
+					"requires": {
+						"string-width": "^2.1.1",
+						"strip-ansi": "^4.0.0"
 					}
 				}
 			}
@@ -22042,45 +22300,6 @@
 				}
 			}
 		},
-		"ora": {
-			"version": "0.2.3",
-			"resolved": "https://registry.npmjs.org/ora/-/ora-0.2.3.tgz",
-			"integrity": "sha1-N1J9Igrc1Tw5tzVx11QVbV22V6Q=",
-			"dev": true,
-			"requires": {
-				"chalk": "^1.1.1",
-				"cli-cursor": "^1.0.2",
-				"cli-spinners": "^0.1.2",
-				"object-assign": "^4.0.1"
-			},
-			"dependencies": {
-				"cli-cursor": {
-					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
-					"integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
-					"dev": true,
-					"requires": {
-						"restore-cursor": "^1.0.1"
-					}
-				},
-				"onetime": {
-					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
-					"integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
-					"dev": true
-				},
-				"restore-cursor": {
-					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
-					"integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
-					"dev": true,
-					"requires": {
-						"exit-hook": "^1.0.0",
-						"onetime": "^1.0.0"
-					}
-				}
-			}
-		},
 		"original": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
@@ -22180,9 +22399,9 @@
 			}
 		},
 		"p-map": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
-			"integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+			"integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
 			"dev": true
 		},
 		"p-queue": {
@@ -25429,6 +25648,15 @@
 				"uuid": "^3.3.2"
 			}
 		},
+		"request-progress": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/request-progress/-/request-progress-3.0.0.tgz",
+			"integrity": "sha1-TKdUCBx/7GP1BeT6qCWqBs1mnb4=",
+			"dev": true,
+			"requires": {
+				"throttleit": "^1.0.0"
+			}
+		},
 		"request-promise": {
 			"version": "4.2.4",
 			"resolved": "https://registry.npmjs.org/request-promise/-/request-promise-4.2.4.tgz",
@@ -26773,12 +27001,6 @@
 				"stream-to": "~0.2.0"
 			}
 		},
-		"stream-to-observable": {
-			"version": "0.1.0",
-			"resolved": "https://registry.npmjs.org/stream-to-observable/-/stream-to-observable-0.1.0.tgz",
-			"integrity": "sha1-Rb8dny19wJvtgfHDB8Qw5ouEz/4=",
-			"dev": true
-		},
 		"streamsearch": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz",
@@ -27120,6 +27342,12 @@
 			"integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
 			"dev": true
 		},
+		"strip-final-newline": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+			"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+			"dev": true
+		},
 		"strip-indent": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
@@ -27707,9 +27935,9 @@
 			}
 		},
 		"symbol-observable": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
-			"integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=",
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
+			"integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
 			"dev": true
 		},
 		"symbol-tree": {
@@ -28846,9 +29074,9 @@
 			}
 		},
 		"untildify": {
-			"version": "3.0.3",
-			"resolved": "https://registry.npmjs.org/untildify/-/untildify-3.0.3.tgz",
-			"integrity": "sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==",
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
+			"integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
 			"dev": true
 		},
 		"upath": {
@@ -29886,12 +30114,24 @@
 			}
 		},
 		"yauzl": {
-			"version": "2.4.1",
-			"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
-			"integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
+			"version": "2.10.0",
+			"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+			"integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
 			"dev": true,
 			"requires": {
-				"fd-slicer": "~1.0.1"
+				"buffer-crc32": "~0.2.3",
+				"fd-slicer": "~1.1.0"
+			},
+			"dependencies": {
+				"fd-slicer": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+					"integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+					"dev": true,
+					"requires": {
+						"pend": "~1.2.0"
+					}
+				}
 			}
 		},
 		"zip-stream": {
diff --git a/package.json b/package.json
index c7a9d3512673..823a7669080c 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,7 @@
 		"babel-polyfill": "^6.26.0",
 		"chai": "^4.2.0",
 		"chai-datetime": "^1.5.0",
-		"cypress": "^3.8.2",
+		"cypress": "^4.0.2",
 		"emojione-assets": "^4.5.0",
 		"eslint": "^6.7.2",
 		"eslint-plugin-import": "^2.19.1",

From 9c7132149ba9223721ae4df5c2423073a30ed3c5 Mon Sep 17 00:00:00 2001
From: Roman Yakovenko <rm.yakovenko@gmail.com>
Date: Sat, 21 Mar 2020 02:09:39 +0200
Subject: [PATCH 049/223] [FIX] users.setStatus and user from params (#16128)

---
 app/api/server/v1/users.js       |  2 +-
 tests/end-to-end/api/01-users.js | 81 ++++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/app/api/server/v1/users.js b/app/api/server/v1/users.js
index 18fcb5c8ddbd..5570517c9c7d 100644
--- a/app/api/server/v1/users.js
+++ b/app/api/server/v1/users.js
@@ -409,7 +409,7 @@ API.v1.addRoute('users.setStatus', { authRequired: true }, {
 			if (this.bodyParams.status) {
 				const validStatus = ['online', 'away', 'offline', 'busy'];
 				if (validStatus.includes(this.bodyParams.status)) {
-					Meteor.users.update(this.userId, {
+					Meteor.users.update(user._id, {
 						$set: {
 							status: this.bodyParams.status,
 							statusDefault: this.bodyParams.status,
diff --git a/tests/end-to-end/api/01-users.js b/tests/end-to-end/api/01-users.js
index 10c835dcaf39..8c6411d0f80f 100644
--- a/tests/end-to-end/api/01-users.js
+++ b/tests/end-to-end/api/01-users.js
@@ -1738,6 +1738,87 @@ describe('[Users]', function() {
 		});
 	});
 
+	describe('[/users.setStatus]', () => {
+		let user;
+		before((done) => {
+			const username = `user.test.${ Date.now() }`;
+			const email = `${ username }@rocket.chat`;
+			request.post(api('users.create'))
+				.set(credentials)
+				.send({ email, name: username, username, password })
+				.end((err, res) => {
+					user = res.body.user;
+					done();
+				});
+		});
+		let userCredentials;
+		before((done) => {
+			request.post(api('login'))
+				.send({
+					user: user.username,
+					password,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					userCredentials = {};
+					userCredentials['X-Auth-Token'] = res.body.data.authToken;
+					userCredentials['X-User-Id'] = res.body.data.userId;
+				})
+				.end(done);
+		});
+		before((done) => {
+			updatePermission('edit-other-user-info', ['admin', 'user']).then(done);
+		});
+		after((done) => {
+			request.post(api('users.delete')).set(credentials).send({
+				userId: user._id,
+			}).end(() => updatePermission('edit-other-user-info', ['admin']).then(done));
+			user = undefined;
+		});
+		it('should set other user status to busy', (done) => {
+			const testUsername = `testuserdelete${ +new Date() }`;
+			let targetUser;
+			request.post(api('users.register'))
+				.set(credentials)
+				.send({
+					email: `${ testUsername }.@teste.com`,
+					username: `${ testUsername }test`,
+					name: testUsername,
+					pass: password,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					targetUser = res.body.user;
+				})
+				.end(() => {
+					request.post(api('users.setStatus'))
+						.set(userCredentials)
+						.send({
+							status: 'busy',
+							message: '',
+							userId: targetUser._id,
+						})
+						.expect('Content-Type', 'application/json')
+						.expect(200)
+						.expect((res) => {
+							expect(res.body).to.have.property('success', true);
+						})
+						.end(() => {
+							request.get(api(`users.getStatus?userId=${ targetUser._id }`))
+								.set(userCredentials)
+								.expect('Content-Type', 'application/json')
+								.expect(200)
+								.expect((res) => {
+									expect(res.body).to.have.property('status', 'busy');
+								})
+								.end(done);
+						});
+				});
+		});
+	});
+
 	describe('[/users.removeOtherTokens]', () => {
 		let user;
 		let userCredentials;

From cf69e43236b1e8344b107a774ddd90a32203e85e Mon Sep 17 00:00:00 2001
From: Nikhil Babu <31701437+Nikhil713@users.noreply.github.com>
Date: Sat, 21 Mar 2020 05:42:37 +0530
Subject: [PATCH 050/223] [FIX] Display user status along with icon (#16875)

---
 app/theme/client/imports/components/header.css | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/theme/client/imports/components/header.css b/app/theme/client/imports/components/header.css
index 3ef3fdc1dc8b..21648b21ae4b 100644
--- a/app/theme/client/imports/components/header.css
+++ b/app/theme/client/imports/components/header.css
@@ -412,10 +412,6 @@
 
 @media (width <= 500px) {
 	.rc-header {
-		&__visual-status {
-			display: none;
-		}
-
 		&__block {
 			margin: 0 0.25rem;
 		}

From 285837634ccf73e21b858a9fb212c510556d32f2 Mon Sep 17 00:00:00 2001
From: Ashwani Yadav <ashyadavash@gmail.com>
Date: Sat, 21 Mar 2020 05:51:23 +0530
Subject: [PATCH 051/223] Fixed translate variable in ArchiveRoom Modal
 (#16310)

---
 app/channel-settings/client/views/channelSettings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/channel-settings/client/views/channelSettings.js b/app/channel-settings/client/views/channelSettings.js
index 0075d457a1be..1936d2a2066b 100644
--- a/app/channel-settings/client/views/channelSettings.js
+++ b/app/channel-settings/client/views/channelSettings.js
@@ -481,7 +481,7 @@ Template.channelSettingsEditing.onCreated(function() {
 							const action = value ? 'archiveRoom' : 'unarchiveRoom';
 							return resolve(call(action, room._id).then(() => {
 								modal.open({
-									title: value ? t('Room_archived') : t('Room_has_been_archived'),
+									title: value ? t('Room_archived') : t('Room_unarchived'),
 									text: value ? t('Room_has_been_archived') : t('Room_has_been_unarchived'),
 									type: 'success',
 									timer: 2000,

From ed091d33fb20135f2e8d78f3d5c6dd6b4cc25374 Mon Sep 17 00:00:00 2001
From: Ashwani Yadav <ashyadavash@gmail.com>
Date: Sat, 21 Mar 2020 05:52:26 +0530
Subject: [PATCH 052/223] Redirected to home when a room has been deleted
 instead of getting broken link(blank page) of deleted room (#16227)

---
 app/ui-utils/client/lib/ChannelActions.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/ui-utils/client/lib/ChannelActions.js b/app/ui-utils/client/lib/ChannelActions.js
index fe5c1fddd45e..4988f2790854 100644
--- a/app/ui-utils/client/lib/ChannelActions.js
+++ b/app/ui-utils/client/lib/ChannelActions.js
@@ -84,6 +84,9 @@ export function erase(rid) {
 		html: false,
 	}, async () => {
 		await call('eraseRoom', rid);
+		if (['channel', 'group', 'direct'].includes(FlowRouter.getRouteName()) && (Session.get('openedRoom') === rid)) {
+			FlowRouter.go('home');
+		}
 		modal.open({
 			title: t('Deleted'),
 			text: t('Room_has_been_deleted'),

From 1f6cae29ee5118d088e7ad284821e0f57094264e Mon Sep 17 00:00:00 2001
From: Joachim Schirrmacher <joachimschirrmacher@gmail.com>
Date: Sat, 21 Mar 2020 01:40:03 +0100
Subject: [PATCH 053/223] [FIX] Explicitly set text of confirmation button
 (#16138)

---
 app/otr/client/rocketchat.otr.room.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/otr/client/rocketchat.otr.room.js b/app/otr/client/rocketchat.otr.room.js
index 35c2304bbfb9..2747f625d180 100644
--- a/app/otr/client/rocketchat.otr.room.js
+++ b/app/otr/client/rocketchat.otr.room.js
@@ -260,6 +260,7 @@ OTR.Room = class {
 						title: TAPi18n.__('OTR'),
 						text: TAPi18n.__('Username_ended_the_OTR_session', { username: user.username }),
 						html: true,
+						confirmButtonText: TAPi18n.__('Ok'),
 					});
 				}
 				break;

From 039884c42100a500e17b98265f898f5cdfed2f66 Mon Sep 17 00:00:00 2001
From: ritwizsinha <43509699+ritwizsinha@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:22:06 +0530
Subject: [PATCH 054/223] Adding margin to click to load text (#16210)

---
 app/message-attachments/client/messageAttachment.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/message-attachments/client/messageAttachment.html b/app/message-attachments/client/messageAttachment.html
index 5e0c4986972b..d21442f49ad7 100644
--- a/app/message-attachments/client/messageAttachment.html
+++ b/app/message-attachments/client/messageAttachment.html
@@ -105,8 +105,10 @@
 						</figure>
 					{{else}}
 						<div class="image-to-download" data-url="{{image_url}}">
-							<i class="icon-picture"></i>
+
+							<i class="icon-picture rc-input__wrapper"></i>
 							<div>{{_ "Click_to_load"}}</div>
+
 						</div>
 					{{/if}}
 					</div>

From 2152a560adde8d7e6a8af708d4ba6407c1ec501d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20=C3=81lvarez?= <ialvarezpereira@gmail.com>
Date: Sat, 21 Mar 2020 01:56:13 +0100
Subject: [PATCH 055/223] Add some missing ES translations (#16120)

---
 packages/rocketchat-i18n/i18n/es.i18n.json | 40 +++++++++++++++++++++-
 1 file changed, 39 insertions(+), 1 deletion(-)

diff --git a/packages/rocketchat-i18n/i18n/es.i18n.json b/packages/rocketchat-i18n/i18n/es.i18n.json
index 8d96a5d3dbfe..126a75c65397 100644
--- a/packages/rocketchat-i18n/i18n/es.i18n.json
+++ b/packages/rocketchat-i18n/i18n/es.i18n.json
@@ -246,6 +246,7 @@
   "Advocacy": "Abogacía",
   "After_OAuth2_authentication_users_will_be_redirected_to_this_URL": "Después de la autenticación OAuth2, los usuarios serán redirigidos a esta URL",
   "Agent": "Agente",
+  "Agent_Info": "Info de agente",
   "Agents": "# de Agentes",
   "Agent_added": "Agente agregado",
   "Agent_removed": "Agente eliminado",
@@ -320,6 +321,12 @@
   "API_GitHub_Enterprise_URL": "URL del servidor",
   "API_GitHub_Enterprise_URL_Description": "Ejemplo: http://domain.com (sin incluir la diagonal final)",
   "API_Gitlab_URL": "URL de GitLab",
+  "API_Personal_Access_Token_Name": "Nombre de Token de Acceso Personal",
+  "API_Personal_Access_Tokens_To_REST_API": "Token de acceso personal a API REST",
+  "API_Personal_Access_Tokens_Remove_Modal": "¿Estás seguro que quieres eliminar este token de acceso personal?",
+  "API_Personal_Access_Token_Generated": "Token de Acceso Personal generado con éxito",
+  "API_Personal_Access_Token_Generated_Text_Token_s_UserId_s": "Por favor guarda cuidadosamente tu token porque no podrás visualizarlo después. <br/>Token: <strong>__token__</strong><br/>Tu ID de usuario: <strong>__userId__</strong>",
+  "API_Personal_Access_Tokens_Regenerate_Modal": "Si perdiste tu token, puedes volver a generarlo, pero recuerda que las aplicaciones que lo usen tendrán que actualizarlo",
   "API_Personal_Access_Tokens_Regenerate_It": "Regenerar token",
   "API_Shield_Types": "Tipos de Escudo",
   "API_Shield_Types_Description": "Tipos de escudos para activar como una lista separada por comas, elija entre `online`,` channel` o `*` para todos",
@@ -356,8 +363,20 @@
   "Apply": "Aplicar",
   "Apply_and_refresh_all_clients": "Aplicar y refrescar todos los clientes",
   "Apps": "Aplicaciones",
+  "Apps_Engine_Version": "Versión de Motor de Aplicaciones",
   "Apps_Framework_Development_Mode": "Habilitar el modo de desarrollo",
   "Apps_Framework_enabled": "Habilitar el Marco de aplicaciones",
+  "Apps_Marketplace_Deactivate_App_Prompt": "¿Realmente quieres deshabilitar esta aplicación?",
+  "Apps_Marketplace_Modify_App_Subscription": "Modificar Suscripción",
+  "Apps_Marketplace_Uninstall_App_Prompt": "¿Quieres realmente desinstalar esta aplicación?",
+  "Apps_Marketplace_Uninstall_Subscribed_App_Anyway": "Desinstalar de todos modos",
+  "Apps_Marketplace_Uninstall_Subscribed_App_Prompt": "Esta aplicación tiene una suscripción activa y al desinstalarla no se cancelará. Si quisieras hacerlo, por favor, modifica tu suscripción antes de desinstalarla.",
+  "Apps_Marketplace_Login_Required_Title": "Login requerido para Marketplace",
+  "Apps_Marketplace_Login_Required_Description": "Comprar aplicaciones del Marketplace Rocket.Chat Marketplace se requiere registrar tu entorno de trabajo y logarse.",
+  "Apps_Marketplace_pricingPlan_monthly": "__price__ / mes",
+  "Apps_Marketplace_pricingPlan_monthly_perUser": "__price__ / mes por usuario",
+  "Apps_Marketplace_pricingPlan_yearly": "__price__ / año",
+  "Apps_Marketplace_pricingPlan_yearly_perUser": "__price__ / año por usuario",
   "Apps_Settings": "Configuración de la aplicación",
   "Apps_WhatIsIt": "Aplicaciones: ¿Qué son?",
   "Apps_WhatIsIt_paragraph1": "¡Un nuevo ícono en el área de administración! ¿Qué significa esto y qué son las aplicaciones?",
@@ -444,6 +463,8 @@
   "Best_first_response_time": "Mejor tiempo de primera respuesta",
   "Block_User": "Bloquear Usuario",
   "Blockchain": "Blockchain",
+  "Blockstack_Auth_Description": "Descripción auth",
+  "Blockstack_ButtonLabelText": "Texto de etiqueta de botón",
   "Blockstack_Generate_Username": "Generar nombre de usuario",
   "Body": "Cuerpo",
   "bold": "negrita",
@@ -942,6 +963,21 @@
   "days": "días",
   "DB_Migration": "Migración de base de datos",
   "DB_Migration_Date": "Fecha de migración de base de datos",
+  "DDP_Rate_Limit_IP_Enabled": "Límite por IP: habilitado",
+  "DDP_Rate_Limit_IP_Requests_Allowed": "Límite por IP: peticiones permitidas",
+  "DDP_Rate_Limit_IP_Interval_Time": "Límite por IP: intervalo de tiempo",
+  "DDP_Rate_Limit_User_Enabled": "Límite por usuario: habilitado",
+  "DDP_Rate_Limit_User_Requests_Allowed": "Límite por usuario: peticiones permitidas",
+  "DDP_Rate_Limit_User_Interval_Time": "Límite por usuario: intervalo de tiempo",
+  "DDP_Rate_Limit_Connection_Enabled": "Límite por Conexión: habilitado",
+  "DDP_Rate_Limit_Connection_Requests_Allowed": "Límite por Conexión: peticiones permitidas",
+  "DDP_Rate_Limit_Connection_Interval_Time": "Límite por Conexión: intervalo de tiempo",
+  "DDP_Rate_Limit_User_By_Method_Enabled": "Límite por Usuario y Método: habilitado",
+  "DDP_Rate_Limit_User_By_Method_Requests_Allowed": "Límite por Usuario y Método: peticiones permitidas",
+  "DDP_Rate_Limit_User_By_Method_Interval_Time": "Límite por Usuario y Método: intervalo de tiempo",
+  "DDP_Rate_Limit_Connection_By_Method_Enabled": "Límite de Conexión por Método: habilitado",
+  "DDP_Rate_Limit_Connection_By_Method_Requests_Allowed": "Límite de Conexión por Método: peticiones permitidas",
+  "DDP_Rate_Limit_Connection_By_Method_Interval_Time": "Límite de Conexión por Método: intervalo de tiempo",
   "Deactivate": "Desactivar",
   "Decline": "Decadencia",
   "Default": "Por defecto",
@@ -1387,6 +1423,7 @@
   "If_you_are_sure_type_in_your_password": "Si está seguro escriba su contraseña:",
   "If_you_are_sure_type_in_your_username": "Si está seguro ingrese su nombre de usuario:",
   "If_you_dont_have_one_send_an_email_to_omni_rocketchat_to_get_yours": "Si no tiene uno, envíe un correo electrónico a [omni@rocket.chat] (mailto: omni@rocket.chat) para obtener el suyo.",
+  "If_you_didnt_ask_for_reset_ignore_this_email": "Si no pediste resetear tu contraseña, puedes ignorar este correo electrónico.",
   "Iframe_Integration": "Integración iframe",
   "Iframe_Integration_receive_enable": "Habilitar Recibir",
   "Iframe_Integration_receive_enable_Description": "Permitir que la ventana principal envíe comandos a Rocket.Chat.",
@@ -1696,6 +1733,7 @@
   "Leave_room": "Salir de la sala",
   "Leave_Room_Warning": "¿Seguro que quieres salir de la sala \"%s\"?",
   "Leave_the_current_channel": "Salir del canal actual",
+  "Lets_get_you_new_one": "¡Consigamos una nueva!",
   "line": "línea",
   "List_of_Channels": "Lista de Canales",
   "List_of_Direct_Messages": "Lista de mensajes directos",
@@ -2969,4 +3007,4 @@
   "Your_push_was_sent_to_s_devices": "Su push fue enviado a los dispositivos %s",
   "Your_server_link": "Su enlace de servidor",
   "Your_workspace_is_ready": "Su espacio de trabajo está listo para usar 🎉"
-}
\ No newline at end of file
+}

From f8feb324a13f0010218fd14b0d10d239938866ff Mon Sep 17 00:00:00 2001
From: ritwizsinha <43509699+ritwizsinha@users.noreply.github.com>
Date: Sat, 21 Mar 2020 06:27:33 +0530
Subject: [PATCH 056/223] Fix: Padding required in the Facebook Messenger
 option in Livechat (#16202)

---
 .../views/app/integrations/livechatIntegrationFacebook.html | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/livechat/client/views/app/integrations/livechatIntegrationFacebook.html b/app/livechat/client/views/app/integrations/livechatIntegrationFacebook.html
index e7e5682596f4..f7ff03d6b089 100644
--- a/app/livechat/client/views/app/integrations/livechatIntegrationFacebook.html
+++ b/app/livechat/client/views/app/integrations/livechatIntegrationFacebook.html
@@ -9,8 +9,10 @@
 					{{else}}
 						<button class="button primary enable" {{enableButtonDisabled}}>{{_ "Enable"}}</button>
 						{{#unless hasToken}}
-							<p>{{_ "You_have_to_set_an_API_token_first_in_order_to_use_the_integration"}}</p>
-							<p>{{_ "Please_go_to_the_Administration_page_then_Livechat_Facebook"}}</p>
+							<div class="rc-input__wrapper">
+								<p>{{_ "You_have_to_set_an_API_token_first_in_order_to_use_the_integration"}}</p>
+								<p>{{_ "Please_go_to_the_Administration_page_then_Livechat_Facebook"}}</p>
+							</div>
 						{{/unless}}
 					{{/if}}
 				</div>

From 683100a9fbcf105440376c0742f3eca725816e14 Mon Sep 17 00:00:00 2001
From: Marco Descher <marco@descher.at>
Date: Sat, 21 Mar 2020 02:02:06 +0100
Subject: [PATCH 057/223] Synchronize saml roles to local user (#16158)

---
 app/meteor-accounts-saml/server/saml_rocketchat.js | 12 ++++++++++++
 app/meteor-accounts-saml/server/saml_server.js     | 12 ++++++++----
 packages/rocketchat-i18n/i18n/de.i18n.json         |  2 ++
 packages/rocketchat-i18n/i18n/en.i18n.json         |  2 ++
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/app/meteor-accounts-saml/server/saml_rocketchat.js b/app/meteor-accounts-saml/server/saml_rocketchat.js
index 83cc7baa8e9f..c64e00ef5919 100644
--- a/app/meteor-accounts-saml/server/saml_rocketchat.js
+++ b/app/meteor-accounts-saml/server/saml_rocketchat.js
@@ -182,6 +182,15 @@ Meteor.methods({
 			i18nLabel: 'SAML_Role_Attribute_Name',
 			i18nDescription: 'SAML_Role_Attribute_Name_Description',
 		});
+
+		settings.add(`SAML_Custom_${ name }_role_attribute_sync`, false, {
+			type: 'boolean',
+			group: 'SAML',
+			section: name,
+			i18nLabel: 'SAML_Role_Attribute_Sync',
+			i18nDescription: 'SAML_Role_Attribute_Sync_Description',
+		});
+
 		settings.add(`SAML_Custom_${ name }_allowed_clock_drift`, 0, {
 			type: 'int',
 			group: 'SAML',
@@ -222,6 +231,7 @@ const getSamlConfigs = function(service) {
 		authnContextComparison: settings.get(`${ service.key }_authn_context_comparison`),
 		defaultUserRole: settings.get(`${ service.key }_default_user_role`),
 		roleAttributeName: settings.get(`${ service.key }_role_attribute_name`),
+		roleAttributeSync: settings.get(`${ service.key }_role_attribute_sync`),
 		secret: {
 			privateKey: settings.get(`${ service.key }_private_key`),
 			publicCert: settings.get(`${ service.key }_public_cert`),
@@ -264,6 +274,7 @@ const configureSamlService = function(samlConfigs) {
 	Accounts.saml.settings.debug = samlConfigs.debug;
 	Accounts.saml.settings.defaultUserRole = samlConfigs.defaultUserRole;
 	Accounts.saml.settings.roleAttributeName = samlConfigs.roleAttributeName;
+	Accounts.saml.settings.roleAttributeSync = samlConfigs.roleAttributeSync;
 
 	return {
 		provider: samlConfigs.clientConfig.provider,
@@ -277,6 +288,7 @@ const configureSamlService = function(samlConfigs) {
 		authnContextComparison: samlConfigs.authnContextComparison,
 		defaultUserRole: samlConfigs.defaultUserRole,
 		roleAttributeName: samlConfigs.roleAttributeName,
+		roleAttributeSync: samlConfigs.roleAttributeSync,
 		allowedClockDrift: samlConfigs.allowedClockDrift,
 	};
 };
diff --git a/app/meteor-accounts-saml/server/saml_server.js b/app/meteor-accounts-saml/server/saml_server.js
index ca1e6544713a..b2767fc8e70b 100644
--- a/app/meteor-accounts-saml/server/saml_server.js
+++ b/app/meteor-accounts-saml/server/saml_server.js
@@ -33,7 +33,7 @@ RoutePolicy.declare('/_saml/', 'network');
  * Fetch SAML provider configs for given 'provider'.
  */
 function getSamlProviderConfig(provider) {
-	if (! provider) {
+	if (!provider) {
 		throw new Meteor.Error('no-saml-provider',
 			'SAML internal error',
 			{ method: 'getSamlProviderConfig' });
@@ -57,7 +57,7 @@ Meteor.methods({
 		}
 		// This query should respect upcoming array of SAML logins
 		const user = Users.getSAMLByIdAndSAMLProvider(Meteor.userId(), provider);
-		if (!user || !user.services || ! user.services.saml) {
+		if (!user || !user.services || !user.services.saml) {
 			return;
 		}
 
@@ -245,7 +245,7 @@ Accounts.registerLoginHandler(function(loginRequest) {
 	}
 
 	const { emailField, usernameField, nameField, userDataFieldMap, regexes } = getUserDataMapping();
-	const { defaultUserRole = 'user', roleAttributeName } = Accounts.saml.settings;
+	const { defaultUserRole = 'user', roleAttributeName, roleAttributeSync } = Accounts.saml.settings;
 
 	if (loginResult && loginResult.profile && loginResult.profile[emailField]) {
 		const emailList = Array.isArray(loginResult.profile[emailField]) ? loginResult.profile[emailField] : [loginResult.profile[emailField]];
@@ -384,6 +384,10 @@ Accounts.registerLoginHandler(function(loginRequest) {
 			updateData.emails = emails;
 		}
 
+		if (roleAttributeSync) {
+			updateData.roles = globalRoles;
+		}
+
 		Meteor.users.update({
 			_id: user._id,
 		}, {
@@ -421,7 +425,7 @@ Accounts.saml.subscribeToSAMLChannels = function(channels, user) {
 				room = createRoom('c', roomName, user.username);
 			}
 		}
-	}	catch (err) {
+	} catch (err) {
 		console.error(err);
 	}
 };
diff --git a/packages/rocketchat-i18n/i18n/de.i18n.json b/packages/rocketchat-i18n/i18n/de.i18n.json
index 91aa9aa8929f..df895432c5e4 100644
--- a/packages/rocketchat-i18n/i18n/de.i18n.json
+++ b/packages/rocketchat-i18n/i18n/de.i18n.json
@@ -2813,6 +2813,8 @@
   "SAML_Default_User_Role_Description": "Sie können mehrere Rollen angeben, indem Sie sie durch Kommas trennen.",
   "SAML_Role_Attribute_Name": "Rollenattributname",
   "SAML_Role_Attribute_Name_Description": "Wenn dieses Attribut in der SAML-Antwort gefunden wird, werden seine Werte als Rollennamen für neue Benutzer verwendet.",
+  "SAML_Role_Attribute_Sync": "Benutzerrollen synchronisieren",
+  "SAML_Role_Attribute_Sync_Description": "Synchronisiere Benutzerrollen beim Login (Überschreibt lokale Benutzerrollen).",
   "SAML_Allowed_Clock_Drift": "Erlaubte Zeitabweichung zum Identity Provider",
   "SAML_Allowed_Clock_Drift_Description": "Die Uhrzeit des Identitätsproviders kann minimal vor der eigenen Systemzeit liegen. Um eine geringe Abweichung der Zeiten zu berücksichtigen, kann eine Zeitabweichung definiert werden. Der Wert muss in einer Anzahl von Millisekunden (ms) angegeben werden. Der angegebene Wert wird zur aktuellen Zeit, zu der die Antwort validiert wird, addiert.",
   "Saturday": "Samstag",
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 8759d94d6399..66386a3217aa 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -2895,6 +2895,8 @@
   "SAML_Default_User_Role_Description": "You can specify multiple roles, separating them with commas.",
   "SAML_Role_Attribute_Name": "Role Attribute Name",
   "SAML_Role_Attribute_Name_Description": "If this attribute is found on the SAML response, it's values will be used as role names for new users.",
+  "SAML_Role_Attribute_Sync": "Sync User Roles",
+  "SAML_Role_Attribute_Sync_Description": "Sync SAML user roles on login (overwrites local user roles).",
   "SAML_Allowed_Clock_Drift": "Allowed clock drift from Identity Provider",
   "SAML_Allowed_Clock_Drift_Description": "The clock of the Identity Provider may drift slightly ahead of your system clocks. You can allow for a small amount of clock drift. Its value must be given in a number of milliseconds (ms). The value given is added to the current time at which the response is validated.",
   "Saturday": "Saturday",

From 2e53311f0cd6dedb7429167e8271c3fd9e5eb610 Mon Sep 17 00:00:00 2001
From: Aaron Ogle <geekgonecrazy@users.noreply.github.com>
Date: Fri, 20 Mar 2020 20:18:37 -0500
Subject: [PATCH 058/223] Change license version requested (#16956)

Co-authored-by: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Co-authored-by: Diego Sampaio <chinello@gmail.com>
---
 .../server/functions/buildRegistrationData.js |  5 +++-
 .../server/functions/getWorkspaceLicense.js   |  5 ++--
 app/cloud/server/functions/syncWorkspace.js   | 30 ++-----------------
 app/cloud/server/license.js                   |  1 +
 app/statistics/server/lib/statistics.js       |  2 ++
 ee/app/license/server/settings.js             |  4 +++
 ee/app/license/server/startup.js              |  7 -----
 ee/i18n/en.i18n.json                          |  1 +
 ee/i18n/pt-BR.i18n.json                       |  1 +
 9 files changed, 17 insertions(+), 39 deletions(-)
 create mode 100644 app/cloud/server/license.js

diff --git a/app/cloud/server/functions/buildRegistrationData.js b/app/cloud/server/functions/buildRegistrationData.js
index 4b7af6d47902..25baa7fac0e0 100644
--- a/app/cloud/server/functions/buildRegistrationData.js
+++ b/app/cloud/server/functions/buildRegistrationData.js
@@ -1,6 +1,7 @@
 import { settings } from '../../../settings';
 import { Users } from '../../../models';
 import { statistics } from '../../../statistics';
+import { LICENSE_VERSION } from '../license';
 
 export function buildWorkspaceRegistrationData() {
 	const stats = statistics.get();
@@ -49,6 +50,8 @@ export function buildWorkspaceRegistrationData() {
 		deploymentMethod: stats.deploy.method,
 		deploymentPlatform: stats.deploy.platform,
 		version: stats.version,
-		setupComplete: true,
+		licenseVersion: LICENSE_VERSION,
+		enterpriseReady: true,
+		setupComplete: settings.get('Show_Setup_Wizard') === 'completed',
 	};
 }
diff --git a/app/cloud/server/functions/getWorkspaceLicense.js b/app/cloud/server/functions/getWorkspaceLicense.js
index 5fbd1ff6fdf5..00916c9b93db 100644
--- a/app/cloud/server/functions/getWorkspaceLicense.js
+++ b/app/cloud/server/functions/getWorkspaceLicense.js
@@ -4,7 +4,7 @@ import { getWorkspaceAccessToken } from './getWorkspaceAccessToken';
 import { settings } from '../../../settings';
 import { Settings } from '../../../models';
 import { callbacks } from '../../../callbacks';
-
+import { LICENSE_VERSION } from '../license';
 
 export function getWorkspaceLicense() {
 	const token = getWorkspaceAccessToken();
@@ -13,10 +13,9 @@ export function getWorkspaceLicense() {
 		return { updated: false, license: '' };
 	}
 
-
 	let licenseResult;
 	try {
-		licenseResult = HTTP.get(`${ settings.get('Cloud_Workspace_Registration_Client_Uri') }/license`, {
+		licenseResult = HTTP.get(`${ settings.get('Cloud_Workspace_Registration_Client_Uri') }/license?version=${ LICENSE_VERSION }`, {
 			headers: {
 				Authorization: `Bearer ${ token }`,
 			},
diff --git a/app/cloud/server/functions/syncWorkspace.js b/app/cloud/server/functions/syncWorkspace.js
index e4c7bf855424..e116a8fcc5f0 100644
--- a/app/cloud/server/functions/syncWorkspace.js
+++ b/app/cloud/server/functions/syncWorkspace.js
@@ -1,10 +1,9 @@
 import { HTTP } from 'meteor/http';
 
-
+import { buildWorkspaceRegistrationData } from './buildRegistrationData';
 import { retrieveRegistrationStatus } from './retrieveRegistrationStatus';
 import { getWorkspaceAccessToken } from './getWorkspaceAccessToken';
 import { getWorkspaceLicense } from './getWorkspaceLicense';
-import { statistics } from '../../../statistics';
 import { Settings } from '../../../models';
 import { settings } from '../../../settings';
 
@@ -14,32 +13,7 @@ export function syncWorkspace(reconnectCheck = false) {
 		return false;
 	}
 
-	const stats = statistics.get();
-
-	const address = settings.get('Site_Url');
-	const siteName = settings.get('Site_Name');
-	const website = settings.get('Website');
-
-	const setupComplete = settings.get('Show_Setup_Wizard') === 'completed';
-
-	const { organizationType, industry, size: orgSize, country, language, serverType: workspaceType } = stats.wizard;
-
-	const info = {
-		uniqueId: stats.uniqueId,
-		address,
-		siteName,
-		website,
-		organizationType,
-		industry,
-		orgSize,
-		country,
-		language,
-		workspaceType,
-		deploymentMethod: stats.deploy.method,
-		deploymentPlatform: stats.deploy.platform,
-		version: stats.version,
-		setupComplete,
-	};
+	const info = buildWorkspaceRegistrationData();
 
 	const workspaceUrl = settings.get('Cloud_Workspace_Registration_Client_Uri');
 
diff --git a/app/cloud/server/license.js b/app/cloud/server/license.js
new file mode 100644
index 000000000000..b4a98b2056ac
--- /dev/null
+++ b/app/cloud/server/license.js
@@ -0,0 +1 @@
+export const LICENSE_VERSION = 2;
diff --git a/app/statistics/server/lib/statistics.js b/app/statistics/server/lib/statistics.js
index 994c6e9c1e1a..251cf2d146ef 100644
--- a/app/statistics/server/lib/statistics.js
+++ b/app/statistics/server/lib/statistics.js
@@ -126,6 +126,8 @@ export const statistics = {
 			platform: process.env.DEPLOY_PLATFORM || 'selfinstall',
 		};
 
+		statistics.enterpriseReady = true;
+
 		statistics.uploadsTotal = Uploads.find().count();
 		const [result] = Promise.await(Uploads.model.rawCollection().aggregate([{ $group: { _id: 'total', total: { $sum: '$size' } } }]).toArray());
 		statistics.uploadsTotalSize = result ? result.total : 0;
diff --git a/ee/app/license/server/settings.js b/ee/app/license/server/settings.js
index b7e8c841ff2c..939e327f4c6e 100644
--- a/ee/app/license/server/settings.js
+++ b/ee/app/license/server/settings.js
@@ -35,6 +35,10 @@ settings.get('Enterprise_License', (key, license) => {
 
 if (process.env.ROCKETCHAT_LICENSE) {
 	Meteor.startup(() => {
+		if (settings.get('Enterprise_License')) {
+			console.warn('Rocket.Chat Enterprise: The license from your environment variable was ignored, please use only the admin setting from now on.');
+			return;
+		}
 		Settings.updateValueById('Enterprise_License', process.env.ROCKETCHAT_LICENSE);
 	});
 }
diff --git a/ee/app/license/server/startup.js b/ee/app/license/server/startup.js
index e1d75d6d193d..8c9c23cf09ea 100644
--- a/ee/app/license/server/startup.js
+++ b/ee/app/license/server/startup.js
@@ -1,5 +1,4 @@
 import { settings } from '../../../../app/settings/server';
-import { getWorkspaceLicense } from '../../../../app/cloud/server';
 import { callbacks } from '../../../../app/callbacks';
 import { addLicense, setURL } from './license';
 import './settings';
@@ -11,12 +10,6 @@ settings.get('Site_Url', (key, value) => {
 	}
 });
 
-const { license } = getWorkspaceLicense();
-
-if (license) {
-	addLicense(license);
-}
-
 callbacks.add('workspaceLicenseChanged', (updatedLicense) => {
 	addLicense(updatedLicense);
 });
diff --git a/ee/i18n/en.i18n.json b/ee/i18n/en.i18n.json
index ed956b7152c6..4cd75a09eccb 100644
--- a/ee/i18n/en.i18n.json
+++ b/ee/i18n/en.i18n.json
@@ -9,6 +9,7 @@
   "Edit_Tag": "Edit Tag",
   "Edit_Unit": "Edit Unit",
   "Enterprise_License": "Enterprise License",
+  "Enterprise_License_Description": "If your workspace registered and license is provided by Rocket.Chat Cloud you don't need to manually update the license here.",
   "Failed_to_add_monitor": "Failed to add monitor",
   "Invalid Canned Response": "Invalid Canned Response",
   "Invalid_Department": "Invalid Department",
diff --git a/ee/i18n/pt-BR.i18n.json b/ee/i18n/pt-BR.i18n.json
index 7a3fd7bedbb9..6f1b8d857c7e 100644
--- a/ee/i18n/pt-BR.i18n.json
+++ b/ee/i18n/pt-BR.i18n.json
@@ -5,6 +5,7 @@
   "Edit_Tag": "Editar Tag",
   "Edit_Unit": "Editar Unidade",
   "Enterprise_License": "Licença Enterprise",
+  "Enterprise_License_Description": "Se você registrou seu workspace e a licença foi fornecida pelo Rocket.Chat Cloud você não precisa atualizar a licença manualmente aqui.",
   "LDAP_Default_Role_To_User": "Papel padrão para o usuário",
   "LDAP_Default_Role_To_User_Description": "Papel padrão par ser aplicado ao usuário, caso ele tenha algum papel do LDAP que não esteja mapeado.",
   "LDAP_Enable_LDAP_Roles_To_RC_Roles": "Habilitar o mapeamento de papéis do LDAP para o Rocket.Chat",

From 06e27b819147bf6e454cc467d9306d5fa3130491 Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Fri, 20 Mar 2020 23:52:31 -0300
Subject: [PATCH 059/223] [IMPROVE] Update ancestral departments when an
 Omnichannel room is forwarded to another department (#16958)

---
 app/livechat/server/lib/Helper.js             |  2 +-
 .../hooks/afterForwardChatToDepartment.js     | 27 +++++++++++++++++++
 ee/app/livechat-enterprise/server/index.js    |  1 +
 ee/app/models/server/models/LivechatRooms.js  |  6 +----
 ee/i18n/en.i18n.json                          |  2 +-
 5 files changed, 31 insertions(+), 7 deletions(-)
 create mode 100644 ee/app/livechat-enterprise/server/hooks/afterForwardChatToDepartment.js

diff --git a/app/livechat/server/lib/Helper.js b/app/livechat/server/lib/Helper.js
index 5853f1d24456..a29b47eade1e 100644
--- a/app/livechat/server/lib/Helper.js
+++ b/app/livechat/server/lib/Helper.js
@@ -264,7 +264,7 @@ export const forwardRoomToDepartment = async (room, guest, transferData) => {
 		Messages.createUserJoinWithRoomIdAndUser(rid, servedBy);
 	}
 
-	updateChatDepartment({ rid, departmentId, oldDepartmentId });
+	updateChatDepartment({ rid, newDepartmentId: departmentId, oldDepartmentId });
 
 	const { token } = guest;
 	Livechat.setDepartmentForGuest({ token, department: departmentId });
diff --git a/ee/app/livechat-enterprise/server/hooks/afterForwardChatToDepartment.js b/ee/app/livechat-enterprise/server/hooks/afterForwardChatToDepartment.js
new file mode 100644
index 000000000000..66fe74c1d72f
--- /dev/null
+++ b/ee/app/livechat-enterprise/server/hooks/afterForwardChatToDepartment.js
@@ -0,0 +1,27 @@
+import { callbacks } from '../../../../../app/callbacks/server';
+import LivechatRooms from '../../../../../app/models/server/models/LivechatRooms';
+import LivechatDepartment from '../../../../../app/models/server/models/LivechatDepartment';
+
+callbacks.add('livechat.afterForwardChatToDepartment', (options) => {
+	const { rid, newDepartmentId } = options;
+
+	const room = LivechatRooms.findOneById(rid);
+	if (!room) {
+		return;
+	}
+
+	const department = LivechatDepartment.findOneById(newDepartmentId, { fields: { ancestors: 1 } });
+	if (!department) {
+		return;
+	}
+
+	const { departmentAncestors } = room;
+	const { ancestors } = department;
+	if (!ancestors && !departmentAncestors) {
+		return room;
+	}
+
+	LivechatRooms.updateDepartmentAncestorsById(room._id, ancestors);
+
+	return options;
+}, callbacks.priority.MEDIUM, 'livechat-after-forward-room-to-department');
diff --git a/ee/app/livechat-enterprise/server/index.js b/ee/app/livechat-enterprise/server/index.js
index 1736a7ca38ad..e532db6f935b 100644
--- a/ee/app/livechat-enterprise/server/index.js
+++ b/ee/app/livechat-enterprise/server/index.js
@@ -1,6 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 
 import './hooks/addDepartmentAncestors';
+import './hooks/afterForwardChatToDepartment';
 import './hooks/beforeListTags';
 import './methods/addMonitor';
 import './methods/getUnitsFromUserRoles';
diff --git a/ee/app/models/server/models/LivechatRooms.js b/ee/app/models/server/models/LivechatRooms.js
index ab094ad7db67..005b68ee619b 100644
--- a/ee/app/models/server/models/LivechatRooms.js
+++ b/ee/app/models/server/models/LivechatRooms.js
@@ -35,11 +35,7 @@ LivechatRooms.prototype.updateDepartmentAncestorsById = function(_id, department
 	const query = {
 		_id,
 	};
-	const update = {
-		$set: {
-			departmentAncestors,
-		},
-	};
+	const update = departmentAncestors ? { $set: { departmentAncestors } } : { $unset: { departmentAncestors: 1 } };
 	return this.update(query, update);
 };
 
diff --git a/ee/i18n/en.i18n.json b/ee/i18n/en.i18n.json
index 4cd75a09eccb..612242b05523 100644
--- a/ee/i18n/en.i18n.json
+++ b/ee/i18n/en.i18n.json
@@ -9,7 +9,7 @@
   "Edit_Tag": "Edit Tag",
   "Edit_Unit": "Edit Unit",
   "Enterprise_License": "Enterprise License",
-  "Enterprise_License_Description": "If your workspace registered and license is provided by Rocket.Chat Cloud you don't need to manually update the license here.",
+  "Enterprise_License_Description": "If your workspace is registered and license is provided by Rocket.Chat Cloud you don't need to manually update the license here.",
   "Failed_to_add_monitor": "Failed to add monitor",
   "Invalid Canned Response": "Invalid Canned Response",
   "Invalid_Department": "Invalid Department",

From dddcb2ab74bf22e91b39ec6182aaef72fefb17b3 Mon Sep 17 00:00:00 2001
From: Philipp Mayer <pmayer@users.noreply.github.com>
Date: Sat, 21 Mar 2020 03:59:27 +0100
Subject: [PATCH 060/223] fix cas username sync (#16942)

---
 app/cas/server/cas_server.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/cas/server/cas_server.js b/app/cas/server/cas_server.js
index 50828e58240a..2f5e24943d1f 100644
--- a/app/cas/server/cas_server.js
+++ b/app/cas/server/cas_server.js
@@ -221,6 +221,13 @@ Accounts.registerLoginHandler(function(options) {
 			},
 		};
 
+		// Add username
+		if (int_attrs.username) {
+			_.extend(newUser, {
+				username: int_attrs.username,
+			});
+		}
+
 		// Add User.name
 		if (int_attrs.name) {
 			_.extend(newUser, {

From 9681fd35d6d5e62ca4252597f3eca9688b444371 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 24 Mar 2020 02:02:53 -0300
Subject: [PATCH 061/223] Fix: StreamCast was not working correctly (#16983)

---
 server/stream/streamBroadcast.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/stream/streamBroadcast.js b/server/stream/streamBroadcast.js
index 983b351f1874..9d2d5c714885 100644
--- a/server/stream/streamBroadcast.js
+++ b/server/stream/streamBroadcast.js
@@ -10,7 +10,7 @@ import { Logger, LoggerManager } from '../../app/logger';
 import { hasPermission } from '../../app/authorization';
 import { settings } from '../../app/settings';
 import { isDocker, getURL } from '../../app/utils';
-import { Users } from '../../app/models/server/models/Users';
+import { Users } from '../../app/models/server';
 
 process.env.PORT = String(process.env.PORT).trim();
 process.env.INSTANCE_IP = String(process.env.INSTANCE_IP).trim();
@@ -218,7 +218,7 @@ function startStreamCastBroadcast(value) {
 			const scope = {};
 			return instance.emitWithScope(eventName, scope, args);
 		}
-		return instance.emitWithoutBroadcast(eventName, args);
+		return instance._emit(eventName, args);
 	});
 
 	return connection.subscribe('stream');

From b2253d153a2e8304a19ac18e8313871d90e3c704 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Tue, 24 Mar 2020 11:45:18 -0300
Subject: [PATCH 062/223] [FIX] Race conditions on/before login (#16989)

---
 app/authorization/client/startup.js   | 10 +++++++++-
 app/ui-sidenav/client/userPresence.js |  3 +++
 app/webdav/client/startup/sync.js     |  7 ++++---
 client/lib/userData.js                |  2 +-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/authorization/client/startup.js b/app/authorization/client/startup.js
index 99c1f06e760d..2edf696d2856 100644
--- a/app/authorization/client/startup.js
+++ b/app/authorization/client/startup.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
 
 import { hasAtLeastOnePermission } from './hasPermission';
 import { CachedCollectionManager } from '../../ui-cached-collection';
@@ -28,5 +29,12 @@ Meteor.startup(() => {
 		},
 		removed: (role) => Roles.remove({ _id: role.name }),
 	};
-	rolesStreamer.on('roles', (role) => events[role.type](role));
+
+	Tracker.autorun((c) => {
+		if (!Meteor.userId()) {
+			return;
+		}
+		rolesStreamer.on('roles', (role) => events[role.type](role));
+		c.stop();
+	});
 });
diff --git a/app/ui-sidenav/client/userPresence.js b/app/ui-sidenav/client/userPresence.js
index b079c0e632e6..e1df52380751 100644
--- a/app/ui-sidenav/client/userPresence.js
+++ b/app/ui-sidenav/client/userPresence.js
@@ -88,6 +88,9 @@ Tracker.autorun(() => {
 });
 
 Template.userPresence.onRendered(function() {
+	if (!this.data || !this.data.uid) {
+		return;
+	}
 	data.set(this.firstNode, this.data);
 	if (featureExists) {
 		return observer.observe(this.firstNode);
diff --git a/app/webdav/client/startup/sync.js b/app/webdav/client/startup/sync.js
index 5873da9672d1..c3547ee4bfe4 100644
--- a/app/webdav/client/startup/sync.js
+++ b/app/webdav/client/startup/sync.js
@@ -11,9 +11,10 @@ const events = {
 };
 
 Tracker.autorun(async () => {
-	if (Meteor.userId()) {
-		const { accounts } = await APIClient.v1.get('webdav.getMyAccounts');
-		accounts.forEach((account) => WebdavAccounts.insert(account));
+	if (!Meteor.userId()) {
+		return;
 	}
+	const { accounts } = await APIClient.v1.get('webdav.getMyAccounts');
+	accounts.forEach((account) => WebdavAccounts.insert(account));
 	Notifications.onUser('webdav', ({ type, account }) => events[type](account));
 });
diff --git a/client/lib/userData.js b/client/lib/userData.js
index 87c45c2d34ac..6a3c5da44b84 100644
--- a/client/lib/userData.js
+++ b/client/lib/userData.js
@@ -9,7 +9,7 @@ export const isSyncReady = new ReactiveVar(false);
 
 function updateUser(userData) {
 	const user = Users.findOne({ _id: userData._id });
-	if (!user || userData._updatedAt > user._updatedAt.toISOString()) {
+	if (!user || !user._updatedAt || userData._updatedAt > user._updatedAt.toISOString()) {
 		userData._updatedAt = new Date(userData._updatedAt);
 		return Meteor.users.upsert({ _id: userData._id }, userData);
 	}

From e3e542f09eb475c1590b4593aa4b5afb184179e1 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Tue, 24 Mar 2020 11:45:18 -0300
Subject: [PATCH 063/223] [FIX] Race conditions on/before login (#16989)

---
 app/authorization/client/startup.js   | 10 +++++++++-
 app/ui-sidenav/client/userPresence.js |  3 +++
 app/webdav/client/startup/sync.js     |  7 ++++---
 client/lib/userData.js                |  2 +-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/authorization/client/startup.js b/app/authorization/client/startup.js
index 99c1f06e760d..2edf696d2856 100644
--- a/app/authorization/client/startup.js
+++ b/app/authorization/client/startup.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
 
 import { hasAtLeastOnePermission } from './hasPermission';
 import { CachedCollectionManager } from '../../ui-cached-collection';
@@ -28,5 +29,12 @@ Meteor.startup(() => {
 		},
 		removed: (role) => Roles.remove({ _id: role.name }),
 	};
-	rolesStreamer.on('roles', (role) => events[role.type](role));
+
+	Tracker.autorun((c) => {
+		if (!Meteor.userId()) {
+			return;
+		}
+		rolesStreamer.on('roles', (role) => events[role.type](role));
+		c.stop();
+	});
 });
diff --git a/app/ui-sidenav/client/userPresence.js b/app/ui-sidenav/client/userPresence.js
index f6ae3e82171a..d20687e53922 100644
--- a/app/ui-sidenav/client/userPresence.js
+++ b/app/ui-sidenav/client/userPresence.js
@@ -89,6 +89,9 @@ Tracker.autorun(() => {
 });
 
 Template.userPresence.onRendered(function() {
+	if (!this.data || !this.data.uid) {
+		return;
+	}
 	data.set(this.firstNode, this.data);
 	if (featureExists) {
 		return observer.observe(this.firstNode);
diff --git a/app/webdav/client/startup/sync.js b/app/webdav/client/startup/sync.js
index 5873da9672d1..c3547ee4bfe4 100644
--- a/app/webdav/client/startup/sync.js
+++ b/app/webdav/client/startup/sync.js
@@ -11,9 +11,10 @@ const events = {
 };
 
 Tracker.autorun(async () => {
-	if (Meteor.userId()) {
-		const { accounts } = await APIClient.v1.get('webdav.getMyAccounts');
-		accounts.forEach((account) => WebdavAccounts.insert(account));
+	if (!Meteor.userId()) {
+		return;
 	}
+	const { accounts } = await APIClient.v1.get('webdav.getMyAccounts');
+	accounts.forEach((account) => WebdavAccounts.insert(account));
 	Notifications.onUser('webdav', ({ type, account }) => events[type](account));
 });
diff --git a/client/lib/userData.js b/client/lib/userData.js
index 87c45c2d34ac..6a3c5da44b84 100644
--- a/client/lib/userData.js
+++ b/client/lib/userData.js
@@ -9,7 +9,7 @@ export const isSyncReady = new ReactiveVar(false);
 
 function updateUser(userData) {
 	const user = Users.findOne({ _id: userData._id });
-	if (!user || userData._updatedAt > user._updatedAt.toISOString()) {
+	if (!user || !user._updatedAt || userData._updatedAt > user._updatedAt.toISOString()) {
 		userData._updatedAt = new Date(userData._updatedAt);
 		return Meteor.users.upsert({ _id: userData._id }, userData);
 	}

From 0d6ae884aba97aa6b44e172e924fb8711c7e1b0a Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Tue, 24 Mar 2020 12:40:02 -0300
Subject: [PATCH 064/223] Bump version to 3.0.5

---
 .docker/Dockerfile.rhel   |  2 +-
 .github/history.json      | 19 +++++++++++++++++++
 HISTORY.md                | 16 ++++++++++++++++
 app/utils/rocketchat.info |  2 +-
 package.json              |  2 +-
 5 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index d43a140a37d2..dcad419af158 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.0.4
+ENV RC_VERSION 3.0.5
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index 8d6cdcf14c98..c630065ab111 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -39998,6 +39998,25 @@
           ]
         }
       ]
+    },
+    "3.0.5": {
+      "node_version": "12.14.0",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "16989",
+          "title": "[FIX] Race conditions on/before login",
+          "userLogin": "sampaiodiego",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/HISTORY.md b/HISTORY.md
index 291cd60288a4..3e5e2c562365 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,20 @@
 
+# 3.0.5
+`2020-03-24  ·  1 🐛  ·  1 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `12.14.0`
+- NPM: `6.13.4`
+- MongoDB: `3.4, 3.6, 4.0`
+
+### 🐛 Bug fixes
+
+- Race conditions on/before login ([#16989](https://github.com/RocketChat/Rocket.Chat/pull/16989))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 3.0.4
 `2020-03-16  ·  1 🚀  ·  2 🐛  ·  3 👩‍💻👨‍💻`
 
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index 9b6d281d5f25..67213e864fd0 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.0.4"
+	"version": "3.0.5"
 }
diff --git a/package.json b/package.json
index aafcf6c41fec..ccfed4889e8f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.0.4",
+	"version": "3.0.5",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

From 746ac57d2ff3a3d2193bb66a1702242a29fbe294 Mon Sep 17 00:00:00 2001
From: Marcos Spessatto Defendi <marcos.defendi@ulbra.inf.br>
Date: Tue, 24 Mar 2020 16:47:28 -0300
Subject: [PATCH 065/223] [IMPROVE] Ability to change offline message button
 link on emails notifications (#16784)

Co-authored-by: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
---
 .../server/functions/notifications/email.js   | 17 +++++++++++--
 app/lib/server/startup/email.js               |  5 ++++
 app/lib/server/startup/settings.js            |  6 +++++
 app/markdown/tests/client.mocks.js            |  2 ++
 app/utils/lib/RoomTypesCommon.js              |  4 ++++
 app/utils/lib/getURL.js                       | 24 +++++++++++++------
 packages/rocketchat-i18n/i18n/en.i18n.json    |  2 ++
 packages/rocketchat-i18n/i18n/pt-BR.i18n.json |  2 ++
 8 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/app/lib/server/functions/notifications/email.js b/app/lib/server/functions/notifications/email.js
index d83be528ea73..0b22255842ec 100644
--- a/app/lib/server/functions/notifications/email.js
+++ b/app/lib/server/functions/notifications/email.js
@@ -7,6 +7,7 @@ import { settings } from '../../../../settings';
 import { roomTypes } from '../../../../utils';
 import { metrics } from '../../../../metrics';
 import { callbacks } from '../../../../callbacks';
+import { getURL } from '../../../../utils/server';
 
 let advice = '';
 let goToMessage = '';
@@ -94,6 +95,19 @@ function getEmailContent({ message, user, room }) {
 	return header;
 }
 
+const getButtonUrl = (room, subscription, message) => {
+	const path = `${ s.ltrim(roomTypes.getRelativePath(room.t, subscription), '/') }?msg=${ message._id }`;
+	return getURL(path, {
+		full: true,
+		cloud: settings.get('Offline_Message_Use_DeepLink'),
+		cloud_route: 'room',
+		cloud_params: {
+			rid: room._id,
+			mid: message._id,
+		},
+	});
+};
+
 export function sendEmail({ message, user, subscription, room, emailAddress, hasMentionToUser }) {
 	const username = settings.get('UI_Use_Real_Name') ? message.u.name || message.u.username : message.u.username;
 	let subjectKey = 'Offline_Mention_All_Email';
@@ -114,8 +128,7 @@ export function sendEmail({ message, user, subscription, room, emailAddress, has
 		room,
 	});
 
-	const room_path = roomTypes.getURL(room.t, subscription);
-
+	const room_path = getButtonUrl(room, subscription, message);
 	const email = {
 		to: emailAddress,
 		subject: emailSubject,
diff --git a/app/lib/server/startup/email.js b/app/lib/server/startup/email.js
index 852618fd1a1c..86139254417f 100644
--- a/app/lib/server/startup/email.js
+++ b/app/lib/server/startup/email.js
@@ -406,6 +406,11 @@ settings.addGroup('Email', function() {
 		});
 	});
 
+	this.section('Offline_Message', function() {
+		this.add('Offline_Message_Use_DeepLink', true, {
+			type: 'boolean',
+		});
+	});
 
 	this.section('Invitation', function() {
 		this.add('Invitation_Subject', '{Invitation_Subject_Default}', {
diff --git a/app/lib/server/startup/settings.js b/app/lib/server/startup/settings.js
index 02489b745fac..d586d2116663 100644
--- a/app/lib/server/startup/settings.js
+++ b/app/lib/server/startup/settings.js
@@ -831,6 +831,12 @@ settings.addGroup('General', function() {
 		],
 		public: true,
 	});
+
+	this.add('DeepLink_Url', 'https://go.rocket.chat', {
+		type: 'string',
+		public: true,
+	});
+
 	this.add('CDN_PREFIX', '', {
 		type: 'string',
 		public: true,
diff --git a/app/markdown/tests/client.mocks.js b/app/markdown/tests/client.mocks.js
index 6838ac521620..8efae2090e44 100644
--- a/app/markdown/tests/client.mocks.js
+++ b/app/markdown/tests/client.mocks.js
@@ -20,6 +20,8 @@ mock('../../settings', {
 	settings: {
 		get(setting) {
 			switch (setting) {
+				case 'DeepLink_Url':
+					return 'https://go.rocket.chat';
 				case 'Markdown_SupportSchemesForLink':
 					return 'http,https';
 				case 'Markdown_Parser':
diff --git a/app/utils/lib/RoomTypesCommon.js b/app/utils/lib/RoomTypesCommon.js
index abe097dbf8c9..fface1a028f1 100644
--- a/app/utils/lib/RoomTypesCommon.js
+++ b/app/utils/lib/RoomTypesCommon.js
@@ -94,6 +94,10 @@ export class RoomTypesCommon {
 		return FlowRouter.url(this.roomTypes[roomType].route.name, routeData);
 	}
 
+	getRelativePath(roomType, subData) {
+		return this.getRouteLink(roomType, subData).replace(Meteor.absoluteUrl(), '');
+	}
+
 	getRouteData(roomType, subData) {
 		if (!this.roomTypes[roomType]) {
 			return false;
diff --git a/app/utils/lib/getURL.js b/app/utils/lib/getURL.js
index 43800aad5c3b..4042d57414a1 100644
--- a/app/utils/lib/getURL.js
+++ b/app/utils/lib/getURL.js
@@ -3,22 +3,30 @@ import s from 'underscore.string';
 import { isURL } from './isURL';
 import { settings } from '../../settings';
 
-function getCloudUrl(path, _site_url, cloudRoute) {
+function getCloudUrl(path, _site_url, cloudRoute, cloudParams = {}) {
+	const cloudBaseUrl = (settings.get('DeepLink_Url') || '').replace(/\/+$/, '');
+
 	const siteUrl = s.rtrim(_site_url, '/');
 
 	// Remove the protocol
 	const host = siteUrl.replace(/https?\:\/\//i, '');
 	path = s.ltrim(path, '/');
-	const url = `https://go.rocket.chat/${ cloudRoute }?host=${ encodeURIComponent(host) }&path=${ encodeURIComponent(path) }`;
+
+	Object.assign(cloudParams, {
+		host,
+		path,
+	});
 
 	if (siteUrl.includes('http://')) {
-		return `${ url }&secure=no`;
+		cloudParams.secure = 'no';
 	}
 
-	return url;
+	const params = Object.entries(cloudParams).map(([key, value]) => `${ key }=${ encodeURIComponent(value) }`).join('&');
+
+	return `${ cloudBaseUrl }/${ cloudRoute }?${ params }`;
 }
 
-export const _getURL = (path, { cdn, full, cloud, cloud_route, _cdn_prefix, _root_url_path_prefix, _site_url }) => {
+export const _getURL = (path, { cdn, full, cloud, cloud_route, cloud_params, _cdn_prefix, _root_url_path_prefix, _site_url }) => {
 	if (isURL(path)) {
 		return path;
 	}
@@ -37,7 +45,8 @@ export const _getURL = (path, { cdn, full, cloud, cloud_route, _cdn_prefix, _roo
 	const url = s.rtrim(`${ pathPrefix }/${ finalPath }`, '/') + query;
 
 	if (cloud) {
-		return getCloudUrl(url, siteUrl, cloudRoute);
+		const cloudParams = cloud_params || {};
+		return getCloudUrl(url, siteUrl, cloudRoute, cloudParams);
 	}
 
 	if (cdn && cdnPrefix !== '') {
@@ -51,11 +60,12 @@ export const _getURL = (path, { cdn, full, cloud, cloud_route, _cdn_prefix, _roo
 	return url;
 };
 
-export const getURL = (path, { cdn = true, full = false, cloud = false, cloud_route = '' } = {}) => _getURL(path, {
+export const getURL = (path, { cdn = true, full = false, cloud = false, cloud_route = '', cloud_params = {} } = {}) => _getURL(path, {
 	cdn,
 	full,
 	cloud,
 	cloud_route,
+	cloud_params,
 	_cdn_prefix: settings.get('CDN_PREFIX'),
 	_root_url_path_prefix: __meteor_runtime_config__.ROOT_URL_PATH_PREFIX,
 	_site_url: settings.get('Site_Url'),
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 66386a3217aa..0fe71603ed59 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -2497,6 +2497,8 @@
   "Offline_form": "Offline form",
   "Offline_form_unavailable_message": "Offline Form Unavailable Message",
   "Offline_Link_Message": "GO TO MESSAGE",
+  "Offline_Message": "Offline Message",
+  "Offline_Message_Use_DeepLink": "Use Deep Link URL Format",
   "Offline_Mention_All_Email": "Mention All Email Subject",
   "Offline_Mention_Email": "Mention Email Subject",
   "Offline_message": "Offline message",
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index 3be08a149d94..1b7210b17d34 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -2269,6 +2269,8 @@
   "Offline_form": "Formulário offline",
   "Offline_form_unavailable_message": "Mensage quando formulário offline indisponível",
   "Offline_Link_Message": "VÁ PARA A MENSAGEM",
+  "Offline_Message": "Mensagem quando Offline",
+  "Offline_Message_Use_DeepLink": "Usar URL no formato Deep Link",
   "Offline_Mention_All_Email": "Mencionar todo o assunto do e-mail",
   "Offline_Mention_Email": "Você foi mencionado por __user__ em #__room__",
   "Offline_message": "Mensagem quando offline",

From 7ee5473189085db81aa72930e6d6c4d38ae0870a Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Tue, 24 Mar 2020 17:09:28 -0300
Subject: [PATCH 066/223] Fix StreamCast info (#16995)

---
 server/stream/streamBroadcast.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/stream/streamBroadcast.js b/server/stream/streamBroadcast.js
index 9d2d5c714885..337d1bde6adb 100644
--- a/server/stream/streamBroadcast.js
+++ b/server/stream/streamBroadcast.js
@@ -189,6 +189,7 @@ function startStreamCastBroadcast(value) {
 
 	connections[instance] = connection;
 	connection.instanceId = instance;
+	connection.instanceRecord = {};
 	connection.onReconnect = function() {
 		return authorizeConnection(instance);
 	};

From 80c69c0fb89832895fbd9f18bf4aa56573a68c8c Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Tue, 24 Mar 2020 19:27:53 -0300
Subject: [PATCH 067/223] [NEW] Engagement Dashboard (#16960)

---
 .storybook/config.js                          |   1 +
 app/models/server/models/Analytics.js         |  11 +
 app/models/server/raw/Analytics.js            | 145 ++++
 app/models/server/raw/Rooms.js                | 103 +++
 app/models/server/raw/Sessions.js             | 251 +++++++
 client/main.js                                |   3 +-
 .../components/ChannelsTab/TableSection.js    | 146 ++++
 .../client/components/ChannelsTab/index.js    |   9 +
 .../components/ChannelsTab/index.stories.js   |  14 +
 .../components/EngagementDashboardPage.js     |  35 +
 .../EngagementDashboardPage.stories.js        |  11 +
 .../components/EngagementDashboardRoute.js    |  24 +
 .../MessagesTab/MessagesPerChannelSection.js  | 217 ++++++
 .../MessagesTab/MessagesSentSection.js        | 169 +++++
 .../client/components/MessagesTab/index.js    |  13 +
 .../components/MessagesTab/index.stories.js   |  14 +
 .../client/components/Section.js              |  24 +
 .../components/UsersTab/ActiveUsersSection.js | 223 ++++++
 .../UsersTab/BusiestChatTimesSection.js       | 250 +++++++
 .../components/UsersTab/NewUsersSection.js    | 169 +++++
 .../UsersTab/UsersByTimeOfTheDaySection.js    | 166 +++++
 .../client/components/UsersTab/index.js       |  32 +
 .../components/UsersTab/index.stories.js      |  14 +
 .../client/components/data/Counter.js         |  24 +
 .../client/components/data/Counter.stories.js |  16 +
 .../client/components/data/CounterSet.js      |  16 +
 .../components/data/CounterSet.stories.js     |  16 +
 .../client/components/data/Growth.js          |  16 +
 .../client/components/data/Growth.stories.js  |  23 +
 .../client/components/data/Histogram.js       |  85 +++
 .../components/data/Histogram.stories.js      |  16 +
 .../client/components/data/LegendSymbol.js    |  19 +
 .../components/data/LegendSymbol.stories.js   |  25 +
 .../components/data/NegativeGrowthSymbol.js   |  26 +
 .../data/NegativeGrowthSymbol.stories.js      |  16 +
 .../components/data/PositiveGrowthSymbol.js   |  26 +
 .../data/PositiveGrowthSymbol.stories.js      |  16 +
 .../client/components/data/colors.js          |   2 +
 .../client/hooks/useEndpointData.js           |  52 ++
 ee/app/engagement-dashboard/client/index.js   |   1 +
 ee/app/engagement-dashboard/client/routes.js  |  71 ++
 .../server/api/channels.js                    |  26 +
 .../server/api/helpers/date.js                |  14 +
 .../engagement-dashboard/server/api/index.js  |   3 +
 .../server/api/messages.js                    |  41 ++
 .../engagement-dashboard/server/api/users.js  |  67 ++
 ee/app/engagement-dashboard/server/index.js   |   6 +
 .../server/lib/channels.js                    |  27 +
 .../engagement-dashboard/server/lib/date.js   |  11 +
 .../server/lib/messages.js                    |  85 +++
 .../engagement-dashboard/server/lib/users.js  | 109 +++
 .../server/listeners/index.js                 |   2 +
 .../server/listeners/messages.js              |   5 +
 .../server/listeners/users.js                 |   4 +
 ee/app/license/server/bundles.js              |   1 +
 ee/client/index.js                            |   1 +
 ee/server/index.js                            |   1 +
 package-lock.json                             | 675 ++++++++++++++----
 package.json                                  |  10 +-
 packages/rocketchat-i18n/i18n/en.i18n.json    |  28 +
 server/main.js                                |   3 +-
 61 files changed, 3473 insertions(+), 156 deletions(-)
 create mode 100644 app/models/server/models/Analytics.js
 create mode 100644 app/models/server/raw/Analytics.js
 create mode 100644 app/models/server/raw/Sessions.js
 create mode 100644 ee/app/engagement-dashboard/client/components/ChannelsTab/TableSection.js
 create mode 100644 ee/app/engagement-dashboard/client/components/ChannelsTab/index.js
 create mode 100644 ee/app/engagement-dashboard/client/components/ChannelsTab/index.stories.js
 create mode 100644 ee/app/engagement-dashboard/client/components/EngagementDashboardPage.js
 create mode 100644 ee/app/engagement-dashboard/client/components/EngagementDashboardPage.stories.js
 create mode 100644 ee/app/engagement-dashboard/client/components/EngagementDashboardRoute.js
 create mode 100644 ee/app/engagement-dashboard/client/components/MessagesTab/MessagesPerChannelSection.js
 create mode 100644 ee/app/engagement-dashboard/client/components/MessagesTab/MessagesSentSection.js
 create mode 100644 ee/app/engagement-dashboard/client/components/MessagesTab/index.js
 create mode 100644 ee/app/engagement-dashboard/client/components/MessagesTab/index.stories.js
 create mode 100644 ee/app/engagement-dashboard/client/components/Section.js
 create mode 100644 ee/app/engagement-dashboard/client/components/UsersTab/ActiveUsersSection.js
 create mode 100644 ee/app/engagement-dashboard/client/components/UsersTab/BusiestChatTimesSection.js
 create mode 100644 ee/app/engagement-dashboard/client/components/UsersTab/NewUsersSection.js
 create mode 100644 ee/app/engagement-dashboard/client/components/UsersTab/UsersByTimeOfTheDaySection.js
 create mode 100644 ee/app/engagement-dashboard/client/components/UsersTab/index.js
 create mode 100644 ee/app/engagement-dashboard/client/components/UsersTab/index.stories.js
 create mode 100644 ee/app/engagement-dashboard/client/components/data/Counter.js
 create mode 100644 ee/app/engagement-dashboard/client/components/data/Counter.stories.js
 create mode 100644 ee/app/engagement-dashboard/client/components/data/CounterSet.js
 create mode 100644 ee/app/engagement-dashboard/client/components/data/CounterSet.stories.js
 create mode 100644 ee/app/engagement-dashboard/client/components/data/Growth.js
 create mode 100644 ee/app/engagement-dashboard/client/components/data/Growth.stories.js
 create mode 100644 ee/app/engagement-dashboard/client/components/data/Histogram.js
 create mode 100644 ee/app/engagement-dashboard/client/components/data/Histogram.stories.js
 create mode 100644 ee/app/engagement-dashboard/client/components/data/LegendSymbol.js
 create mode 100644 ee/app/engagement-dashboard/client/components/data/LegendSymbol.stories.js
 create mode 100644 ee/app/engagement-dashboard/client/components/data/NegativeGrowthSymbol.js
 create mode 100644 ee/app/engagement-dashboard/client/components/data/NegativeGrowthSymbol.stories.js
 create mode 100644 ee/app/engagement-dashboard/client/components/data/PositiveGrowthSymbol.js
 create mode 100644 ee/app/engagement-dashboard/client/components/data/PositiveGrowthSymbol.stories.js
 create mode 100644 ee/app/engagement-dashboard/client/components/data/colors.js
 create mode 100644 ee/app/engagement-dashboard/client/hooks/useEndpointData.js
 create mode 100644 ee/app/engagement-dashboard/client/index.js
 create mode 100644 ee/app/engagement-dashboard/client/routes.js
 create mode 100644 ee/app/engagement-dashboard/server/api/channels.js
 create mode 100644 ee/app/engagement-dashboard/server/api/helpers/date.js
 create mode 100644 ee/app/engagement-dashboard/server/api/index.js
 create mode 100644 ee/app/engagement-dashboard/server/api/messages.js
 create mode 100644 ee/app/engagement-dashboard/server/api/users.js
 create mode 100644 ee/app/engagement-dashboard/server/index.js
 create mode 100644 ee/app/engagement-dashboard/server/lib/channels.js
 create mode 100644 ee/app/engagement-dashboard/server/lib/date.js
 create mode 100644 ee/app/engagement-dashboard/server/lib/messages.js
 create mode 100644 ee/app/engagement-dashboard/server/lib/users.js
 create mode 100644 ee/app/engagement-dashboard/server/listeners/index.js
 create mode 100644 ee/app/engagement-dashboard/server/listeners/messages.js
 create mode 100644 ee/app/engagement-dashboard/server/listeners/users.js

diff --git a/.storybook/config.js b/.storybook/config.js
index c6380996898a..420f7df4a6dc 100644
--- a/.storybook/config.js
+++ b/.storybook/config.js
@@ -20,4 +20,5 @@ addDecorator(withKnobs);
 configure([
 	require.context('../app', true, /\.stories\.js$/),
 	require.context('../client', true, /\.stories\.js$/),
+	require.context('../ee/app', true, /\.stories\.js$/),
 ], module);
diff --git a/app/models/server/models/Analytics.js b/app/models/server/models/Analytics.js
new file mode 100644
index 000000000000..c521fda8923e
--- /dev/null
+++ b/app/models/server/models/Analytics.js
@@ -0,0 +1,11 @@
+import { Base } from './_Base';
+
+export class Analytics extends Base {
+	constructor() {
+		super('analytics');
+		this.tryEnsureIndex({ date: 1 });
+		this.tryEnsureIndex({ 'room._id': 1, date: 1 }, { unique: true });
+	}
+}
+
+export default new Analytics();
diff --git a/app/models/server/raw/Analytics.js b/app/models/server/raw/Analytics.js
new file mode 100644
index 000000000000..7544d897fbd7
--- /dev/null
+++ b/app/models/server/raw/Analytics.js
@@ -0,0 +1,145 @@
+import { Random } from 'meteor/random';
+
+import { BaseRaw } from './BaseRaw';
+import Analytics from '../models/Analytics';
+
+export class AnalyticsRaw extends BaseRaw {
+	saveMessageSent({ room, date }) {
+		return this.update({ date, 'room._id': room._id, type: 'messages' }, {
+			$set: {
+				room: { _id: room._id, name: room.fname || room.name, t: room.t, usernames: room.usernames || [] },
+			},
+			$setOnInsert: {
+				_id: Random.id(),
+				date,
+				type: 'messages',
+			},
+			$inc: { messages: 1 },
+		}, { upsert: true });
+	}
+
+	saveUserData({ date }) {
+		return this.update({ date, type: 'users' }, {
+			$setOnInsert: {
+				_id: Random.id(),
+				date,
+				type: 'users',
+			},
+			$inc: { users: 1 },
+		}, { upsert: true });
+	}
+
+	saveMessageDeleted({ room, date }) {
+		return this.update({ date, 'room._id': room._id }, {
+			$inc: { messages: -1 },
+		});
+	}
+
+	getMessagesSentTotalByDate({ start, end, options = {} }) {
+		const params = [
+			{
+				$match: {
+					type: 'messages',
+					date: { $gte: start, $lte: end },
+				},
+			},
+			{
+				$group: {
+					_id: '$date',
+					messages: { $sum: '$messages' },
+				},
+			},
+		];
+		if (options.sort) {
+			params.push({ $sort: options.sort });
+		}
+		if (options.count) {
+			params.push({ $limit: options.count });
+		}
+		return this.col.aggregate(params).toArray();
+	}
+
+	getMessagesOrigin({ start, end }) {
+		const params = [
+			{
+				$match: {
+					type: 'messages',
+					date: { $gte: start, $lte: end },
+				},
+			},
+			{
+				$group: {
+					_id: { t: '$room.t' },
+					messages: { $sum: '$messages' },
+				},
+			},
+			{
+				$project: {
+					_id: 0,
+					t: '$_id.t',
+					messages: 1,
+				},
+			},
+		];
+		return this.col.aggregate(params).toArray();
+	}
+
+	getMostPopularChannelsByMessagesSentQuantity({ start, end, options = {} }) {
+		const params = [
+			{
+				$match: {
+					type: 'messages',
+					date: { $gte: start, $lte: end },
+				},
+			},
+			{
+				$group: {
+					_id: { t: '$room.t', name: '$room.name', usernames: '$room.usernames' },
+					messages: { $sum: '$messages' },
+				},
+			},
+			{
+				$project: {
+					_id: 0,
+					t: '$_id.t',
+					name: '$_id.name',
+					usernames: '$_id.usernames',
+					messages: 1,
+				},
+			},
+		];
+		if (options.sort) {
+			params.push({ $sort: options.sort });
+		}
+		if (options.count) {
+			params.push({ $limit: options.count });
+		}
+		return this.col.aggregate(params).toArray();
+	}
+
+	getTotalOfRegisteredUsersByDate({ start, end, options = {} }) {
+		const params = [
+			{
+				$match: {
+					type: 'users',
+					date: { $gte: start, $lte: end },
+				},
+			},
+			{
+				$group: {
+					_id: '$date',
+					users: { $sum: '$users' },
+				},
+			},
+		];
+		if (options.sort) {
+			params.push({ $sort: options.sort });
+		}
+		if (options.count) {
+			params.push({ $limit: options.count });
+		}
+		return this.col.aggregate(params).toArray();
+	}
+}
+
+export default new AnalyticsRaw(Analytics.model.rawCollection());
diff --git a/app/models/server/raw/Rooms.js b/app/models/server/raw/Rooms.js
index dc9ab5445adf..fe88c305a09a 100644
--- a/app/models/server/raw/Rooms.js
+++ b/app/models/server/raw/Rooms.js
@@ -89,4 +89,107 @@ export class RoomsRaw extends BaseRaw {
 
 		return this.find(query, options);
 	}
+
+	findChannelsWithNumberOfMessagesBetweenDate({ start, end, startOfLastWeek, endOfLastWeek, onlyCount = false, options = {} }) {
+		const lookup = {
+			$lookup: {
+				from: 'rocketchat_analytics',
+				localField: '_id',
+				foreignField: 'room._id',
+				as: 'messages',
+			},
+		};
+		const messagesProject = {
+			$project: {
+				room: '$$ROOT',
+				messages: {
+					$filter: {
+						input: '$messages',
+						as: 'message',
+						cond: {
+							$and: [
+								{ $gte: ['$$message.date', start] },
+								{ $lte: ['$$message.date', end] },
+							],
+						},
+					},
+				},
+				lastWeekMessages: {
+					$filter: {
+						input: '$messages',
+						as: 'message',
+						cond: {
+							$and: [
+								{ $gte: ['$$message.date', startOfLastWeek] },
+								{ $lte: ['$$message.date', endOfLastWeek] },
+							],
+						},
+					},
+				},
+			},
+		};
+		const messagesUnwind = {
+			$unwind: {
+				path: '$messages',
+				preserveNullAndEmptyArrays: true,
+			},
+		};
+		const messagesGroup = {
+			$group: {
+				_id: {
+					_id: '$room._id',
+				},
+				room: { $first: '$room' },
+				messages: { $sum: '$messages.messages' },
+				lastWeekMessages: { $first: '$lastWeekMessages' },
+			},
+		};
+		const lastWeekMessagesUnwind = {
+			$unwind: {
+				path: '$lastWeekMessages',
+				preserveNullAndEmptyArrays: true,
+			},
+		};
+		const lastWeekMessagesGroup = {
+			$group: {
+				_id: {
+					_id: '$room._id',
+				},
+				room: { $first: '$room' },
+				messages: { $first: '$messages' },
+				lastWeekMessages: { $sum: '$lastWeekMessages.messages' },
+			},
+		};
+		const presentationProject = {
+			$project: {
+				_id: 0,
+				room: {
+					_id: '$_id._id',
+					name: { $ifNull: ['$room.name', '$room.fname'] },
+					ts: '$room.ts',
+					t: '$room.t',
+					_updatedAt: '$room._updatedAt',
+					usernames: '$room.usernames',
+				},
+				messages: '$messages',
+				lastWeekMessages: '$lastWeekMessages',
+				diffFromLastWeek: { $subtract: ['$messages', '$lastWeekMessages'] },
+			},
+		};
+		const firstParams = [lookup, messagesProject, messagesUnwind, messagesGroup, lastWeekMessagesUnwind, lastWeekMessagesGroup, presentationProject];
+		const sort = { $sort: options.sort || { messages: -1 } };
+		const params = [...firstParams, sort];
+		if (onlyCount) {
+			params.push({ $count: 'total' });
+			return this.col.aggregate(params);
+		}
+		if (options.offset) {
+			params.push({ $skip: options.offset });
+		}
+		if (options.count) {
+			params.push({ $limit: options.count });
+		}
+
+		return this.col.aggregate(params).toArray();
+	}
 }
diff --git a/app/models/server/raw/Sessions.js b/app/models/server/raw/Sessions.js
new file mode 100644
index 000000000000..4b259c10d466
--- /dev/null
+++ b/app/models/server/raw/Sessions.js
@@ -0,0 +1,251 @@
+import { BaseRaw } from './BaseRaw';
+import Sessions from '../models/Sessions';
+
+const matchBasedOnDate = (start, end) => {
+	if (start.year === end.year && start.month === end.month) {
+		return {
+			year: start.year,
+			month: start.month,
+			day: { $gte: start.day, $lte: end.day },
+		};
+	}
+
+	if (start.year === end.year) {
+		return {
+			year: start.year,
+			$and: [{
+				$or: [{
+					month: { $gt: start.month },
+				}, {
+					month: start.month,
+					day: { $gte: start.day },
+				}],
+			}, {
+				$or: [{
+					month: { $lt: end.month },
+				}, {
+					month: end.month,
+					day: { $lte: end.day },
+				}],
+			}],
+		};
+	}
+
+	return {
+		$and: [{
+			$or: [{
+				year: { $gt: start.year },
+			}, {
+				year: start.year,
+				month: { $gt: start.month },
+			}, {
+				year: start.year,
+				month: start.month,
+				day: { $gte: start.day },
+			}],
+		}, {
+			$or: [{
+				year: { $lt: end.year },
+			}, {
+				year: end.year,
+				month: { $lt: end.month },
+			}, {
+				year: end.year,
+				month: end.month,
+				day: { $lte: end.day },
+			}],
+		}],
+	};
+};
+
+const getGroupSessionsByHour = (_id) => {
+	const isOpenSession = { $not: ['$session.closedAt'] };
+	const isAfterLoginAt = { $gte: ['$range', { $hour: '$session.loginAt' }] };
+	const isBeforeClosedAt = { $lte: ['$range', { $hour: '$session.closedAt' }] };
+	return {
+		$group: {
+			_id,
+			users: {
+				$sum: {
+					$cond: [
+						{
+							$or: [
+								{ $and: [isOpenSession, isAfterLoginAt] },
+								{ $and: [isAfterLoginAt, isBeforeClosedAt] },
+							],
+						},
+						1,
+						0,
+					],
+				},
+			},
+		},
+	};
+};
+
+const getSortByFullDate = () => ({
+	year: -1,
+	month: -1,
+	day: -1,
+});
+
+const getProjectionByFullDate = () => ({
+	day: '$_id.day',
+	month: '$_id.month',
+	year: '$_id.year',
+});
+
+export class SessionsRaw extends BaseRaw {
+	getActiveUsersBetweenDates({ start, end }) {
+		return this.col.aggregate([
+			{
+				$match: {
+					...matchBasedOnDate(start, end),
+					type: 'user_daily',
+				},
+			},
+			{
+				$group: {
+					_id: '$userId',
+				},
+			},
+		]).toArray();
+	}
+
+	getActiveUsersOfPeriodByDayBetweenDates({ start, end }) {
+		return this.col.aggregate([
+			{
+				$match: {
+					...matchBasedOnDate(start, end),
+					type: 'user_daily',
+				},
+			},
+			{
+				$group: {
+					_id: {
+						day: '$day',
+						month: '$month',
+						year: '$year',
+					},
+					users: { $sum: 1 },
+				},
+			},
+			{
+				$project: {
+					_id: 0,
+					...getProjectionByFullDate(),
+					users: 1,
+				},
+			},
+			{
+				$sort: {
+					...getSortByFullDate(),
+				},
+			},
+		]).toArray();
+	}
+
+	getBusiestTimeWithinHoursPeriod({ start, end }) {
+		const match = {
+			$match: {
+				type: 'computed-session',
+				loginAt: { $gte: start, $lte: end },
+			},
+		};
+		const rangeProject = {
+			$project: {
+				range: {
+					$range: [0, 24],
+				},
+				session: '$$ROOT',
+			},
+		};
+		const unwind = {
+			$unwind: '$range',
+		};
+		const group = getGroupSessionsByHour('$range');
+		const presentationProject = {
+			$project: {
+				_id: 0,
+				hour: '$_id',
+				users: 1,
+			},
+		};
+		const sort = {
+			$sort: {
+				hour: -1,
+			},
+		};
+		return this.col.aggregate([match, rangeProject, unwind, group, presentationProject, sort]).toArray();
+	}
+
+	getTotalOfSessionsByDayBetweenDates({ start, end }) {
+		return this.col.aggregate([
+			{
+				$match: {
+					...matchBasedOnDate(start, end),
+					type: 'user_daily',
+				},
+			},
+			{
+				$group: {
+					_id: { year: '$year', month: '$month', day: '$day' },
+					users: { $sum: '$sessions' },
+				},
+			},
+			{
+				$project: {
+					_id: 0,
+					...getProjectionByFullDate(),
+					users: 1,
+				},
+			},
+			{
+				$sort: {
+					...getSortByFullDate(),
+				},
+			},
+		]).toArray();
+	}
+
+	getTotalOfSessionByHourAndDayBetweenDates({ start, end }) {
+		const match = {
+			$match: {
+				type: 'computed-session',
+				loginAt: { $gte: start, $lte: end },
+			},
+		};
+		const rangeProject = {
+			$project: {
+				range: {
+					$range: [
+						{ $hour: '$loginAt' },
+						{ $sum: [{ $ifNull: [{ $hour: '$closedAt' }, 23] }, 1] }],
+				},
+				session: '$$ROOT',
+			},
+
+		};
+		const unwind = {
+			$unwind: '$range',
+		};
+		const group = getGroupSessionsByHour({ range: '$range', day: '$session.day', month: '$session.month', year: '$session.year' });
+		const presentationProject = {
+			$project: {
+				_id: 0,
+				hour: '$_id.range',
+				...getProjectionByFullDate(),
+				users: 1,
+			},
+		};
+		const sort = {
+			$sort: {
+				...getSortByFullDate(),
+				hour: -1,
+			},
+		};
+		return this.col.aggregate([match, rangeProject, unwind, group, presentationProject, sort]).toArray();
+	}
+}
+
+export default new SessionsRaw(Sessions.model.rawCollection());
diff --git a/client/main.js b/client/main.js
index 605b6cd6617b..a1013d38d72e 100644
--- a/client/main.js
+++ b/client/main.js
@@ -6,6 +6,7 @@ import '../imports/startup/client';
 
 import '../lib/RegExp';
 
+import '../ee/client';
 import './lib/toastr';
 import './templateHelpers';
 import './methods/deleteMessage';
@@ -27,5 +28,3 @@ import './startup/startup';
 import './startup/unread';
 import './startup/userSetUtcOffset';
 import './startup/usersObserve';
-
-import '../ee/client';
diff --git a/ee/app/engagement-dashboard/client/components/ChannelsTab/TableSection.js b/ee/app/engagement-dashboard/client/components/ChannelsTab/TableSection.js
new file mode 100644
index 000000000000..673b2079bb6d
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/ChannelsTab/TableSection.js
@@ -0,0 +1,146 @@
+import { Box, Icon, Margins, Pagination, Select, Skeleton, Table, Tile } from '@rocket.chat/fuselage';
+import moment from 'moment';
+import React, { useMemo, useState } from 'react';
+
+import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
+import { Growth } from '../data/Growth';
+import { Section } from '../Section';
+import { useEndpointData } from '../../hooks/useEndpointData';
+
+export function TableSection() {
+	const t = useTranslation();
+
+	const periodOptions = useMemo(() => [
+		['last 7 days', t('Last_7_days')],
+		['last 30 days', t('Last_30_days')],
+		['last 90 days', t('Last_90_days')],
+	], [t]);
+
+	const [periodId, setPeriodId] = useState('last 7 days');
+
+	const period = useMemo(() => {
+		switch (periodId) {
+			case 'last 7 days':
+				return {
+					start: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(7, 'days'),
+					end: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(1),
+				};
+
+			case 'last 30 days':
+				return {
+					start: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(30, 'days'),
+					end: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(1),
+				};
+
+			case 'last 90 days':
+				return {
+					start: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(90, 'days'),
+					end: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(1),
+				};
+		}
+	}, [periodId]);
+
+	const handlePeriodChange = (periodId) => setPeriodId(periodId);
+
+	const [current, setCurrent] = useState(0);
+	const [itemsPerPage, setItemsPerPage] = useState(25);
+
+	const params = useMemo(() => ({
+		start: period.start.toISOString(),
+		end: period.end.toISOString(),
+		offset: current,
+		count: itemsPerPage,
+	}), [period, current, itemsPerPage]);
+
+	const data = useEndpointData('GET', 'engagement-dashboard/channels/list', params);
+
+	const channels = useMemo(() => {
+		if (!data) {
+			return;
+		}
+
+		return data.channels.map(({
+			room: { t, name, usernames, ts, _updatedAt },
+			messages,
+			diffFromLastWeek,
+		}) => ({
+			t,
+			name: name || usernames.join(' × '),
+			createdAt: ts,
+			updatedAt: _updatedAt,
+			messagesCount: messages,
+			messagesVariation: diffFromLastWeek,
+		}));
+	}, [data]);
+
+	return <Section filter={<Select options={periodOptions} value={periodId} onChange={handlePeriodChange} />}>
+		<Box>
+			{channels && !channels.length && <Tile textStyle='p1' textColor='info' style={{ textAlign: 'center' }}>
+				{t('No_data_found')}
+			</Tile>}
+			{(!channels || channels.length)
+			&& <Table>
+				<Table.Head>
+					<Table.Row>
+						<Table.Cell>{'#'}</Table.Cell>
+						<Table.Cell>{t('Channel')}</Table.Cell>
+						<Table.Cell>{t('Created')}</Table.Cell>
+						<Table.Cell>{t('Last_active')}</Table.Cell>
+						<Table.Cell>{t('Messages_sent')}</Table.Cell>
+					</Table.Row>
+				</Table.Head>
+				<Table.Body>
+					{channels && channels.map(({ t, name, createdAt, updatedAt, messagesCount, messagesVariation }, i) =>
+						<Table.Row key={i}>
+							<Table.Cell>{i + 1}.</Table.Cell>
+							<Table.Cell>
+								<Margins inlineEnd='x4'>
+									{(t === 'd' && <Icon name='at' />)
+								|| (t === 'c' && <Icon name='lock' />)
+								|| (t === 'p' && <Icon name='hashtag' />)}
+								</Margins>
+								{name}
+							</Table.Cell>
+							<Table.Cell>
+								{moment(createdAt).format('L')}
+							</Table.Cell>
+							<Table.Cell>
+								{moment(updatedAt).format('L')}
+							</Table.Cell>
+							<Table.Cell>
+								{messagesCount} <Growth>{messagesVariation}</Growth>
+							</Table.Cell>
+						</Table.Row>)}
+					{!channels && Array.from({ length: 5 }, (_, i) =>
+						<Table.Row key={i}>
+							<Table.Cell>
+								<Skeleton width='100%' />
+							</Table.Cell>
+							<Table.Cell>
+								<Skeleton width='100%' />
+							</Table.Cell>
+							<Table.Cell>
+								<Skeleton width='100%' />
+							</Table.Cell>
+							<Table.Cell>
+								<Skeleton width='100%' />
+							</Table.Cell>
+							<Table.Cell>
+								<Skeleton width='100%' />
+							</Table.Cell>
+						</Table.Row>)}
+				</Table.Body>
+			</Table>}
+			<Pagination
+				current={current}
+				itemsPerPage={itemsPerPage}
+				itemsPerPageLabel={() => t('Items_per_page:')}
+				showingResultsLabel={({ count, current, itemsPerPage }) =>
+					t('Showing results %s - %s of %s', current + 1, Math.min(current + itemsPerPage, count), count)}
+				count={(data && data.total) || 0}
+				onSetItemsPerPage={setItemsPerPage}
+				onSetCurrent={setCurrent}
+			/>
+		</Box>
+	</Section>;
+}
diff --git a/ee/app/engagement-dashboard/client/components/ChannelsTab/index.js b/ee/app/engagement-dashboard/client/components/ChannelsTab/index.js
new file mode 100644
index 000000000000..c59914097a6e
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/ChannelsTab/index.js
@@ -0,0 +1,9 @@
+import React from 'react';
+
+import { TableSection } from './TableSection';
+
+export function ChannelsTab() {
+	return <>
+		<TableSection />
+	</>;
+}
diff --git a/ee/app/engagement-dashboard/client/components/ChannelsTab/index.stories.js b/ee/app/engagement-dashboard/client/components/ChannelsTab/index.stories.js
new file mode 100644
index 000000000000..c9878245fdff
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/ChannelsTab/index.stories.js
@@ -0,0 +1,14 @@
+import { Margins } from '@rocket.chat/fuselage';
+import React from 'react';
+
+import { ChannelsTab } from '.';
+
+export default {
+	title: 'admin/engagement/ChannelsTab',
+	component: ChannelsTab,
+	decorators: [
+		(fn) => <Margins children={fn()} all='x24' />,
+	],
+};
+
+export const _default = () => <ChannelsTab />;
diff --git a/ee/app/engagement-dashboard/client/components/EngagementDashboardPage.js b/ee/app/engagement-dashboard/client/components/EngagementDashboardPage.js
new file mode 100644
index 000000000000..f9843adf08c4
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/EngagementDashboardPage.js
@@ -0,0 +1,35 @@
+import { Box, Margins, Tabs } from '@rocket.chat/fuselage';
+import React from 'react';
+
+import { useTranslation } from '../../../../../client/contexts/TranslationContext';
+import { Page } from '../../../../../client/components/basic/Page';
+import { UsersTab } from './UsersTab';
+import { MessagesTab } from './MessagesTab';
+import { ChannelsTab } from './ChannelsTab';
+
+export function EngagementDashboardPage({
+	tab = 'users',
+	onSelectTab,
+}) {
+	const t = useTranslation();
+
+	const handleTabClick = onSelectTab ? (tab) => () => onSelectTab(tab) : () => undefined;
+
+	return <Page>
+		<Page.Header title={t('Engagement_Dashboard')} />
+		<Tabs>
+			<Tabs.Item selected={tab === 'users'} onClick={handleTabClick('users')}>{t('Users')}</Tabs.Item>
+			<Tabs.Item selected={tab === 'messages'} onClick={handleTabClick('messages')}>{t('Messages')}</Tabs.Item>
+			<Tabs.Item selected={tab === 'channels'} onClick={handleTabClick('channels')}>{t('Channels')}</Tabs.Item>
+		</Tabs>
+		<Page.Content style={{ padding: 0 }}>
+			<Margins all='x24'>
+				<Box>
+					{(tab === 'users' && <UsersTab />)
+				|| (tab === 'messages' && <MessagesTab />)
+				|| (tab === 'channels' && <ChannelsTab />)}
+				</Box>
+			</Margins>
+		</Page.Content>
+	</Page>;
+}
diff --git a/ee/app/engagement-dashboard/client/components/EngagementDashboardPage.stories.js b/ee/app/engagement-dashboard/client/components/EngagementDashboardPage.stories.js
new file mode 100644
index 000000000000..0ac38d641bf0
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/EngagementDashboardPage.stories.js
@@ -0,0 +1,11 @@
+import React from 'react';
+
+import { EngagementDashboardPage } from './EngagementDashboardPage';
+
+export default {
+	title: 'admin/engagement/EngagementDashboardPage',
+	component: EngagementDashboardPage,
+	decorators: [(fn) => <div children={fn()} style={{ height: '100vh' }} />],
+};
+
+export const _default = () => <EngagementDashboardPage />;
diff --git a/ee/app/engagement-dashboard/client/components/EngagementDashboardRoute.js b/ee/app/engagement-dashboard/client/components/EngagementDashboardRoute.js
new file mode 100644
index 000000000000..4d232810240a
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/EngagementDashboardRoute.js
@@ -0,0 +1,24 @@
+import React, { useEffect } from 'react';
+
+import { useRoute, useRouteParameter } from '../../../../../client/contexts/RouterContext';
+import { useAdminSideNav } from '../../../../../client/hooks/useAdminSideNav';
+import { EngagementDashboardPage } from './EngagementDashboardPage';
+
+export function EngagementDashboardRoute() {
+	useAdminSideNav();
+
+	const goToEngagementDashboard = useRoute('engagement-dashboard');
+
+	const tab = useRouteParameter('tab');
+
+	useEffect(() => {
+		if (!tab) {
+			goToEngagementDashboard.replacingState({ tab: 'users' });
+		}
+	}, [tab]);
+
+	return <EngagementDashboardPage
+		tab={tab}
+		onSelectTab={(tab) => goToEngagementDashboard({ tab })}
+	/>;
+}
diff --git a/ee/app/engagement-dashboard/client/components/MessagesTab/MessagesPerChannelSection.js b/ee/app/engagement-dashboard/client/components/MessagesTab/MessagesPerChannelSection.js
new file mode 100644
index 000000000000..bfa2527d8937
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/MessagesTab/MessagesPerChannelSection.js
@@ -0,0 +1,217 @@
+import { ResponsivePie } from '@nivo/pie';
+import { Box, Flex, Icon, Margins, Select, Skeleton, Table, Tile } from '@rocket.chat/fuselage';
+import moment from 'moment';
+import React, { useMemo, useState } from 'react';
+
+import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
+import { LegendSymbol } from '../data/LegendSymbol';
+import { useEndpointData } from '../../hooks/useEndpointData';
+import { Section } from '../Section';
+
+export function MessagesPerChannelSection() {
+	const t = useTranslation();
+
+	const periodOptions = useMemo(() => [
+		['last 7 days', t('Last_7_days')],
+		['last 30 days', t('Last_30_days')],
+		['last 90 days', t('Last_90_days')],
+	], [t]);
+
+	const [periodId, setPeriodId] = useState('last 7 days');
+
+	const period = useMemo(() => {
+		switch (periodId) {
+			case 'last 7 days':
+				return {
+					start: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(7, 'days'),
+					end: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(1),
+				};
+
+			case 'last 30 days':
+				return {
+					start: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(30, 'days'),
+					end: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(1),
+				};
+
+			case 'last 90 days':
+				return {
+					start: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(90, 'days'),
+					end: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(1),
+				};
+		}
+	}, [periodId]);
+
+	const handlePeriodChange = (periodId) => setPeriodId(periodId);
+
+	const params = useMemo(() => ({
+		start: period.start.toISOString(),
+		end: period.end.toISOString(),
+	}), [period]);
+
+	const pieData = useEndpointData('GET', 'engagement-dashboard/messages/origin', params);
+	const tableData = useEndpointData('GET', 'engagement-dashboard/messages/top-five-popular-channels', params);
+
+	const [pie, table] = useMemo(() => {
+		if (!pieData || !tableData) {
+			return [];
+		}
+
+		const pie = pieData.origins.reduce((obj, { messages, t }) => ({ ...obj, [t]: messages }), {});
+
+		const table = tableData.channels.reduce((entries, { t, messages, name, usernames }, i) =>
+			[...entries, { i, t, name: name || usernames.join(' × '), messages }], []);
+
+		return [pie, table];
+	}, [period, pieData, tableData]);
+
+	return <Section
+		title={t('Where_are_the_messages_being_sent?')}
+		filter={<Select options={periodOptions} value={periodId} onChange={handlePeriodChange} />}
+	>
+		<Flex.Container>
+			<Margins inline='neg-x12'>
+				<Box>
+					<Margins inline='x12'>
+						<Flex.Item grow={1} shrink={0} basis='0'>
+							<Box>
+								<Flex.Container alignItems='center' wrap='no-wrap'>
+									{pie
+										? <Box>
+											<Flex.Item grow={1} shrink={1}>
+												<Margins inline='x24'>
+													<Box style={{ position: 'relative', height: 300 }}>
+														<Box style={{ position: 'absolute', width: '100%', height: '100%' }}>
+															<ResponsivePie
+																data={[
+																	{
+																		id: 'd',
+																		label: t('Private_Chats'),
+																		value: pie.d,
+																		color: '#FFD031',
+																	},
+																	{
+																		id: 'c',
+																		label: t('Private_Channels'),
+																		value: pie.c,
+																		color: '#2DE0A5',
+																	},
+																	{
+																		id: 'p',
+																		label: t('Public_Channels'),
+																		value: pie.p,
+																		color: '#1D74F5',
+																	},
+																]}
+																innerRadius={0.6}
+																colors={['#FFD031', '#2DE0A5', '#1D74F5']}
+																enableRadialLabels={false}
+																enableSlicesLabels={false}
+																animate={true}
+																motionStiffness={90}
+																motionDamping={15}
+																theme={{
+																	// TODO: Get it from theme
+																	axis: {
+																		ticks: {
+																			text: {
+																				fill: '#9EA2A8',
+																				fontFamily: 'Inter, -apple-system, system-ui, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Helvetica Neue", "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Meiryo UI", Arial, sans-serif',
+																				fontSize: 10,
+																				fontStyle: 'normal',
+																				fontWeight: '600',
+																				letterSpacing: '0.2px',
+																				lineHeight: '12px',
+																			},
+																		},
+																	},
+																	tooltip: {
+																		container: {
+																			backgroundColor: '#1F2329',
+																			boxShadow: '0px 0px 12px rgba(47, 52, 61, 0.12), 0px 0px 2px rgba(47, 52, 61, 0.08)',
+																			borderRadius: 2,
+																		},
+																	},
+																}}
+																tooltip={({ value }) => <Box textStyle='p2' textColor='alternative'>
+																	{t('Value_messages', { value })}
+																</Box>}
+															/>
+														</Box>
+													</Box>
+												</Margins>
+											</Flex.Item>
+											<Flex.Item basis='auto'>
+												<Margins block='neg-x4'>
+													<Box>
+														<Margins block='x4'>
+															<Box textColor='info' textStyle='p1'>
+																<LegendSymbol color='#FFD031' />
+																{t('Private_Chats')}
+															</Box>
+															<Box textColor='info' textStyle='p1'>
+																<LegendSymbol color='#2DE0A5' />
+																{t('Private_Channels')}
+															</Box>
+															<Box textColor='info' textStyle='p1'>
+																<LegendSymbol color='#1D74F5' />
+																{t('Public_Channels')}
+															</Box>
+														</Margins>
+													</Box>
+												</Margins>
+											</Flex.Item>
+										</Box>
+										: <Skeleton variant='rect' height={300} />}
+								</Flex.Container>
+							</Box>
+						</Flex.Item>
+						<Flex.Item grow={1} shrink={0} basis='0'>
+							<Box>
+								<Margins blockEnd='x16'>
+									{table ? <Box textStyle='p1'>{t('Most_popular_channels_top_5')}</Box> : <Skeleton width='50%' />}
+								</Margins>
+								{table && !table.length && <Tile textStyle='p1' textColor='info' style={{ textAlign: 'center' }}>
+									{t('Not_enough_data')}
+								</Tile>}
+								{(!table || !!table.length) && <Table>
+									<Table.Head>
+										<Table.Row>
+											<Table.Cell>{'#'}</Table.Cell>
+											<Table.Cell>{t('Channel')}</Table.Cell>
+											<Table.Cell align='end'>{t('Number_of_messages')}</Table.Cell>
+										</Table.Row>
+									</Table.Head>
+									<Table.Body>
+										{table && table.map(({ i, t, name, messages }) => <Table.Row key={i}>
+											<Table.Cell>{i + 1}.</Table.Cell>
+											<Table.Cell>
+												<Margins inlineEnd='x4'>
+													{(t === 'd' && <Icon name='at' />)
+													|| (t === 'c' && <Icon name='lock' />)
+													|| (t === 'p' && <Icon name='hashtag' />)}
+												</Margins>
+												{name}
+											</Table.Cell>
+											<Table.Cell align='end'>{messages}</Table.Cell>
+										</Table.Row>)}
+										{!table && Array.from({ length: 5 }, (_, i) => <Table.Row key={i}>
+											<Table.Cell>
+												<Skeleton width='100%' />
+											</Table.Cell>
+											<Table.Cell>
+												<Skeleton width='100%' />
+											</Table.Cell>
+											<Table.Cell align='end'>
+												<Skeleton width='100%' />
+											</Table.Cell>
+										</Table.Row>)}
+									</Table.Body>
+								</Table>}
+							</Box>
+						</Flex.Item>
+					</Margins>
+				</Box>
+			</Margins>
+		</Flex.Container>
+	</Section>;
+}
diff --git a/ee/app/engagement-dashboard/client/components/MessagesTab/MessagesSentSection.js b/ee/app/engagement-dashboard/client/components/MessagesTab/MessagesSentSection.js
new file mode 100644
index 000000000000..aefd34d74885
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/MessagesTab/MessagesSentSection.js
@@ -0,0 +1,169 @@
+import { ResponsiveBar } from '@nivo/bar';
+import { Box, Flex, Select, Skeleton } from '@rocket.chat/fuselage';
+import moment from 'moment';
+import React, { useMemo, useState } from 'react';
+
+import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
+import { CounterSet } from '../data/CounterSet';
+import { Section } from '../Section';
+import { useEndpointData } from '../../hooks/useEndpointData';
+
+export function MessagesSentSection() {
+	const t = useTranslation();
+
+	const periodOptions = useMemo(() => [
+		['last 7 days', t('Last_7_days')],
+		['last 30 days', t('Last_30_days')],
+		['last 90 days', t('Last_90_days')],
+	], [t]);
+
+	const [periodId, setPeriodId] = useState('last 7 days');
+
+	const period = useMemo(() => {
+		switch (periodId) {
+			case 'last 7 days':
+				return {
+					start: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(7, 'days'),
+					end: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(1),
+				};
+
+			case 'last 30 days':
+				return {
+					start: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(30, 'days'),
+					end: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(1),
+				};
+
+			case 'last 90 days':
+				return {
+					start: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(90, 'days'),
+					end: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(1),
+				};
+		}
+	}, [periodId]);
+
+	const handlePeriodChange = (periodId) => setPeriodId(periodId);
+
+	const params = useMemo(() => ({
+		start: period.start.toISOString(),
+		end: period.end.toISOString(),
+	}), [period]);
+
+	const data = useEndpointData('GET', 'engagement-dashboard/messages/messages-sent', params);
+
+	const [
+		countFromPeriod,
+		variatonFromPeriod,
+		countFromYesterday,
+		variationFromYesterday,
+		values,
+	] = useMemo(() => {
+		if (!data) {
+			return [];
+		}
+
+		const values = Array.from({ length: moment(period.end).diff(period.start, 'days') + 1 }, (_, i) => ({
+			date: moment(period.start).add(i, 'days').toISOString(),
+			newUsers: 0,
+		}));
+		for (const { day, users } of data.days) {
+			const i = moment(day).diff(period.start, 'days');
+			values[i].newUsers += users;
+		}
+
+		return [
+			data.period.count,
+			data.period.variation,
+			data.yesterday.count,
+			data.yesterday.variation,
+			values,
+		];
+	}, [data, period]);
+
+	return <Section
+		title={t('Messages_sent')}
+		filter={<Select options={periodOptions} value={periodId} onChange={handlePeriodChange} />}
+	>
+		<CounterSet
+			counters={[
+				{
+					count: data ? countFromPeriod : <Skeleton variant='rect' width='3ex' height='1em' />,
+					variation: data ? variatonFromPeriod : 0,
+					description: periodOptions.find(([id]) => id === periodId)[1],
+				},
+				{
+					count: data ? countFromYesterday : <Skeleton variant='rect' width='3ex' height='1em' />,
+					variation: data ? variationFromYesterday : 0,
+					description: t('Yesterday'),
+				},
+			]}
+		/>
+		<Flex.Container>
+			{data
+				? <Box style={{ height: 240 }}>
+					<Flex.Item align='stretch' grow={1} shrink={0}>
+						<Box style={{ position: 'relative' }}>
+							<Box style={{ position: 'absolute', width: '100%', height: '100%' }}>
+								<ResponsiveBar
+									data={values}
+									indexBy='date'
+									keys={['newUsers']}
+									groupMode='grouped'
+									padding={0.25}
+									margin={{
+										// TODO: Get it from theme
+										bottom: 20,
+									}}
+									colors={[
+										// TODO: Get it from theme
+										'#1d74f5',
+									]}
+									enableLabel={false}
+									enableGridY={false}
+									axisTop={null}
+									axisRight={null}
+									axisBottom={(values.length === 7 && {
+										tickSize: 0,
+										// TODO: Get it from theme
+										tickPadding: 4,
+										tickRotation: 0,
+										format: (date) => moment(date).format('dddd'),
+									}) || null }
+									axisLeft={null}
+									animate={true}
+									motionStiffness={90}
+									motionDamping={15}
+									theme={{
+										// TODO: Get it from theme
+										axis: {
+											ticks: {
+												text: {
+													fill: '#9EA2A8',
+													fontFamily: 'Inter, -apple-system, system-ui, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Helvetica Neue", "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Meiryo UI", Arial, sans-serif',
+													fontSize: '10px',
+													fontStyle: 'normal',
+													fontWeight: '600',
+													letterSpacing: '0.2px',
+													lineHeight: '12px',
+												},
+											},
+										},
+										tooltip: {
+											container: {
+												backgroundColor: '#1F2329',
+												boxShadow: '0px 0px 12px rgba(47, 52, 61, 0.12), 0px 0px 2px rgba(47, 52, 61, 0.08)',
+												borderRadius: 2,
+											},
+										},
+									}}
+									tooltip={({ value }) => <Box textStyle='p2' textColor='alternative'>
+										{t('Value_users', { value })}
+									</Box>}
+								/>
+							</Box>
+						</Box>
+					</Flex.Item>
+				</Box>
+				: <Skeleton variant='rect' height={240} />}
+		</Flex.Container>
+	</Section>;
+}
diff --git a/ee/app/engagement-dashboard/client/components/MessagesTab/index.js b/ee/app/engagement-dashboard/client/components/MessagesTab/index.js
new file mode 100644
index 000000000000..04daa9970db2
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/MessagesTab/index.js
@@ -0,0 +1,13 @@
+import { Divider } from '@rocket.chat/fuselage';
+import React from 'react';
+
+import { MessagesSentSection } from './MessagesSentSection';
+import { MessagesPerChannelSection } from './MessagesPerChannelSection';
+
+export function MessagesTab() {
+	return <>
+		<MessagesSentSection />
+		<Divider />
+		<MessagesPerChannelSection />
+	</>;
+}
diff --git a/ee/app/engagement-dashboard/client/components/MessagesTab/index.stories.js b/ee/app/engagement-dashboard/client/components/MessagesTab/index.stories.js
new file mode 100644
index 000000000000..196bf07ea4b4
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/MessagesTab/index.stories.js
@@ -0,0 +1,14 @@
+import { Margins } from '@rocket.chat/fuselage';
+import React from 'react';
+
+import { MessagesTab } from '.';
+
+export default {
+	title: 'admin/engagement/MessagesTab',
+	component: MessagesTab,
+	decorators: [
+		(fn) => <Margins children={fn()} all='x24' />,
+	],
+};
+
+export const _default = () => <MessagesTab />;
diff --git a/ee/app/engagement-dashboard/client/components/Section.js b/ee/app/engagement-dashboard/client/components/Section.js
new file mode 100644
index 000000000000..94c9e22cec0e
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/Section.js
@@ -0,0 +1,24 @@
+import { Box, Flex, InputBox, Margins } from '@rocket.chat/fuselage';
+import React from 'react';
+
+export function Section({
+	children,
+	title,
+	filter = <InputBox.Skeleton />,
+}) {
+	return <Box>
+		<Margins block='x16'>
+			<Flex.Container alignItems='center' wrap='no-wrap'>
+				<Box>
+					<Flex.Item grow={1}>
+						<Box textStyle='s2' textColor='default'>{title}</Box>
+					</Flex.Item>
+					{filter && <Flex.Item grow={0}>
+						{filter}
+					</Flex.Item>}
+				</Box>
+			</Flex.Container>
+			{children}
+		</Margins>
+	</Box>;
+}
diff --git a/ee/app/engagement-dashboard/client/components/UsersTab/ActiveUsersSection.js b/ee/app/engagement-dashboard/client/components/UsersTab/ActiveUsersSection.js
new file mode 100644
index 000000000000..d90e5c649474
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/UsersTab/ActiveUsersSection.js
@@ -0,0 +1,223 @@
+import { ResponsiveLine } from '@nivo/line';
+import { Box, Flex, Skeleton, Tile } from '@rocket.chat/fuselage';
+import moment from 'moment';
+import React, { useMemo } from 'react';
+
+import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
+import { CounterSet } from '../data/CounterSet';
+import { LegendSymbol } from '../data/LegendSymbol';
+import { useEndpointData } from '../../hooks/useEndpointData';
+import { Section } from '../Section';
+
+export function ActiveUsersSection() {
+	const t = useTranslation();
+
+	const period = useMemo(() => ({
+		start: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(30, 'days'),
+		end: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(1),
+	}), []);
+
+	const params = useMemo(() => ({
+		start: period.start.clone().subtract(30, 'days').toISOString(),
+		end: period.end.toISOString(),
+	}), [period]);
+
+	const data = useEndpointData('GET', 'engagement-dashboard/users/active-users', params);
+
+	const [
+		countDailyActiveUsers,
+		diffDailyActiveUsers,
+		countWeeklyActiveUsers,
+		diffWeeklyActiveUsers,
+		countMonthlyActiveUsers,
+		diffMonthlyActiveUsers,
+		dauValues,
+		wauValues,
+		mauValues,
+	] = useMemo(() => {
+		if (!data) {
+			return [];
+		}
+
+		const createPoint = (i) => ({
+			x: moment(period.start).add(i, 'days').toDate(),
+			y: 0,
+		});
+
+		const createPoints = () => Array.from({ length: moment(period.end).diff(period.start, 'days') + 1 }, (_, i) => createPoint(i));
+
+		const distributeValueOverPoints = (value, i, T, array, prev) => {
+			for (let j = 0; j < T; ++j) {
+				const k = i + j;
+
+				if (k >= array.length) {
+					continue;
+				}
+
+				if (k >= 0) {
+					array[k].y += value;
+				}
+
+				if (k === -1) {
+					prev.y += value;
+				}
+			}
+		};
+
+		const dauValues = createPoints();
+		const prevDauValue = createPoint(-1);
+		const wauValues = createPoints();
+		const prevWauValue = createPoint(-1);
+		const mauValues = createPoints();
+		const prevMauValue = createPoint(-1);
+
+		for (const { users, day, month, year } of data.month) {
+			const i = moment.utc([year, month - 1, day, 0, 0, 0, 0]).diff(period.start, 'days');
+			distributeValueOverPoints(users, i, 1, dauValues, prevDauValue);
+			distributeValueOverPoints(users, i, 7, wauValues, prevWauValue);
+			distributeValueOverPoints(users, i, 30, mauValues, prevMauValue);
+		}
+
+		return [
+			dauValues[dauValues.length - 1].y,
+			dauValues[dauValues.length - 1].y - prevDauValue.y,
+			wauValues[wauValues.length - 1].y,
+			wauValues[wauValues.length - 1].y - prevWauValue.y,
+			mauValues[mauValues.length - 1].y,
+			mauValues[mauValues.length - 1].y - prevMauValue.y,
+			dauValues,
+			wauValues,
+			mauValues,
+		];
+	}, [period, data]);
+
+	return <Section title={t('Active_users')} filter={null}>
+		<CounterSet
+			counters={[
+				{
+					count: data ? countDailyActiveUsers : <Skeleton variant='rect' width='3ex' height='1em' />,
+					variation: data ? diffDailyActiveUsers : 0,
+					description: <><LegendSymbol color='#D1EBFE' /> {t('Daily_Active_Users')}</>,
+				},
+				{
+					count: data ? countWeeklyActiveUsers : <Skeleton variant='rect' width='3ex' height='1em' />,
+					variation: data ? diffWeeklyActiveUsers : 0,
+					description: <><LegendSymbol color='#76B7FC' /> {t('Weekly_Active_Users')}</>,
+				},
+				{
+					count: data ? countMonthlyActiveUsers : <Skeleton variant='rect' width='3ex' height='1em' />,
+					variation: data ? diffMonthlyActiveUsers : 0,
+					description: <><LegendSymbol color='#1D74F5' /> {t('Monthly_Active_Users')}</>,
+				},
+			]}
+		/>
+		<Flex.Container>
+			{data
+				? <Box style={{ height: 240 }}>
+					<Flex.Item align='stretch' grow={1} shrink={0}>
+						<Box style={{ position: 'relative' }}>
+							<Box style={{ position: 'absolute', width: '100%', height: '100%' }}>
+								<ResponsiveLine
+									data={[
+										{
+											id: 'dau',
+											data: dauValues,
+										},
+										{
+											id: 'wau',
+											data: wauValues,
+										},
+										{
+											id: 'mau',
+											data: mauValues,
+										},
+									]}
+									xScale={{
+										type: 'time',
+										format: 'native',
+										precision: 'day',
+									}}
+									xFormat='time:%Y-%m-%d'
+									yScale={{
+										type: 'linear',
+										stacked: true,
+									}}
+									enableGridX={false}
+									enableGridY={false}
+									enablePoints={false}
+									useMesh
+									enableArea
+									areaOpacity={1}
+									enableCrosshair
+									crosshairType='bottom'
+									margin={{
+										// TODO: Get it from theme
+										top: 0,
+										bottom: 20,
+										right: 0,
+										left: 40,
+									}}
+									colors={[
+										'#D1EBFE',
+										'#76B7FC',
+										'#1D74F5',
+									]}
+									axisLeft={{
+										// TODO: Get it from theme
+										tickSize: 0,
+										tickPadding: 4,
+										tickRotation: 0,
+										tickValues: 3,
+									}}
+									axisBottom={{
+										// TODO: Get it from theme
+										tickSize: 0,
+										tickPadding: 4,
+										tickRotation: 0,
+										tickValues: 'every 3 days',
+										format: (date) => moment(date).format(dauValues.length === 7 ? 'dddd' : 'L'),
+									}}
+									animate={true}
+									motionStiffness={90}
+									motionDamping={15}
+									theme={{
+										// TODO: Get it from theme
+										axis: {
+											ticks: {
+												text: {
+													fill: '#9EA2A8',
+													fontFamily: 'Inter, -apple-system, system-ui, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Helvetica Neue", "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Meiryo UI", Arial, sans-serif',
+													fontSize: '10px',
+													fontStyle: 'normal',
+													fontWeight: '600',
+													letterSpacing: '0.2px',
+													lineHeight: '12px',
+												},
+											},
+										},
+										tooltip: {
+											container: {
+												backgroundColor: '#1F2329',
+												boxShadow: '0px 0px 12px rgba(47, 52, 61, 0.12), 0px 0px 2px rgba(47, 52, 61, 0.08)',
+												borderRadius: 2,
+											},
+										},
+									}}
+									enableSlices='x'
+									sliceTooltip={({ slice: { points } }) => <Tile elevation='2'>
+										{points.map(({ serieId, data: { y: activeUsers } }) =>
+											<Box key={serieId} textStyle='p2'>
+												{(serieId === 'dau' && t('DAU_value', { value: activeUsers }))
+										|| (serieId === 'wau' && t('WAU_value', { value: activeUsers }))
+										|| (serieId === 'mau' && t('MAU_value', { value: activeUsers }))}
+											</Box>)}
+									</Tile>}
+								/>
+							</Box>
+						</Box>
+					</Flex.Item>
+				</Box>
+				: <Skeleton variant='rect' height={240} />}
+		</Flex.Container>
+	</Section>;
+}
diff --git a/ee/app/engagement-dashboard/client/components/UsersTab/BusiestChatTimesSection.js b/ee/app/engagement-dashboard/client/components/UsersTab/BusiestChatTimesSection.js
new file mode 100644
index 000000000000..86091bd74095
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/UsersTab/BusiestChatTimesSection.js
@@ -0,0 +1,250 @@
+import { ResponsiveBar } from '@nivo/bar';
+import { Box, Button, Chevron, Flex, Margins, Select, Skeleton } from '@rocket.chat/fuselage';
+import moment from 'moment';
+import React, { useMemo, useState } from 'react';
+
+import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
+import { Section } from '../Section';
+import { useEndpointData } from '../../hooks/useEndpointData';
+
+function ContentForHours({ displacement, onPreviousDateClick, onNextDateClick }) {
+	const t = useTranslation();
+
+	const currentDate = useMemo(() =>
+		moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 })
+			.subtract(1).subtract(displacement, 'days'), [displacement]);
+	const params = useMemo(() => ({ start: currentDate.toISOString() }), [currentDate]);
+	const data = useEndpointData('GET', 'engagement-dashboard/users/chat-busier/hourly-data', params);
+	const values = useMemo(() => {
+		if (!data) {
+			return [];
+		}
+
+		const divider = 2;
+		const values = Array.from({ length: 24 / divider }, (_, i) => ({
+			hour: divider * i,
+			users: 0,
+		}));
+		for (const { hour, users } of data.hours) {
+			const i = Math.floor(hour / divider);
+			values[i] = values[i] || { hour: divider * i, users: 0 };
+			values[i].users += users;
+		}
+
+		return values;
+	}, [data]);
+
+	return <>
+		<Flex.Container alignItems='center' justifyContent='center'>
+			<Box>
+				<Button ghost square small onClick={onPreviousDateClick}>
+					<Chevron left size='20' style={{ verticalAlign: 'middle' }} />
+				</Button>
+				<Flex.Item basis='25%'>
+					<Margins inline='x8'>
+						<Box is='span' style={{ textAlign: 'center' }}>
+							{currentDate.format(displacement < 7 ? 'dddd' : 'L')}
+						</Box>
+					</Margins>
+				</Flex.Item>
+				<Button ghost square small disabled={displacement === 0} onClick={onNextDateClick}>
+					<Chevron right size='20' style={{ verticalAlign: 'middle' }} />
+				</Button>
+			</Box>
+		</Flex.Container>
+		<Flex.Container>
+			{data
+				? <Box style={{ height: 196 }}>
+					<Flex.Item align='stretch' grow={1} shrink={0}>
+						<Box style={{ position: 'relative' }}>
+							<Box style={{ position: 'absolute', width: '100%', height: '100%' }}>
+								<ResponsiveBar
+									data={values}
+									indexBy='hour'
+									keys={['users']}
+									groupMode='grouped'
+									padding={0.25}
+									margin={{
+										// TODO: Get it from theme
+										bottom: 20,
+									}}
+									colors={[
+										// TODO: Get it from theme
+										'#1d74f5',
+									]}
+									enableLabel={false}
+									enableGridY={false}
+									axisTop={null}
+									axisRight={null}
+									axisBottom={{
+										tickSize: 0,
+										// TODO: Get it from theme
+										tickPadding: 4,
+										tickRotation: 0,
+										tickValues: 'every 2 hours',
+										format: (hour) => moment().set({ hour, minute: 0, second: 0 }).format('LT'),
+									}}
+									axisLeft={null}
+									animate={true}
+									motionStiffness={90}
+									motionDamping={15}
+									theme={{
+										// TODO: Get it from theme
+										axis: {
+											ticks: {
+												text: {
+													fill: '#9EA2A8',
+													fontFamily: 'Inter, -apple-system, system-ui, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Helvetica Neue", "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Meiryo UI", Arial, sans-serif',
+													fontSize: '10px',
+													fontStyle: 'normal',
+													fontWeight: '600',
+													letterSpacing: '0.2px',
+													lineHeight: '12px',
+												},
+											},
+										},
+										tooltip: {
+											container: {
+												backgroundColor: '#1F2329',
+												boxShadow: '0px 0px 12px rgba(47, 52, 61, 0.12), 0px 0px 2px rgba(47, 52, 61, 0.08)',
+												borderRadius: 2,
+											},
+										},
+									}}
+									tooltip={({ value }) => <Box textStyle='p2' textColor='alternative'>
+										{t('Value_users', { value })}
+									</Box>}
+								/>
+							</Box>
+						</Box>
+					</Flex.Item>
+				</Box>
+				: <Skeleton variant='rect' height={196} />}
+		</Flex.Container>
+	</>;
+}
+
+function ContentForDays({ displacement, onPreviousDateClick, onNextDateClick }) {
+	const currentDate = useMemo(() => moment.utc().subtract(displacement, 'weeks'), [displacement]);
+	const formattedCurrentDate = useMemo(() => {
+		const startOfWeekDate = currentDate.clone().subtract(6, 'days');
+		return `${ startOfWeekDate.format('L') } - ${ currentDate.format('L') }`;
+	}, [currentDate]);
+	const params = useMemo(() => ({ start: currentDate.toISOString() }), [currentDate]);
+	const data = useEndpointData('GET', 'engagement-dashboard/users/chat-busier/weekly-data', params);
+	const values = useMemo(() => (data ? data.month.map(({ users, day, month, year }) => ({
+		users,
+		day: moment.utc([year, month - 1, day, 0, 0, 0]).valueOf(),
+	})).sort(({ day: a }, { day: b }) => a - b) : []), [data]);
+
+	return <>
+		<Flex.Container alignItems='center' justifyContent='center'>
+			<Box>
+				<Button ghost square small onClick={onPreviousDateClick}>
+					<Chevron left size='20' style={{ verticalAlign: 'middle' }} />
+				</Button>
+				<Flex.Item basis='50%'>
+					<Margins inline='x8'>
+						<Box is='span' style={{ textAlign: 'center' }}>
+							{formattedCurrentDate}
+						</Box>
+					</Margins>
+				</Flex.Item>
+				<Button ghost square small disabled={displacement === 0} onClick={onNextDateClick}>
+					<Chevron right size='20' style={{ verticalAlign: 'middle' }} />
+				</Button>
+			</Box>
+		</Flex.Container>
+		<Flex.Container>
+			{data
+				? <Box style={{ height: 196 }}>
+					<Flex.Item align='stretch' grow={1} shrink={0}>
+						<Box style={{ position: 'relative' }}>
+							<Box style={{ position: 'absolute', width: '100%', height: '100%' }}>
+								<ResponsiveBar
+									data={values}
+									indexBy='day'
+									keys={['users']}
+									groupMode='grouped'
+									padding={0.25}
+									margin={{
+										// TODO: Get it from theme
+										bottom: 20,
+									}}
+									colors={[
+										// TODO: Get it from theme
+										'#1d74f5',
+									]}
+									enableLabel={false}
+									enableGridY={false}
+									axisTop={null}
+									axisRight={null}
+									axisBottom={{
+										tickSize: 0,
+										// TODO: Get it from theme
+										tickPadding: 4,
+										tickRotation: 0,
+										tickValues: 'every 3 days',
+										format: (timestamp) => moment(timestamp).format('L'),
+									}}
+									axisLeft={null}
+									animate={true}
+									motionStiffness={90}
+									motionDamping={15}
+									theme={{
+										// TODO: Get it from theme
+										axis: {
+											ticks: {
+												text: {
+													fill: '#9EA2A8',
+													fontFamily: 'Inter, -apple-system, system-ui, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Helvetica Neue", "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Meiryo UI", Arial, sans-serif',
+													fontSize: '10px',
+													fontStyle: 'normal',
+													fontWeight: '600',
+													letterSpacing: '0.2px',
+													lineHeight: '12px',
+												},
+											},
+										},
+									}}
+								/>
+							</Box>
+						</Box>
+					</Flex.Item>
+				</Box>
+				: <Skeleton variant='rect' height={196} />}
+		</Flex.Container>
+	</>;
+}
+
+export function BusiestChatTimesSection() {
+	const t = useTranslation();
+
+	const [timeUnit, setTimeUnit] = useState('hours');
+	const timeUnitOptions = useMemo(() => [
+		['hours', t('Hours')],
+		['days', t('Days')],
+	], [t]);
+
+	const handleTimeUnitChange = (timeUnit) => {
+		setTimeUnit(timeUnit);
+	};
+
+	const [displacement, setDisplacement] = useState(0);
+
+	const handlePreviousDateClick = () => setDisplacement((displacement) => displacement + 1);
+	const handleNextDateClick = () => setDisplacement((displacement) => displacement - 1);
+
+	const Content = (timeUnit === 'hours' && ContentForHours) || (timeUnit === 'days' && ContentForDays);
+
+	return <Section
+		title={t('When_is_the_chat_busier?')}
+		filter={<Select options={timeUnitOptions} value={timeUnit} onChange={handleTimeUnitChange} />}
+	>
+		<Content
+			displacement={displacement}
+			onPreviousDateClick={handlePreviousDateClick}
+			onNextDateClick={handleNextDateClick}
+		/>
+	</Section>;
+}
diff --git a/ee/app/engagement-dashboard/client/components/UsersTab/NewUsersSection.js b/ee/app/engagement-dashboard/client/components/UsersTab/NewUsersSection.js
new file mode 100644
index 000000000000..3ffb763f91cb
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/UsersTab/NewUsersSection.js
@@ -0,0 +1,169 @@
+import { ResponsiveBar } from '@nivo/bar';
+import { Box, Flex, Select, Skeleton } from '@rocket.chat/fuselage';
+import moment from 'moment';
+import React, { useMemo, useState } from 'react';
+
+import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
+import { useEndpointData } from '../../hooks/useEndpointData';
+import { CounterSet } from '../data/CounterSet';
+import { Section } from '../Section';
+
+export function NewUsersSection() {
+	const t = useTranslation();
+
+	const periodOptions = useMemo(() => [
+		['last 7 days', t('Last_7_days')],
+		['last 30 days', t('Last_30_days')],
+		['last 90 days', t('Last_90_days')],
+	], [t]);
+
+	const [periodId, setPeriodId] = useState('last 7 days');
+
+	const period = useMemo(() => {
+		switch (periodId) {
+			case 'last 7 days':
+				return {
+					start: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(7, 'days'),
+					end: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(1),
+				};
+
+			case 'last 30 days':
+				return {
+					start: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(30, 'days'),
+					end: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(1),
+				};
+
+			case 'last 90 days':
+				return {
+					start: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(90, 'days'),
+					end: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(1),
+				};
+		}
+	}, [periodId]);
+
+	const handlePeriodChange = (periodId) => setPeriodId(periodId);
+
+	const params = useMemo(() => ({
+		start: period.start.toISOString(),
+		end: period.end.toISOString(),
+	}), [period]);
+
+	const data = useEndpointData('GET', 'engagement-dashboard/users/new-users', params);
+
+	const [
+		countFromPeriod,
+		variatonFromPeriod,
+		countFromYesterday,
+		variationFromYesterday,
+		values,
+	] = useMemo(() => {
+		if (!data) {
+			return [];
+		}
+
+		const values = Array.from({ length: moment(period.end).diff(period.start, 'days') + 1 }, (_, i) => ({
+			date: moment(period.start).add(i, 'days').toISOString(),
+			newUsers: 0,
+		}));
+		for (const { day, users } of data.days) {
+			const i = moment(day).diff(period.start, 'days');
+			values[i].newUsers += users;
+		}
+
+		return [
+			data.period.count,
+			data.period.variation,
+			data.yesterday.count,
+			data.yesterday.variation,
+			values,
+		];
+	}, [data, period]);
+
+	return <Section
+		title={t('New_users')}
+		filter={<Select options={periodOptions} value={periodId} onChange={handlePeriodChange} />}
+	>
+		<CounterSet
+			counters={[
+				{
+					count: data ? countFromPeriod : <Skeleton variant='rect' width='3ex' height='1em' />,
+					variation: data ? variatonFromPeriod : 0,
+					description: periodOptions.find(([id]) => id === periodId)[1],
+				},
+				{
+					count: data ? countFromYesterday : <Skeleton variant='rect' width='3ex' height='1em' />,
+					variation: data ? variationFromYesterday : 0,
+					description: t('Yesterday'),
+				},
+			]}
+		/>
+		<Flex.Container>
+			{data
+				? <Box style={{ height: 240 }}>
+					<Flex.Item align='stretch' grow={1} shrink={0}>
+						<Box style={{ position: 'relative' }}>
+							<Box style={{ position: 'absolute', width: '100%', height: '100%' }}>
+								<ResponsiveBar
+									data={values}
+									indexBy='date'
+									keys={['newUsers']}
+									groupMode='grouped'
+									padding={0.25}
+									margin={{
+										// TODO: Get it from theme
+										bottom: 20,
+									}}
+									colors={[
+										// TODO: Get it from theme
+										'#1d74f5',
+									]}
+									enableLabel={false}
+									enableGridY={false}
+									axisTop={null}
+									axisRight={null}
+									axisBottom={(values.length === 7 && {
+										tickSize: 0,
+										// TODO: Get it from theme
+										tickPadding: 4,
+										tickRotation: 0,
+										format: (date) => moment(date).format('dddd'),
+									}) || null }
+									axisLeft={null}
+									animate={true}
+									motionStiffness={90}
+									motionDamping={15}
+									theme={{
+										// TODO: Get it from theme
+										axis: {
+											ticks: {
+												text: {
+													fill: '#9EA2A8',
+													fontFamily: 'Inter, -apple-system, system-ui, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Helvetica Neue", "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Meiryo UI", Arial, sans-serif',
+													fontSize: '10px',
+													fontStyle: 'normal',
+													fontWeight: '600',
+													letterSpacing: '0.2px',
+													lineHeight: '12px',
+												},
+											},
+										},
+										tooltip: {
+											container: {
+												backgroundColor: '#1F2329',
+												boxShadow: '0px 0px 12px rgba(47, 52, 61, 0.12), 0px 0px 2px rgba(47, 52, 61, 0.08)',
+												borderRadius: 2,
+											},
+										},
+									}}
+									tooltip={({ value }) => <Box textStyle='p2' textColor='alternative'>
+										{t('Value_users', { value })}
+									</Box>}
+								/>
+							</Box>
+						</Box>
+					</Flex.Item>
+				</Box>
+				: <Skeleton variant='rect' height={240} />}
+		</Flex.Container>
+	</Section>;
+}
diff --git a/ee/app/engagement-dashboard/client/components/UsersTab/UsersByTimeOfTheDaySection.js b/ee/app/engagement-dashboard/client/components/UsersTab/UsersByTimeOfTheDaySection.js
new file mode 100644
index 000000000000..08b17733f268
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/UsersTab/UsersByTimeOfTheDaySection.js
@@ -0,0 +1,166 @@
+import { ResponsiveHeatMap } from '@nivo/heatmap';
+import { Box, Flex, Select, Skeleton } from '@rocket.chat/fuselage';
+import moment from 'moment';
+import React, { useMemo, useState } from 'react';
+
+import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
+import { Section } from '../Section';
+import { useEndpointData } from '../../hooks/useEndpointData';
+
+export function UsersByTimeOfTheDaySection() {
+	const t = useTranslation();
+
+	const periodOptions = useMemo(() => [
+		['last 7 days', t('Last_7_days')],
+		['last 30 days', t('Last_30_days')],
+		['last 90 days', t('Last_90_days')],
+	], [t]);
+
+	const [periodId, setPeriodId] = useState('last 7 days');
+
+	const period = useMemo(() => {
+		switch (periodId) {
+			case 'last 7 days':
+				return {
+					start: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(7, 'days'),
+					end: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(1),
+				};
+
+			case 'last 30 days':
+				return {
+					start: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(30, 'days'),
+					end: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(1),
+				};
+
+			case 'last 90 days':
+				return {
+					start: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(90, 'days'),
+					end: moment().set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).subtract(1),
+				};
+		}
+	}, [periodId]);
+
+	const handlePeriodChange = (periodId) => setPeriodId(periodId);
+
+	const params = useMemo(() => ({
+		start: period.start.toISOString(),
+		end: period.end.toISOString(),
+	}), [period]);
+
+	const data = useEndpointData('GET', 'engagement-dashboard/users/users-by-time-of-the-day-in-a-week', params);
+
+	const [
+		dates,
+		values,
+	] = useMemo(() => {
+		if (!data) {
+			return [];
+		}
+
+		const dates = Array.from({ length: moment(period.end).diff(period.start, 'days') + 1 },
+			(_, i) => moment(period.start).add(i, 'days'));
+
+		const values = Array.from({ length: 24 }, (_, hour) => ({
+			hour: String(hour),
+			...dates.map((date) => ({ [date.toISOString()]: 0 }))
+				.reduce((obj, elem) => ({ ...obj, ...elem }), {}),
+		}));
+
+		for (const { users, hour, day, month, year } of data.week) {
+			const date = moment([year, month - 1, day, 0, 0, 0, 0]).toISOString();
+			values[hour][date] += users;
+		}
+
+		return [
+			dates.map((date) => date.toISOString()),
+			values,
+		];
+	}, [data]);
+
+	return <Section
+		title={t('Users_by_time_of_day')}
+		filter={<Select options={periodOptions} value={periodId} onChange={handlePeriodChange} />}
+	>
+		<Flex.Container>
+			{data
+				? <Box style={{ height: 696 }}>
+					<Flex.Item align='stretch' grow={1} shrink={0}>
+						<Box style={{ position: 'relative' }}>
+							<Box style={{ position: 'absolute', width: '100%', height: '100%' }}>
+								<ResponsiveHeatMap
+									data={values}
+									indexBy='hour'
+									keys={dates}
+									padding={4}
+									margin={{
+										// TODO: Get it from theme
+										left: 40,
+										bottom: 20,
+									}}
+									colors={[
+										// TODO: Get it from theme
+										'#E8F2FF',
+										'#D1EBFE',
+										'#A4D3FE',
+										'#76B7FC',
+										'#549DF9',
+										'#1D74F5',
+										'#10529E',
+									]}
+									cellOpacity={1}
+									enableLabels={false}
+									axisTop={null}
+									axisRight={null}
+									axisBottom={{
+										// TODO: Get it from theme
+										tickSize: 0,
+										tickPadding: 4,
+										tickRotation: 0,
+										format: (isoString) => (dates.length === 7 ? moment(isoString).format('dddd') : ''),
+									}}
+									axisLeft={{
+										// TODO: Get it from theme
+										tickSize: 0,
+										tickPadding: 4,
+										tickRotation: 0,
+										format: (hour) => moment().set({ hour: parseInt(hour, 10), minute: 0, second: 0 }).format('LT'),
+									}}
+									hoverTarget='cell'
+									animate={dates.length <= 7}
+									motionStiffness={90}
+									motionDamping={15}
+									theme={{
+										// TODO: Get it from theme
+										axis: {
+											ticks: {
+												text: {
+													fill: '#9EA2A8',
+													fontFamily: 'Inter, -apple-system, system-ui, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Helvetica Neue", "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Meiryo UI", Arial, sans-serif',
+													fontSize: 10,
+													fontStyle: 'normal',
+													fontWeight: '600',
+													letterSpacing: '0.2px',
+													lineHeight: '12px',
+												},
+											},
+										},
+										tooltip: {
+											container: {
+												backgroundColor: '#1F2329',
+												boxShadow: '0px 0px 12px rgba(47, 52, 61, 0.12), 0px 0px 2px rgba(47, 52, 61, 0.08)',
+												borderRadius: 2,
+											},
+										},
+									}}
+									tooltip={({ value }) => <Box textStyle='p2' textColor='alternative'>
+										{t('Value_users', { value })}
+									</Box>}
+								/>
+							</Box>
+						</Box>
+					</Flex.Item>
+				</Box>
+				: <Skeleton variant='rect' height={696} />}
+		</Flex.Container>
+	</Section>;
+}
diff --git a/ee/app/engagement-dashboard/client/components/UsersTab/index.js b/ee/app/engagement-dashboard/client/components/UsersTab/index.js
new file mode 100644
index 000000000000..4bc28760fc45
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/UsersTab/index.js
@@ -0,0 +1,32 @@
+import { Box, Divider, Flex, Margins } from '@rocket.chat/fuselage';
+import React from 'react';
+
+import { NewUsersSection } from './NewUsersSection';
+import { ActiveUsersSection } from './ActiveUsersSection';
+import { UsersByTimeOfTheDaySection } from './UsersByTimeOfTheDaySection';
+import { BusiestChatTimesSection } from './BusiestChatTimesSection';
+
+export function UsersTab() {
+	return <>
+		<NewUsersSection />
+		<Divider />
+		<ActiveUsersSection />
+		<Divider />
+		<Flex.Container>
+			<Margins inline='x12'>
+				<Box>
+					<Margins inline='x12'>
+						<Flex.Item grow={1} shrink={0} basis='0'>
+							<UsersByTimeOfTheDaySection />
+						</Flex.Item>
+						<Flex.Item grow={1} shrink={0} basis='0'>
+							<Box>
+								<BusiestChatTimesSection />
+							</Box>
+						</Flex.Item>
+					</Margins>
+				</Box>
+			</Margins>
+		</Flex.Container>
+	</>;
+}
diff --git a/ee/app/engagement-dashboard/client/components/UsersTab/index.stories.js b/ee/app/engagement-dashboard/client/components/UsersTab/index.stories.js
new file mode 100644
index 000000000000..436844563289
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/UsersTab/index.stories.js
@@ -0,0 +1,14 @@
+import { Margins } from '@rocket.chat/fuselage';
+import React from 'react';
+
+import { UsersTab } from '.';
+
+export default {
+	title: 'admin/engagement/UsersTab',
+	component: UsersTab,
+	decorators: [
+		(fn) => <Margins children={fn()} all='x24' />,
+	],
+};
+
+export const _default = () => <UsersTab />;
diff --git a/ee/app/engagement-dashboard/client/components/data/Counter.js b/ee/app/engagement-dashboard/client/components/data/Counter.js
new file mode 100644
index 000000000000..9093b5e863ac
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/data/Counter.js
@@ -0,0 +1,24 @@
+import { Box, Flex, Margins } from '@rocket.chat/fuselage';
+import React from 'react';
+
+import { Growth } from './Growth';
+
+export function Counter({ count, variation = 0, description }) {
+	return <>
+		<Flex.Container alignItems='end'>
+			<Box>
+				<Box is='span' textColor='default' textStyle='h1' style={{ fontSize: '3em', lineHeight: 1 }}>
+					{count}
+				</Box>
+				<Growth textStyle='s1'>{variation}</Growth>
+			</Box>
+		</Flex.Container>
+		<Margins block='x12'>
+			<Flex.Container alignItems='center'>
+				<Box textStyle='p1' textColor='hint'>
+					{description}
+				</Box>
+			</Flex.Container>
+		</Margins>
+	</>;
+}
diff --git a/ee/app/engagement-dashboard/client/components/data/Counter.stories.js b/ee/app/engagement-dashboard/client/components/data/Counter.stories.js
new file mode 100644
index 000000000000..b61686bf6302
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/data/Counter.stories.js
@@ -0,0 +1,16 @@
+import React from 'react';
+
+import { Counter } from './Counter';
+
+export default {
+	title: 'admin/engagement/data/Counter',
+	component: Counter,
+};
+
+export const _default = () => <Counter count={123} />;
+
+export const withPositiveVariation = () => <Counter count={123} variation={4} />;
+
+export const withNegativeVariation = () => <Counter count={123} variation={-4} />;
+
+export const withDescription = () => <Counter count={123} description='Description' />;
diff --git a/ee/app/engagement-dashboard/client/components/data/CounterSet.js b/ee/app/engagement-dashboard/client/components/data/CounterSet.js
new file mode 100644
index 000000000000..26cbc5863f59
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/data/CounterSet.js
@@ -0,0 +1,16 @@
+import { Grid } from '@rocket.chat/fuselage';
+import React from 'react';
+
+import { Counter } from './Counter';
+
+export function CounterSet({ counters = [] }) {
+	return <Grid>
+		{counters.map(({ count, variation, description }, i) => <Grid.Item key={i}>
+			<Counter
+				count={count}
+				variation={variation}
+				description={description}
+			/>
+		</Grid.Item>)}
+	</Grid>;
+}
diff --git a/ee/app/engagement-dashboard/client/components/data/CounterSet.stories.js b/ee/app/engagement-dashboard/client/components/data/CounterSet.stories.js
new file mode 100644
index 000000000000..ba8e26d67f50
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/data/CounterSet.stories.js
@@ -0,0 +1,16 @@
+import React from 'react';
+
+import { CounterSet } from './CounterSet';
+
+export default {
+	title: 'admin/engagement/data/CounterSet',
+	component: CounterSet,
+};
+
+export const _default = () => <CounterSet
+	counters={[
+		{ count: 123, variation: 0 },
+		{ count: 456, variation: 7 },
+		{ count: 789, variation: -1, description: 'Description' },
+	]}
+/>;
diff --git a/ee/app/engagement-dashboard/client/components/data/Growth.js b/ee/app/engagement-dashboard/client/components/data/Growth.js
new file mode 100644
index 000000000000..46548abed93c
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/data/Growth.js
@@ -0,0 +1,16 @@
+import { Box } from '@rocket.chat/fuselage';
+import React from 'react';
+
+import { NegativeGrowthSymbol } from './NegativeGrowthSymbol';
+import { PositiveGrowthSymbol } from './PositiveGrowthSymbol';
+
+export function Growth({ children, ...props }) {
+	if (children === 0) {
+		return null;
+	}
+
+	return <Box is='span' textColor={children < 0 ? 'danger' : 'success'} {...props}>
+		{children < 0 ? <NegativeGrowthSymbol /> : <PositiveGrowthSymbol />}
+		{String(Math.abs(children))}
+	</Box>;
+}
diff --git a/ee/app/engagement-dashboard/client/components/data/Growth.stories.js b/ee/app/engagement-dashboard/client/components/data/Growth.stories.js
new file mode 100644
index 000000000000..d90790f004d3
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/data/Growth.stories.js
@@ -0,0 +1,23 @@
+import { Box, Margins } from '@rocket.chat/fuselage';
+import React from 'react';
+
+import { Growth } from './Growth';
+
+export default {
+	title: 'admin/engagement/data/Growth',
+	component: Growth,
+	decorators: [(fn) => <Margins children={fn()} all='x16' />],
+};
+
+export const positive = () => <Growth>{3}</Growth>;
+
+export const zero = () => <Growth>{0}</Growth>;
+
+export const negative = () => <Growth>{-3}</Growth>;
+
+export const withTextStyle = () =>
+	['h1', 's1', 'c1', 'micro']
+		.map((textStyle) => <Box key={textStyle}>
+			<Growth textStyle={textStyle}>{3}</Growth>
+			<Growth textStyle={textStyle}>{-3}</Growth>
+		</Box>);
diff --git a/ee/app/engagement-dashboard/client/components/data/Histogram.js b/ee/app/engagement-dashboard/client/components/data/Histogram.js
new file mode 100644
index 000000000000..30653cf05a1b
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/data/Histogram.js
@@ -0,0 +1,85 @@
+import { ResponsiveBar } from '@nivo/bar';
+import { Box, Flex } from '@rocket.chat/fuselage';
+import React from 'react';
+
+import { polychromaticColors } from './colors';
+
+export function Histogram() {
+	return <Flex.Item align='stretch' grow={1} shrink={0}>
+		<Box style={{ position: 'relative' }}>
+			<Box style={{ position: 'absolute', width: '100%', height: '100%' }}>
+				<ResponsiveBar
+					data={[
+						{
+							utc: '-3',
+							users: Math.round(100 * Math.random()),
+						},
+						{
+							utc: '-5',
+							users: Math.round(100 * Math.random()),
+						},
+						{
+							utc: '+2',
+							users: Math.round(100 * Math.random()),
+						},
+						{
+							utc: '+8',
+							users: Math.round(100 * Math.random()),
+						},
+						{
+							utc: '-6',
+							users: Math.round(100 * Math.random()),
+						},
+						{
+							utc: '16',
+							users: Math.round(100 * Math.random()),
+						},
+					]}
+					indexBy='utc'
+					keys={['users']}
+					groupMode='grouped'
+					layout='horizontal'
+					padding={0.25}
+					margin={{ left: 64, bottom: 20 }}
+					colors={[polychromaticColors[2]]}
+					enableLabel={false}
+					enableGridX
+					enableGridY={false}
+					axisTop={null}
+					axisRight={null}
+					axisBottom={{
+						tickSize: 0,
+						tickPadding: 5,
+						tickRotation: 0,
+						format: (users) => `${ users }%`,
+					}}
+					axisLeft={{
+						tickSize: 0,
+						tickPadding: 5,
+						tickRotation: 0,
+						format: (utc) => `UTF ${ utc }`,
+					}}
+					animate={true}
+					motionStiffness={90}
+					motionDamping={15}
+					theme={{
+						font: 'inherit',
+						fontStyle: 'normal',
+						fontWeight: 600,
+						fontSize: 10,
+						lineHeight: 12,
+						letterSpacing: 0.2,
+						color: '#9EA2A8',
+						grid: {
+							line: {
+								stroke: '#CBCED1',
+								strokeWidth: 1,
+								strokeDasharray: '4 1.5',
+							},
+						},
+					}}
+				/>
+			</Box>
+		</Box>
+	</Flex.Item>;
+}
diff --git a/ee/app/engagement-dashboard/client/components/data/Histogram.stories.js b/ee/app/engagement-dashboard/client/components/data/Histogram.stories.js
new file mode 100644
index 000000000000..48e3f015ff50
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/data/Histogram.stories.js
@@ -0,0 +1,16 @@
+import { Box, Flex, Margins } from '@rocket.chat/fuselage';
+import React from 'react';
+
+import { Histogram } from './Histogram';
+
+export default {
+	title: 'admin/engagement/data/Histogram',
+	component: Histogram,
+	decorators: [(fn) => <Margins all='x16'>
+		<Flex.Container>
+			<Box children={fn()} style={{ height: 240 }} />
+		</Flex.Container>
+	</Margins>],
+};
+
+export const _default = () => <Histogram />;
diff --git a/ee/app/engagement-dashboard/client/components/data/LegendSymbol.js b/ee/app/engagement-dashboard/client/components/data/LegendSymbol.js
new file mode 100644
index 000000000000..947631e97999
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/data/LegendSymbol.js
@@ -0,0 +1,19 @@
+import { Box, Margins } from '@rocket.chat/fuselage';
+import React from 'react';
+
+export function LegendSymbol({ color = 'currentColor' }) {
+	return <Margins inlineEnd='x8'>
+		<Box
+			is='span'
+			aria-hidden='true'
+			style={{
+				display: 'inline-block',
+				width: 12,
+				height: 12,
+				borderRadius: 2,
+				backgroundColor: color,
+				verticalAlign: 'baseline',
+			}}
+		/>
+	</Margins>;
+}
diff --git a/ee/app/engagement-dashboard/client/components/data/LegendSymbol.stories.js b/ee/app/engagement-dashboard/client/components/data/LegendSymbol.stories.js
new file mode 100644
index 000000000000..457456da2862
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/data/LegendSymbol.stories.js
@@ -0,0 +1,25 @@
+import { Box, Margins } from '@rocket.chat/fuselage';
+import React from 'react';
+
+import { LegendSymbol } from './LegendSymbol';
+import { monochromaticColors, polychromaticColors } from './colors';
+
+export default {
+	title: 'admin/engagement/data/LegendSymbol',
+	component: LegendSymbol,
+	decorators: [(fn) => <Margins children={fn()} all='x16' />],
+};
+
+export const _default = () => <Box>
+	<LegendSymbol />
+	Legend text
+</Box>;
+
+export const withColor = () => <>
+	{monochromaticColors.map((color) => <Box key={color}>
+		<LegendSymbol color={color} /> {color}
+	</Box>)}
+	{polychromaticColors.map((color) => <Box key={color}>
+		<LegendSymbol color={color} /> {color}
+	</Box>)}
+</>;
diff --git a/ee/app/engagement-dashboard/client/components/data/NegativeGrowthSymbol.js b/ee/app/engagement-dashboard/client/components/data/NegativeGrowthSymbol.js
new file mode 100644
index 000000000000..bb7a0944a686
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/data/NegativeGrowthSymbol.js
@@ -0,0 +1,26 @@
+import React from 'react';
+
+const style = { width: '1.5em', height: '1.5em', verticalAlign: '-0.5em' };
+
+export const NegativeGrowthSymbol = (props) =>
+	<svg
+		xmlns='http://www.w3.org/2000/svg'
+		viewBox='0 0 25 24'
+		style={style}
+		{...props}
+	>
+		<path
+			clipRule='evenodd'
+			fill='currentColor'
+			fillRule='evenodd'
+			d={`M4.70712 8.50049L8.55757 12.3509C9.14335 12.9367 10.0931 12.9367
+			10.6789 12.3509L11.9282 11.1016L15.9295 15.1029L14.2054 15.1029C13.6531
+			15.1029 13.2054 15.5506 13.2054 16.1029C13.2054 16.6551 13.6531 17.1029
+			14.2054 17.1029L18.3437 17.1029C18.896 17.1029 19.3437 16.6551 19.3437
+			16.1029L19.3437 11.9645C19.3437 11.4123 18.896 10.9645 18.3437 10.9645
+			C17.7914 10.9645 17.3437 11.4123 17.3437 11.9645L17.3437 13.6886L12.9889
+			9.33382C12.4031 8.74803 11.4534 8.74803 10.8676 9.33382L9.61823 10.5832
+			L6.12133 7.08627C5.73081 6.69575 5.09765 6.69575 4.70712 7.08628C4.3166
+			7.4768 4.3166 8.10996 4.70712 8.50049Z`}
+		/>
+	</svg>;
diff --git a/ee/app/engagement-dashboard/client/components/data/NegativeGrowthSymbol.stories.js b/ee/app/engagement-dashboard/client/components/data/NegativeGrowthSymbol.stories.js
new file mode 100644
index 000000000000..6daa6bb76414
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/data/NegativeGrowthSymbol.stories.js
@@ -0,0 +1,16 @@
+import { Box, Margins } from '@rocket.chat/fuselage';
+import React from 'react';
+
+import { NegativeGrowthSymbol } from './NegativeGrowthSymbol';
+
+export default {
+	title: 'admin/engagement/data/NegativeGrowthSymbol',
+	component: NegativeGrowthSymbol,
+	decorators: [(fn) => <Margins children={fn()} all='x16' />],
+};
+
+export const _default = () => <NegativeGrowthSymbol />;
+
+export const withColor = () => <Box textColor='danger'>
+	<NegativeGrowthSymbol />
+</Box>;
diff --git a/ee/app/engagement-dashboard/client/components/data/PositiveGrowthSymbol.js b/ee/app/engagement-dashboard/client/components/data/PositiveGrowthSymbol.js
new file mode 100644
index 000000000000..15d485dadafe
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/data/PositiveGrowthSymbol.js
@@ -0,0 +1,26 @@
+import React from 'react';
+
+const style = { width: '1.5em', height: '1.5em', verticalAlign: '-0.5em' };
+
+export const PositiveGrowthSymbol = (props) =>
+	<svg
+		xmlns='http://www.w3.org/2000/svg'
+		viewBox='0 0 24 24'
+		style={style}
+		{...props}
+	>
+		<path
+			clipRule='evenodd'
+			fill='currentColor'
+			fillRule='evenodd'
+			d={`M4.70712 15.3265L8.55757 11.4761C9.14335 10.8903 10.0931 10.8903
+			10.6789 11.4761L11.9282 12.7254L15.9295 8.72417L14.2054 8.72417C13.6531
+			8.72417 13.2054 8.27646 13.2054 7.72417C13.2054 7.17189 13.6531 6.72417
+			14.2054 6.72417L18.3437 6.72418C18.896 6.72417 19.3437 7.17189 19.3437
+			7.72418L19.3437 11.8625C19.3437 12.4148 18.896 12.8625 18.3437 12.8625
+			C17.7914 12.8625 17.3437 12.4148 17.3437 11.8625L17.3437 10.1384L12.9889
+			14.4932C12.4031 15.079 11.4534 15.079 10.8676 14.4932L9.61823 13.2439
+			L6.12133 16.7408C5.73081 17.1313 5.09765 17.1313 4.70712 16.7408C4.3166
+			16.3502 4.3166 15.7171 4.70712 15.3265Z`}
+		/>
+	</svg>;
diff --git a/ee/app/engagement-dashboard/client/components/data/PositiveGrowthSymbol.stories.js b/ee/app/engagement-dashboard/client/components/data/PositiveGrowthSymbol.stories.js
new file mode 100644
index 000000000000..d5edb0c04349
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/data/PositiveGrowthSymbol.stories.js
@@ -0,0 +1,16 @@
+import { Box, Margins } from '@rocket.chat/fuselage';
+import React from 'react';
+
+import { PositiveGrowthSymbol } from './PositiveGrowthSymbol';
+
+export default {
+	title: 'admin/engagement/data/PositiveGrowthSymbol',
+	component: PositiveGrowthSymbol,
+	decorators: [(fn) => <Margins children={fn()} all='x16' />],
+};
+
+export const _default = () => <PositiveGrowthSymbol />;
+
+export const withColor = () => <Box textColor='success'>
+	<PositiveGrowthSymbol />
+</Box>;
diff --git a/ee/app/engagement-dashboard/client/components/data/colors.js b/ee/app/engagement-dashboard/client/components/data/colors.js
new file mode 100644
index 000000000000..9373ef2f3c44
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/components/data/colors.js
@@ -0,0 +1,2 @@
+export const monochromaticColors = ['#E8F2FF', '#D1EBFE', '#A4D3FE', '#76B7FC', '#549DF9', '#1D74F5', '#10529E'];
+export const polychromaticColors = ['#FFD031', '#2DE0A5', '#1D74F5'];
diff --git a/ee/app/engagement-dashboard/client/hooks/useEndpointData.js b/ee/app/engagement-dashboard/client/hooks/useEndpointData.js
new file mode 100644
index 000000000000..d35a956ab5f5
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/hooks/useEndpointData.js
@@ -0,0 +1,52 @@
+import { useEffect, useState } from 'react';
+
+import { useEndpoint } from '../../../../../client/contexts/ServerContext';
+import { useToastMessageDispatch } from '../../../../../client/contexts/ToastMessagesContext';
+
+export const useEndpointData = (httpMethod, endpoint, params = {}) => {
+	const [data, setData] = useState(null);
+
+	const getData = useEndpoint(httpMethod, endpoint);
+	const dispatchToastMessage = useToastMessageDispatch();
+
+	useEffect(() => {
+		let mounted = true;
+
+		const fetchData = async () => {
+			try {
+				const timer = setTimeout(() => {
+					if (!mounted) {
+						return;
+					}
+
+					setData(null);
+				}, 3000);
+
+				const data = await getData(params);
+
+				clearTimeout(timer);
+
+				if (!data.success) {
+					throw new Error(data.status);
+				}
+
+				if (!mounted) {
+					return;
+				}
+
+				setData(data);
+			} catch (error) {
+				console.error(error);
+				dispatchToastMessage({ type: 'error', message: error });
+			}
+		};
+
+		fetchData();
+
+		return () => {
+			mounted = false;
+		};
+	}, [getData, params]);
+
+	return data;
+};
diff --git a/ee/app/engagement-dashboard/client/index.js b/ee/app/engagement-dashboard/client/index.js
new file mode 100644
index 000000000000..86c73e4462ce
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/index.js
@@ -0,0 +1 @@
+import './routes';
diff --git a/ee/app/engagement-dashboard/client/routes.js b/ee/app/engagement-dashboard/client/routes.js
new file mode 100644
index 000000000000..d4d966f5fd92
--- /dev/null
+++ b/ee/app/engagement-dashboard/client/routes.js
@@ -0,0 +1,71 @@
+import { Blaze } from 'meteor/blaze';
+import { HTML } from 'meteor/htmljs';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { BlazeLayout } from 'meteor/kadira:blaze-layout';
+import { Template } from 'meteor/templating';
+
+import { hasAllPermission } from '../../../../app/authorization';
+import { AdminBox } from '../../../../app/ui-utils';
+import { hasLicense } from '../../license/client';
+
+Template.EngagementDashboardRoute = new Blaze.Template('EngagementDashboardRoute',
+	() => HTML.DIV.call(null, { style: 'overflow: hidden; flex: 1 1 auto; height: 1%;' }));
+
+Template.EngagementDashboardRoute.onRendered(async function() {
+	const [
+		{ createElement },
+		{ render, unmountComponentAtNode },
+		{ MeteorProvider },
+		{ EngagementDashboardRoute },
+	] = await Promise.all([
+		import('react'),
+		import('react-dom'),
+		import('../../../../client/providers/MeteorProvider'),
+		import('./components/EngagementDashboardRoute'),
+	]);
+
+	const container = this.firstNode;
+
+	if (!container) {
+		return;
+	}
+
+	this.autorun(() => {
+		const routeName = FlowRouter.getRouteName();
+		if (routeName !== 'engagement-dashboard') {
+			unmountComponentAtNode(container);
+		}
+	});
+
+	render(createElement(MeteorProvider, { children: createElement(EngagementDashboardRoute) }), container);
+});
+
+let licensed = false;
+
+FlowRouter.route('/admin/engagement-dashboard/:tab?', {
+	name: 'engagement-dashboard',
+	action: () => {
+		if (!licensed) {
+			return;
+		}
+
+		BlazeLayout.render('main', { center: 'EngagementDashboardRoute' });
+	},
+});
+
+hasLicense('engagement-dashboard').then((enabled) => {
+	if (!enabled) {
+		return;
+	}
+
+	licensed = true;
+
+	AdminBox.addOption({
+		href: 'engagement-dashboard',
+		i18nLabel: 'Engagement Dashboard',
+		icon: 'file-keynote',
+		permissionGranted: () => hasAllPermission('view-statistics'),
+	});
+}).catch((error) => {
+	console.error('Error checking license.', error);
+});
diff --git a/ee/app/engagement-dashboard/server/api/channels.js b/ee/app/engagement-dashboard/server/api/channels.js
new file mode 100644
index 000000000000..405161d3e0c6
--- /dev/null
+++ b/ee/app/engagement-dashboard/server/api/channels.js
@@ -0,0 +1,26 @@
+import { check } from 'meteor/check';
+
+import { API } from '../../../../../app/api';
+import { findAllChannelsWithNumberOfMessages } from '../lib/channels';
+import { transformDatesForAPI } from './helpers/date';
+
+API.v1.addRoute('engagement-dashboard/channels/list', { authRequired: true }, {
+	get() {
+		const { start, end } = this.requestParams();
+		const { offset, count } = this.getPaginationItems();
+
+		check(start, String);
+		check(end, String);
+
+		const { channels, total } = Promise.await(findAllChannelsWithNumberOfMessages({
+			...transformDatesForAPI(start, end),
+			options: { offset, count },
+		}));
+		return API.v1.success({
+			channels,
+			count: channels.length,
+			offset,
+			total,
+		});
+	},
+});
diff --git a/ee/app/engagement-dashboard/server/api/helpers/date.js b/ee/app/engagement-dashboard/server/api/helpers/date.js
new file mode 100644
index 000000000000..0aae7b2b0132
--- /dev/null
+++ b/ee/app/engagement-dashboard/server/api/helpers/date.js
@@ -0,0 +1,14 @@
+export const transformDatesForAPI = (start, end) => {
+	if (isNaN(Date.parse(start))) {
+		throw new Error('The "start" query parameter must be a valid date.');
+	}
+	if (end && isNaN(Date.parse(end))) {
+		throw new Error('The "end" query parameter must be a valid date.');
+	}
+	start = new Date(start);
+	end = new Date(end);
+	return {
+		start,
+		end,
+	};
+};
diff --git a/ee/app/engagement-dashboard/server/api/index.js b/ee/app/engagement-dashboard/server/api/index.js
new file mode 100644
index 000000000000..007fb85a9f74
--- /dev/null
+++ b/ee/app/engagement-dashboard/server/api/index.js
@@ -0,0 +1,3 @@
+import './messages';
+import './channels';
+import './users';
diff --git a/ee/app/engagement-dashboard/server/api/messages.js b/ee/app/engagement-dashboard/server/api/messages.js
new file mode 100644
index 000000000000..b51f393e0091
--- /dev/null
+++ b/ee/app/engagement-dashboard/server/api/messages.js
@@ -0,0 +1,41 @@
+import { check } from 'meteor/check';
+
+import { API } from '../../../../../app/api';
+import { findWeeklyMessagesSentData, findMessagesSentOrigin, findTopFivePopularChannelsByMessageSentQuantity } from '../lib/messages';
+import { transformDatesForAPI } from './helpers/date';
+
+API.v1.addRoute('engagement-dashboard/messages/messages-sent', { authRequired: true }, {
+	get() {
+		const { start, end } = this.requestParams();
+
+		check(start, String);
+		check(end, String);
+
+		const data = Promise.await(findWeeklyMessagesSentData(transformDatesForAPI(start, end)));
+		return API.v1.success(data);
+	},
+});
+
+API.v1.addRoute('engagement-dashboard/messages/origin', { authRequired: true }, {
+	get() {
+		const { start, end } = this.requestParams();
+
+		check(start, String);
+		check(end, String);
+
+		const data = Promise.await(findMessagesSentOrigin(transformDatesForAPI(start, end)));
+		return API.v1.success(data);
+	},
+});
+
+API.v1.addRoute('engagement-dashboard/messages/top-five-popular-channels', { authRequired: true }, {
+	get() {
+		const { start, end } = this.requestParams();
+
+		check(start, String);
+		check(end, String);
+
+		const data = Promise.await(findTopFivePopularChannelsByMessageSentQuantity(transformDatesForAPI(start, end)));
+		return API.v1.success(data);
+	},
+});
diff --git a/ee/app/engagement-dashboard/server/api/users.js b/ee/app/engagement-dashboard/server/api/users.js
new file mode 100644
index 000000000000..aaf33b4c0f28
--- /dev/null
+++ b/ee/app/engagement-dashboard/server/api/users.js
@@ -0,0 +1,67 @@
+import { check } from 'meteor/check';
+
+import { API } from '../../../../../app/api';
+import {
+	findWeeklyUsersRegisteredData,
+	findActiveUsersMonthlyData,
+	findBusiestsChatsInADayByHours,
+	findBusiestsChatsWithinAWeek,
+	findUserSessionsByHourWithinAWeek,
+} from '../lib/users';
+import { transformDatesForAPI } from './helpers/date';
+
+API.v1.addRoute('engagement-dashboard/users/new-users', { authRequired: true }, {
+	get() {
+		const { start, end } = this.requestParams();
+
+		check(start, String);
+		check(end, String);
+
+		const data = Promise.await(findWeeklyUsersRegisteredData(transformDatesForAPI(start, end)));
+		return API.v1.success(data);
+	},
+});
+
+API.v1.addRoute('engagement-dashboard/users/active-users', { authRequired: true }, {
+	get() {
+		const { start, end } = this.requestParams();
+
+		check(start, String);
+		check(end, String);
+
+		const data = Promise.await(findActiveUsersMonthlyData(transformDatesForAPI(start, end)));
+		return API.v1.success(data);
+	},
+});
+
+API.v1.addRoute('engagement-dashboard/users/chat-busier/hourly-data', { authRequired: true }, {
+	get() {
+		const { start } = this.requestParams();
+
+		const data = Promise.await(findBusiestsChatsInADayByHours(transformDatesForAPI(start)));
+		return API.v1.success(data);
+	},
+});
+
+API.v1.addRoute('engagement-dashboard/users/chat-busier/weekly-data', { authRequired: true }, {
+	get() {
+		const { start } = this.requestParams();
+
+		check(start, String);
+
+		const data = Promise.await(findBusiestsChatsWithinAWeek(transformDatesForAPI(start)));
+		return API.v1.success(data);
+	},
+});
+
+API.v1.addRoute('engagement-dashboard/users/users-by-time-of-the-day-in-a-week', { authRequired: true }, {
+	get() {
+		const { start, end } = this.requestParams();
+
+		check(start, String);
+		check(end, String);
+
+		const data = Promise.await(findUserSessionsByHourWithinAWeek(transformDatesForAPI(start, end)));
+		return API.v1.success(data);
+	},
+});
diff --git a/ee/app/engagement-dashboard/server/index.js b/ee/app/engagement-dashboard/server/index.js
new file mode 100644
index 000000000000..0083bfabbf5f
--- /dev/null
+++ b/ee/app/engagement-dashboard/server/index.js
@@ -0,0 +1,6 @@
+import { onLicense } from '../../license/server';
+
+onLicense('engagement-dashboard', async () => {
+	await import('./listeners');
+	await import('./api');
+});
diff --git a/ee/app/engagement-dashboard/server/lib/channels.js b/ee/app/engagement-dashboard/server/lib/channels.js
new file mode 100644
index 000000000000..923365e31085
--- /dev/null
+++ b/ee/app/engagement-dashboard/server/lib/channels.js
@@ -0,0 +1,27 @@
+import moment from 'moment';
+
+import { Rooms } from '../../../../../app/models/server/raw';
+import { convertDateToInt, diffBetweenDaysInclusive } from './date';
+
+export const findAllChannelsWithNumberOfMessages = async ({ start, end, options = {} }) => {
+	const daysBetweenDates = diffBetweenDaysInclusive(end, start);
+	const endOfLastWeek = moment(start).clone().subtract(1, 'days').toDate();
+	const startOfLastWeek = moment(endOfLastWeek).clone().subtract(daysBetweenDates, 'days').toDate();
+	const total = await Rooms.findChannelsWithNumberOfMessagesBetweenDate({
+		start: convertDateToInt(start),
+		end: convertDateToInt(end),
+		startOfLastWeek: convertDateToInt(startOfLastWeek),
+		endOfLastWeek: convertDateToInt(endOfLastWeek),
+		onlyCount: true,
+	}).toArray();
+	return {
+		channels: await Rooms.findChannelsWithNumberOfMessagesBetweenDate({
+			start: convertDateToInt(start),
+			end: convertDateToInt(end),
+			startOfLastWeek: convertDateToInt(startOfLastWeek),
+			endOfLastWeek: convertDateToInt(endOfLastWeek),
+			options,
+		}),
+		total: total.length ? total[0].total : 0,
+	};
+};
diff --git a/ee/app/engagement-dashboard/server/lib/date.js b/ee/app/engagement-dashboard/server/lib/date.js
new file mode 100644
index 000000000000..189c5bd0ff36
--- /dev/null
+++ b/ee/app/engagement-dashboard/server/lib/date.js
@@ -0,0 +1,11 @@
+import moment from 'moment';
+
+export const convertDateToInt = (date) => parseInt(moment(date).clone().format('YYYYMMDD'));
+export const convertIntToDate = (intValue) => moment(intValue, 'YYYYMMDD').clone().toDate();
+export const diffBetweenDays = (start, end) => moment(new Date(start)).clone().diff(new Date(end), 'days');
+export const diffBetweenDaysInclusive = (start, end) => diffBetweenDays(start, end) + 1;
+
+export const getTotalOfWeekItems = (weekItems, property) => weekItems.reduce((acc, item) => {
+	acc += item[property];
+	return acc;
+}, 0);
diff --git a/ee/app/engagement-dashboard/server/lib/messages.js b/ee/app/engagement-dashboard/server/lib/messages.js
new file mode 100644
index 000000000000..e6f0d621dcc3
--- /dev/null
+++ b/ee/app/engagement-dashboard/server/lib/messages.js
@@ -0,0 +1,85 @@
+import moment from 'moment';
+
+import Analytics from '../../../../../app/models/server/raw/Analytics';
+import { roomTypes } from '../../../../../app/utils';
+import { convertDateToInt, diffBetweenDaysInclusive, convertIntToDate, getTotalOfWeekItems } from './date';
+
+export const handleMessagesSent = (message, room) => {
+	const roomTypesToShow = roomTypes.getTypesToShowOnDashboard();
+	if (!roomTypesToShow.includes(room.t)) {
+		return;
+	}
+	Promise.await(Analytics.saveMessageSent({
+		date: convertDateToInt(message.ts),
+		room,
+	}));
+	return message;
+};
+
+export const handleMessagesDeleted = (message, room) => {
+	const roomTypesToShow = roomTypes.getTypesToShowOnDashboard();
+	if (!roomTypesToShow.includes(room.t)) {
+		return;
+	}
+	Promise.await(Analytics.saveMessageDeleted({
+		date: convertDateToInt(message.ts),
+		room,
+	}));
+	return message;
+};
+
+export const findWeeklyMessagesSentData = async ({ start, end }) => {
+	const daysBetweenDates = diffBetweenDaysInclusive(end, start);
+	const endOfLastWeek = moment(start).clone().subtract(1, 'days').toDate();
+	const startOfLastWeek = moment(endOfLastWeek).clone().subtract(daysBetweenDates, 'days').toDate();
+	const today = convertDateToInt(end);
+	const yesterday = convertDateToInt(moment(end).clone().subtract(1, 'days').toDate());
+	const currentPeriodMessages = await Analytics.getMessagesSentTotalByDate({
+		start: convertDateToInt(start),
+		end: convertDateToInt(end),
+		options: { count: daysBetweenDates, sort: { _id: -1 } },
+	});
+	const lastPeriodMessages = await Analytics.getMessagesSentTotalByDate({
+		start: convertDateToInt(startOfLastWeek),
+		end: convertDateToInt(endOfLastWeek),
+		options: { count: daysBetweenDates, sort: { _id: -1 } },
+	});
+	const yesterdayMessages = (currentPeriodMessages.find((item) => item._id === yesterday) || {}).messages || 0;
+	const todayMessages = (currentPeriodMessages.find((item) => item._id === today) || {}).messages || 0;
+	const currentPeriodTotalOfMessages = getTotalOfWeekItems(currentPeriodMessages, 'messages');
+	const lastPeriodTotalOfMessages = getTotalOfWeekItems(lastPeriodMessages, 'messages');
+	return {
+		days: currentPeriodMessages.map((day) => ({ day: convertIntToDate(day._id), messages: day.messages })),
+		period: {
+			count: currentPeriodTotalOfMessages,
+			variation: currentPeriodTotalOfMessages - lastPeriodTotalOfMessages,
+		},
+		yesterday: {
+			count: yesterdayMessages,
+			variation: todayMessages - yesterdayMessages,
+		},
+	};
+};
+
+export const findMessagesSentOrigin = async ({ start, end }) => {
+	const origins = await Analytics.getMessagesOrigin({
+		start: convertDateToInt(start),
+		end: convertDateToInt(end),
+	});
+	const roomTypesToShow = roomTypes.getTypesToShowOnDashboard();
+	const responseTypes = origins.map((origin) => origin.t);
+	const missingTypes = roomTypesToShow.filter((type) => !responseTypes.includes(type));
+	if (missingTypes.length) {
+		missingTypes.forEach((type) => origins.push({ messages: 0, t: type }));
+	}
+	return { origins };
+};
+
+export const findTopFivePopularChannelsByMessageSentQuantity = async ({ start, end }) => {
+	const channels = await Analytics.getMostPopularChannelsByMessagesSentQuantity({
+		start: convertDateToInt(start),
+		end: convertDateToInt(end),
+		options: { count: 5, sort: { messages: -1 } },
+	});
+	return { channels };
+};
diff --git a/ee/app/engagement-dashboard/server/lib/users.js b/ee/app/engagement-dashboard/server/lib/users.js
new file mode 100644
index 000000000000..5ea0a8b5ee5b
--- /dev/null
+++ b/ee/app/engagement-dashboard/server/lib/users.js
@@ -0,0 +1,109 @@
+import moment from 'moment';
+
+import Analytics from '../../../../../app/models/server/raw/Analytics';
+import Sessions from '../../../../../app/models/server/raw/Sessions';
+import { convertDateToInt, diffBetweenDaysInclusive, getTotalOfWeekItems, convertIntToDate } from './date';
+
+export const handleUserCreated = (user) => {
+	Promise.await(Analytics.saveUserData({
+		date: convertDateToInt(user.ts),
+		user,
+	}));
+	return user;
+};
+
+export const findWeeklyUsersRegisteredData = async ({ start, end }) => {
+	const daysBetweenDates = diffBetweenDaysInclusive(end, start);
+	const endOfLastWeek = moment(start).clone().subtract(1, 'days').toDate();
+	const startOfLastWeek = moment(endOfLastWeek).clone().subtract(daysBetweenDates, 'days').toDate();
+	const today = convertDateToInt(end);
+	const yesterday = convertDateToInt(moment(end).clone().subtract(1, 'days').toDate());
+	const currentPeriodUsers = await Analytics.getTotalOfRegisteredUsersByDate({
+		start: convertDateToInt(start),
+		end: convertDateToInt(end),
+		options: { count: daysBetweenDates, sort: { _id: -1 } },
+	});
+	const lastPeriodUsers = await Analytics.getTotalOfRegisteredUsersByDate({
+		start: convertDateToInt(startOfLastWeek),
+		end: convertDateToInt(endOfLastWeek),
+		options: { count: daysBetweenDates, sort: { _id: -1 } },
+	});
+	const yesterdayUsers = (currentPeriodUsers.find((item) => item._id === yesterday) || {}).users || 0;
+	const todayUsers = (currentPeriodUsers.find((item) => item._id === today) || {}).users || 0;
+	const currentPeriodTotalUsers = getTotalOfWeekItems(currentPeriodUsers, 'users');
+	const lastPeriodTotalUsers = getTotalOfWeekItems(lastPeriodUsers, 'users');
+	return {
+		days: currentPeriodUsers.map((day) => ({ day: convertIntToDate(day._id), users: day.users })),
+		period: {
+			count: currentPeriodTotalUsers,
+			variation: currentPeriodTotalUsers - lastPeriodTotalUsers,
+		},
+		yesterday: {
+			count: yesterdayUsers,
+			variation: todayUsers - yesterdayUsers,
+		},
+	};
+};
+
+export const findActiveUsersMonthlyData = async ({ start, end }) => {
+	const startOfPeriod = moment(start);
+	const endOfPeriod = moment(end);
+
+	return {
+		month: await Sessions.getActiveUsersOfPeriodByDayBetweenDates({
+			start: {
+				year: startOfPeriod.year(),
+				month: startOfPeriod.month() + 1,
+				day: startOfPeriod.date(),
+			},
+			end: {
+				year: endOfPeriod.year(),
+				month: endOfPeriod.month() + 1,
+				day: endOfPeriod.date(),
+			},
+		}),
+	};
+};
+
+export const findBusiestsChatsInADayByHours = async ({ start }) => {
+	const now = moment(start);
+	const yesterday = moment(now).clone().subtract(24, 'hours');
+	return {
+		hours: await Sessions.getBusiestTimeWithinHoursPeriod({
+			start: yesterday.toDate(),
+			end: now.toDate(),
+		}),
+	};
+};
+
+export const findBusiestsChatsWithinAWeek = async ({ start }) => {
+	const today = moment(start);
+	const startOfCurrentWeek = moment(today).clone().subtract(7, 'days');
+
+	return {
+		month: await Sessions.getTotalOfSessionsByDayBetweenDates({
+			start: {
+				year: startOfCurrentWeek.year(),
+				month: startOfCurrentWeek.month() + 1,
+				day: startOfCurrentWeek.date(),
+			},
+			end: {
+				year: today.year(),
+				month: today.month() + 1,
+				day: today.date(),
+			},
+		}),
+	};
+};
+
+export const findUserSessionsByHourWithinAWeek = async ({ start, end }) => {
+	const startOfPeriod = moment(start);
+	const endOfPeriod = moment(end);
+
+	return {
+		week: await Sessions.getTotalOfSessionByHourAndDayBetweenDates({
+			start: startOfPeriod.toDate(),
+			end: endOfPeriod.toDate(),
+		}),
+	};
+};
diff --git a/ee/app/engagement-dashboard/server/listeners/index.js b/ee/app/engagement-dashboard/server/listeners/index.js
new file mode 100644
index 000000000000..0ca660eabe68
--- /dev/null
+++ b/ee/app/engagement-dashboard/server/listeners/index.js
@@ -0,0 +1,2 @@
+import './messages';
+import './users';
diff --git a/ee/app/engagement-dashboard/server/listeners/messages.js b/ee/app/engagement-dashboard/server/listeners/messages.js
new file mode 100644
index 000000000000..56af5840abbe
--- /dev/null
+++ b/ee/app/engagement-dashboard/server/listeners/messages.js
@@ -0,0 +1,5 @@
+import { callbacks } from '../../../../../app/callbacks/server';
+import { handleMessagesSent, handleMessagesDeleted } from '../lib/messages';
+
+callbacks.add('afterSaveMessage', handleMessagesSent);
+callbacks.add('afterDeleteMessage', handleMessagesDeleted);
diff --git a/ee/app/engagement-dashboard/server/listeners/users.js b/ee/app/engagement-dashboard/server/listeners/users.js
new file mode 100644
index 000000000000..b6b730d2d968
--- /dev/null
+++ b/ee/app/engagement-dashboard/server/listeners/users.js
@@ -0,0 +1,4 @@
+import { callbacks } from '../../../../../app/callbacks/server';
+import { handleUserCreated } from '../lib/users';
+
+callbacks.add('afterCreateUser', handleUserCreated);
diff --git a/ee/app/license/server/bundles.js b/ee/app/license/server/bundles.js
index 361aede9b178..f4cc45c2d348 100644
--- a/ee/app/license/server/bundles.js
+++ b/ee/app/license/server/bundles.js
@@ -4,6 +4,7 @@ const bundles = {
 		'canned-responses',
 		'ldap-enterprise',
 		'livechat-enterprise',
+		'engagement-dashboard',
 	],
 	pro: [
 	],
diff --git a/ee/client/index.js b/ee/client/index.js
index 8e58d438ebd3..1d7f22417589 100644
--- a/ee/client/index.js
+++ b/ee/client/index.js
@@ -1,4 +1,5 @@
 import '../app/auditing/client/index';
 import '../app/canned-responses/client/index';
+import '../app/engagement-dashboard/client/index';
 import '../app/license/client/index';
 import '../app/livechat-enterprise/client/index';
diff --git a/ee/server/index.js b/ee/server/index.js
index 81102e910545..00359f17b200 100644
--- a/ee/server/index.js
+++ b/ee/server/index.js
@@ -2,5 +2,6 @@ import '../app/models';
 import '../app/api-enterprise/server/index';
 import '../app/auditing/server/index';
 import '../app/canned-responses/server/index';
+import '../app/engagement-dashboard/server/index';
 import '../app/ldap-enterprise/server/index';
 import '../app/livechat-enterprise/server/index';
diff --git a/package-lock.json b/package-lock.json
index 2131987508a7..b7d03fdf0c35 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2372,8 +2372,7 @@
 		"@emotion/stylis": {
 			"version": "0.8.5",
 			"resolved": "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.8.5.tgz",
-			"integrity": "sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ==",
-			"dev": true
+			"integrity": "sha512-h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ=="
 		},
 		"@emotion/unitless": {
 			"version": "0.7.4",
@@ -2558,6 +2557,170 @@
 				"glob-to-regexp": "^0.3.0"
 			}
 		},
+		"@nivo/annotations": {
+			"version": "0.61.0",
+			"resolved": "https://registry.npmjs.org/@nivo/annotations/-/annotations-0.61.0.tgz",
+			"integrity": "sha512-i2JKYeMEPC+zwgN/p+hVRWUJ4aee+kE8BfMzCLt1/a+rsfT+v2v5kj12zx072teoaQt53lOi1GdV2lEYA6HJpg==",
+			"requires": {
+				"@nivo/colors": "0.61.0",
+				"@nivo/core": "0.61.0",
+				"lodash": "^4.17.11",
+				"react-motion": "^0.5.2"
+			}
+		},
+		"@nivo/axes": {
+			"version": "0.61.0",
+			"resolved": "https://registry.npmjs.org/@nivo/axes/-/axes-0.61.0.tgz",
+			"integrity": "sha512-U0rHIYNnwt03dFFBz0aosfd5nFIRVD1Wff5DwVeM7PouBZM3AsLVWeLlUWLWOmg+BHftqhbOGTOoZN2SjU7bwA==",
+			"requires": {
+				"@nivo/core": "0.61.0",
+				"d3-format": "^1.3.2",
+				"d3-time": "^1.0.11",
+				"d3-time-format": "^2.1.3",
+				"lodash": "^4.17.11",
+				"react-motion": "^0.5.2"
+			}
+		},
+		"@nivo/bar": {
+			"version": "0.61.1",
+			"resolved": "https://registry.npmjs.org/@nivo/bar/-/bar-0.61.1.tgz",
+			"integrity": "sha512-MYdjeFt6HqEyIBFwbVHKPjpw8+DPirAZwJDZi7dPXT0F7WcwJOnRITlRHhmQEGq5u71h26UN+M0z/ZQkB54mvw==",
+			"requires": {
+				"@nivo/annotations": "0.61.0",
+				"@nivo/axes": "0.61.0",
+				"@nivo/colors": "0.61.0",
+				"@nivo/core": "0.61.0",
+				"@nivo/legends": "0.61.1",
+				"@nivo/tooltip": "0.61.0",
+				"d3-scale": "^3.0.0",
+				"d3-shape": "^1.2.2",
+				"lodash": "^4.17.11",
+				"react-motion": "^0.5.2",
+				"recompose": "^0.30.0"
+			}
+		},
+		"@nivo/colors": {
+			"version": "0.61.0",
+			"resolved": "https://registry.npmjs.org/@nivo/colors/-/colors-0.61.0.tgz",
+			"integrity": "sha512-yeb5YsQDoN7D5DbBIhHTnVn0bX+4ObNVGyJAepSn64zNPiskO3/o1FnQw70aIkN4O7BDXb/vVPrftq6wSwQtvQ==",
+			"requires": {
+				"d3-color": "^1.2.3",
+				"d3-scale": "^3.0.0",
+				"d3-scale-chromatic": "^1.3.3",
+				"lodash.get": "^4.4.2",
+				"lodash.isplainobject": "^4.0.6",
+				"react-motion": "^0.5.2"
+			}
+		},
+		"@nivo/core": {
+			"version": "0.61.0",
+			"resolved": "https://registry.npmjs.org/@nivo/core/-/core-0.61.0.tgz",
+			"integrity": "sha512-7DGsTW12vfUvMIr9jl28KZaJMJqMMhEJi1lW1R2TPMTg+qSG01v6tqMtcEwUp4bdAdr3n57ytLWSgqKWXkwjvw==",
+			"requires": {
+				"@nivo/tooltip": "0.61.0",
+				"d3-color": "^1.2.3",
+				"d3-format": "^1.3.2",
+				"d3-hierarchy": "^1.1.8",
+				"d3-interpolate": "^1.3.2",
+				"d3-scale": "^3.0.0",
+				"d3-scale-chromatic": "^1.3.3",
+				"d3-shape": "^1.3.5",
+				"d3-time-format": "^2.1.3",
+				"lodash": "^4.17.11",
+				"react-measure": "^2.2.4",
+				"react-motion": "^0.5.2",
+				"recompose": "^0.30.0"
+			}
+		},
+		"@nivo/heatmap": {
+			"version": "0.61.0",
+			"resolved": "https://registry.npmjs.org/@nivo/heatmap/-/heatmap-0.61.0.tgz",
+			"integrity": "sha512-ROJSP0mvCYuavdkTZdRj1+9Nd+2s2oN86eEyC6iiDqFGYjBSFy3iNnGLFq8jGHZ/GDYBrLC3L3IxnWhM184T+Q==",
+			"requires": {
+				"@nivo/axes": "0.61.0",
+				"@nivo/colors": "0.61.0",
+				"@nivo/core": "0.61.0",
+				"@nivo/tooltip": "0.61.0",
+				"d3-scale": "^3.0.0",
+				"lodash": "^4.17.11",
+				"react-motion": "^0.5.2",
+				"recompose": "^0.30.0"
+			}
+		},
+		"@nivo/legends": {
+			"version": "0.61.1",
+			"resolved": "https://registry.npmjs.org/@nivo/legends/-/legends-0.61.1.tgz",
+			"integrity": "sha512-bKVXffFwTKGySZRUf6sdVzWUb5jjGffuvRczs0giQCu8OUgeJIi0IOOyYhHtww+rTVGIKAi0xPGQTQnF4kpufA==",
+			"requires": {
+				"@nivo/core": "0.61.0",
+				"lodash": "^4.17.11",
+				"recompose": "^0.30.0"
+			}
+		},
+		"@nivo/line": {
+			"version": "0.61.1",
+			"resolved": "https://registry.npmjs.org/@nivo/line/-/line-0.61.1.tgz",
+			"integrity": "sha512-PZFGgcj+IlDtZG6kTdBrGJ5cJvs1w5kaAI86IaH5AXJ0MQqVIZYWgbXdf5Vg6Hv2ouLmwNwONA/ORACKVkG+YA==",
+			"requires": {
+				"@nivo/annotations": "0.61.0",
+				"@nivo/axes": "0.61.0",
+				"@nivo/colors": "0.61.0",
+				"@nivo/core": "0.61.0",
+				"@nivo/legends": "0.61.1",
+				"@nivo/scales": "0.61.0",
+				"@nivo/tooltip": "0.61.0",
+				"@nivo/voronoi": "0.61.0",
+				"d3-shape": "^1.3.5",
+				"lodash": "^4.17.11",
+				"react-motion": "^0.5.2"
+			}
+		},
+		"@nivo/pie": {
+			"version": "0.61.1",
+			"resolved": "https://registry.npmjs.org/@nivo/pie/-/pie-0.61.1.tgz",
+			"integrity": "sha512-3xmYrB/rccJ6f5AtckhIm51Bj7IVYomeCJsM1vK07wzOS+ZpvJRODokzXSNvp7NkMl3jrqCcGriLhSg3mf9+yA==",
+			"requires": {
+				"@nivo/colors": "0.61.0",
+				"@nivo/core": "0.61.0",
+				"@nivo/legends": "0.61.1",
+				"@nivo/tooltip": "0.61.0",
+				"d3-shape": "^1.3.5",
+				"lodash": "^4.17.11",
+				"react-motion": "^0.5.2",
+				"recompose": "^0.30.0"
+			}
+		},
+		"@nivo/scales": {
+			"version": "0.61.0",
+			"resolved": "https://registry.npmjs.org/@nivo/scales/-/scales-0.61.0.tgz",
+			"integrity": "sha512-7MoxxecMDvpK9L0Py/drEQxG/4YAzo9KBvLzo3/KjInc1VEscpDkpVSSN5tmg1qbQE3WCrziec4JuH9q1V/Q7g==",
+			"requires": {
+				"d3-scale": "^3.0.0",
+				"d3-time-format": "^2.1.3",
+				"lodash": "^4.17.11"
+			}
+		},
+		"@nivo/tooltip": {
+			"version": "0.61.0",
+			"resolved": "https://registry.npmjs.org/@nivo/tooltip/-/tooltip-0.61.0.tgz",
+			"integrity": "sha512-CqEJ4v1jSikZ3fmuSJVb1UYF8fuCo/c7JFB+LsNH9X01IERSufO3tSNBTzJ3JugCminQpbo6/R7oBhNwZFqSxw==",
+			"requires": {
+				"@nivo/core": "0.61.0",
+				"react-measure": "^2.2.4",
+				"react-motion": "^0.5.2"
+			}
+		},
+		"@nivo/voronoi": {
+			"version": "0.61.0",
+			"resolved": "https://registry.npmjs.org/@nivo/voronoi/-/voronoi-0.61.0.tgz",
+			"integrity": "sha512-VVB7BW8GX8Gq9kTf/L52HrCD//4PAT6RTeDwb4N8BpSNfyfmBXacU9U9RMK7HAJjxICzEuxam75/oTCjX6iVBg==",
+			"requires": {
+				"@nivo/core": "0.61.0",
+				"d3-delaunay": "^5.1.1",
+				"d3-scale": "^3.0.0",
+				"recompose": "^0.30.0"
+			}
+		},
 		"@nodelib/fs.stat": {
 			"version": "1.1.3",
 			"resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
@@ -2706,6 +2869,22 @@
 				}
 			}
 		},
+		"@rocket.chat/css-in-js": {
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/css-in-js/-/css-in-js-0.6.0.tgz",
+			"integrity": "sha512-XbkUl2kJ/j24qGOAhBY/FP8yxeiHN0WnGw46WppDrZufDv/yBqCKUkWOSfsYPZq3lqUsu7sPv//pVTMfn8ao4Q==",
+			"requires": {
+				"@emotion/hash": "^0.8.0",
+				"@emotion/stylis": "^0.8.5"
+			},
+			"dependencies": {
+				"@emotion/hash": {
+					"version": "0.8.0",
+					"resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz",
+					"integrity": "sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow=="
+				}
+			}
+		},
 		"@rocket.chat/eslint-config": {
 			"version": "0.3.0",
 			"resolved": "https://registry.npmjs.org/@rocket.chat/eslint-config/-/eslint-config-0.3.0.tgz",
@@ -2716,36 +2895,44 @@
 			}
 		},
 		"@rocket.chat/fuselage": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.3.0.tgz",
-			"integrity": "sha512-nZdtJtEjZO2ZKQafo0ijANRAlr+wSQ9PzsjpRcan4XVaOdnS7Yri7ZlqtA2jdmHyr5/bbQzReM0WudujS5JMyg==",
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.6.0.tgz",
+			"integrity": "sha512-+jZmEO89xo7wW2yMEC/ZrGQUD4TxQJQH1hNL0hV1t39d7YzGdJO3eMNGYEIeADwPpCm1TMgAmavivaDkSUH58A==",
 			"requires": {
-				"@rocket.chat/fuselage-tokens": "^0.3.0",
-				"@rocket.chat/icons": "^0.3.0"
+				"@rocket.chat/css-in-js": "^0.6.0",
+				"@rocket.chat/fuselage-tokens": "^0.6.0",
+				"@rocket.chat/icons": "^0.6.0"
+			},
+			"dependencies": {
+				"@rocket.chat/icons": {
+					"version": "0.6.0",
+					"resolved": "https://registry.npmjs.org/@rocket.chat/icons/-/icons-0.6.0.tgz",
+					"integrity": "sha512-Kl2C5m9glngFq6J2JxvijMMmrq6f+TAcxPUUEYeglHiORvIJtfYgHT7dwzLhlUiAwMUJSBVsYUzvsAvgiOxdbQ=="
+				}
 			}
 		},
 		"@rocket.chat/fuselage-hooks": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-hooks/-/fuselage-hooks-0.3.0.tgz",
-			"integrity": "sha512-VpRyEhntgJ1HLYtaRmOzdHTpfGxkyyD9ElxBwEENMcu4/Ke6brIttznevndjaZWznfF/VV+15vcFovimRt/giQ=="
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-hooks/-/fuselage-hooks-0.6.0.tgz",
+			"integrity": "sha512-RacebD01VEL1UWa+0qt0X5KwyAzx9bgfk0RC2T9WfwcYWntI0MX3RlMnM6Ld8KwTqOpWs5iIpOasQYCCKM7Ljw=="
 		},
 		"@rocket.chat/fuselage-tokens": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-tokens/-/fuselage-tokens-0.3.0.tgz",
-			"integrity": "sha512-PEFww6Q4gRmBo97nA6JHICSYHqQuCDHS4KFS070ofdaRParEaBhrQ8CBF21RpIXZpofk9d4nR96JdI0uf6rWOw=="
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-tokens/-/fuselage-tokens-0.6.0.tgz",
+			"integrity": "sha512-QKObG0aTnWTzOQGOkqE4yYZRmKg7aZnV97uPnx42iKjyNEE8fM++L9hBaWEnJDfqUrLA1UNCjOn5snO5/bGPNw=="
 		},
 		"@rocket.chat/fuselage-ui-kit": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-ui-kit/-/fuselage-ui-kit-0.3.0.tgz",
-			"integrity": "sha512-V5HhWREpiTCkZ8ww5ow2Iafa9sB/uWGXEa5s0sOJEpGmgXZIRsUQlgcbD87Dm2fx57AXJR19Os4HxVNodF55Ow==",
+			"version": "0.6.0",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-ui-kit/-/fuselage-ui-kit-0.6.0.tgz",
+			"integrity": "sha512-PGCw+IvNsW4A/msAahUXpkv6A6PDcxTGhMEGmA/DiOc7Y72u+7giQl43vLTuW/u5pafJ0gG83TKNxwCBcHPw8g==",
 			"requires": {
-				"@rocket.chat/ui-kit": "^0.3.0"
+				"@rocket.chat/ui-kit": "^0.6.0"
 			},
 			"dependencies": {
 				"@rocket.chat/ui-kit": {
-					"version": "0.3.0",
-					"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.3.0.tgz",
-					"integrity": "sha512-YAV5l6iVIWuileg5DOU/0NQ/23/AULEr8UblIUSF3OShPN8nWanGMdG0E6xFLyXT+KHvmvzhiQe0/ju3Tk7x8A=="
+					"version": "0.6.0",
+					"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.6.0.tgz",
+					"integrity": "sha512-Mh82FDw2AOp88LI0IqqT20N6g+cNHfmnXsUU5BZUFh9rI5dMZDrOiYEOZpiWyC5idnWjlmPnxiANemyb8e3Gow=="
 				}
 			}
 		},
@@ -10062,6 +10249,11 @@
 				"supports-color": "^2.0.0"
 			}
 		},
+		"change-emitter": {
+			"version": "0.1.6",
+			"resolved": "https://registry.npmjs.org/change-emitter/-/change-emitter-0.1.6.tgz",
+			"integrity": "sha1-6LL+PX8at9aaMhma/5HqaTFAlRU="
+		},
 		"character-entities": {
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.2.tgz",
@@ -12186,6 +12378,89 @@
 				}
 			}
 		},
+		"d3-array": {
+			"version": "2.4.0",
+			"resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.4.0.tgz",
+			"integrity": "sha512-KQ41bAF2BMakf/HdKT865ALd4cgND6VcIztVQZUTt0+BH3RWy6ZYnHghVXf6NFjt2ritLr8H1T8LreAAlfiNcw=="
+		},
+		"d3-color": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.0.tgz",
+			"integrity": "sha512-TzNPeJy2+iEepfiL92LAAB7fvnp/dV2YwANPVHdDWmYMm23qIJBYww3qT8I8C1wXrmrg4UWs7BKc2tKIgyjzHg=="
+		},
+		"d3-delaunay": {
+			"version": "5.2.1",
+			"resolved": "https://registry.npmjs.org/d3-delaunay/-/d3-delaunay-5.2.1.tgz",
+			"integrity": "sha512-ZZdeJl6cKRyqYVFYK+/meXvWIrAvZsZTD7WSxl4OPXCmuXNgDyACAClAJHD63zL25TA+IJGURUNO7rFseNFCYw==",
+			"requires": {
+				"delaunator": "4"
+			}
+		},
+		"d3-format": {
+			"version": "1.4.3",
+			"resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.4.3.tgz",
+			"integrity": "sha512-mm/nE2Y9HgGyjP+rKIekeITVgBtX97o1nrvHCWX8F/yBYyevUTvu9vb5pUnKwrcSw7o7GuwMOWjS9gFDs4O+uQ=="
+		},
+		"d3-hierarchy": {
+			"version": "1.1.9",
+			"resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz",
+			"integrity": "sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ=="
+		},
+		"d3-interpolate": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.4.0.tgz",
+			"integrity": "sha512-V9znK0zc3jOPV4VD2zZn0sDhZU3WAE2bmlxdIwwQPPzPjvyLkd8B3JUVdS1IDUFDkWZ72c9qnv1GK2ZagTZ8EA==",
+			"requires": {
+				"d3-color": "1"
+			}
+		},
+		"d3-path": {
+			"version": "1.0.9",
+			"resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.9.tgz",
+			"integrity": "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg=="
+		},
+		"d3-scale": {
+			"version": "3.2.1",
+			"resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.2.1.tgz",
+			"integrity": "sha512-huz5byJO/6MPpz6Q8d4lg7GgSpTjIZW/l+1MQkzKfu2u8P6hjaXaStOpmyrD6ymKoW87d2QVFCKvSjLwjzx/rA==",
+			"requires": {
+				"d3-array": "1.2.0 - 2",
+				"d3-format": "1",
+				"d3-interpolate": "^1.2.0",
+				"d3-time": "1",
+				"d3-time-format": "2"
+			}
+		},
+		"d3-scale-chromatic": {
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-1.5.0.tgz",
+			"integrity": "sha512-ACcL46DYImpRFMBcpk9HhtIyC7bTBR4fNOPxwVSl0LfulDAwyiHyPOTqcDG1+t5d4P9W7t/2NAuWu59aKko/cg==",
+			"requires": {
+				"d3-color": "1",
+				"d3-interpolate": "1"
+			}
+		},
+		"d3-shape": {
+			"version": "1.3.7",
+			"resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz",
+			"integrity": "sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==",
+			"requires": {
+				"d3-path": "1"
+			}
+		},
+		"d3-time": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.1.0.tgz",
+			"integrity": "sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA=="
+		},
+		"d3-time-format": {
+			"version": "2.2.3",
+			"resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.2.3.tgz",
+			"integrity": "sha512-RAHNnD8+XvC4Zc4d2A56Uw0yJoM7bsvOlJR33bclxq399Rak/b9bhvu/InjxdWhPtkgU53JJcleJTGkNRnN6IA==",
+			"requires": {
+				"d3-time": "1"
+			}
+		},
 		"dashdash": {
 			"version": "1.14.1",
 			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -12536,6 +12811,11 @@
 				}
 			}
 		},
+		"delaunator": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/delaunator/-/delaunator-4.0.1.tgz",
+			"integrity": "sha512-WNPWi1IRKZfCt/qIDMfERkDp93+iZEmOxN2yy4Jg+Xhv8SLk2UTqqbe1sfiipn0and9QrE914/ihdx82Y/Giag=="
+		},
 		"delayed-stream": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -14460,6 +14740,27 @@
 				"format": "^0.2.0"
 			}
 		},
+		"fbjs": {
+			"version": "0.8.17",
+			"resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz",
+			"integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=",
+			"requires": {
+				"core-js": "^1.0.0",
+				"isomorphic-fetch": "^2.1.1",
+				"loose-envify": "^1.0.0",
+				"object-assign": "^4.1.0",
+				"promise": "^7.1.1",
+				"setimmediate": "^1.0.5",
+				"ua-parser-js": "^0.7.18"
+			},
+			"dependencies": {
+				"core-js": {
+					"version": "1.2.7",
+					"resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
+					"integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
+				}
+			}
+		},
 		"fd-slicer": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
@@ -15061,28 +15362,28 @@
 			"dependencies": {
 				"abbrev": {
 					"version": "1.1.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
 					"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
 					"dev": true,
 					"optional": true
 				},
 				"ansi-regex": {
 					"version": "2.1.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
 					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
 					"dev": true,
 					"optional": true
 				},
 				"aproba": {
 					"version": "1.2.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
 					"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
 					"dev": true,
 					"optional": true
 				},
 				"are-we-there-yet": {
 					"version": "1.1.5",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
 					"integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
 					"dev": true,
 					"optional": true,
@@ -15093,14 +15394,14 @@
 				},
 				"balanced-match": {
 					"version": "1.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
 					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
 					"dev": true,
 					"optional": true
 				},
 				"brace-expansion": {
 					"version": "1.1.11",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
 					"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
 					"dev": true,
 					"optional": true,
@@ -15118,28 +15419,28 @@
 				},
 				"code-point-at": {
 					"version": "1.1.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
 					"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
 					"dev": true,
 					"optional": true
 				},
 				"concat-map": {
 					"version": "0.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
 					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
 					"dev": true,
 					"optional": true
 				},
 				"console-control-strings": {
 					"version": "1.1.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
 					"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
 					"dev": true,
 					"optional": true
 				},
 				"core-util-is": {
 					"version": "1.0.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
 					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
 					"dev": true,
 					"optional": true
@@ -15156,21 +15457,21 @@
 				},
 				"deep-extend": {
 					"version": "0.6.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
 					"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
 					"dev": true,
 					"optional": true
 				},
 				"delegates": {
 					"version": "1.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
 					"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
 					"dev": true,
 					"optional": true
 				},
 				"detect-libc": {
 					"version": "1.0.3",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
 					"integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
 					"dev": true,
 					"optional": true
@@ -15187,14 +15488,14 @@
 				},
 				"fs.realpath": {
 					"version": "1.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
 					"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
 					"dev": true,
 					"optional": true
 				},
 				"gauge": {
 					"version": "2.7.4",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
 					"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
 					"dev": true,
 					"optional": true,
@@ -15226,14 +15527,14 @@
 				},
 				"has-unicode": {
 					"version": "2.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
 					"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
 					"dev": true,
 					"optional": true
 				},
 				"iconv-lite": {
 					"version": "0.4.24",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
 					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
 					"dev": true,
 					"optional": true,
@@ -15253,7 +15554,7 @@
 				},
 				"inflight": {
 					"version": "1.0.6",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
 					"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
 					"dev": true,
 					"optional": true,
@@ -15271,14 +15572,14 @@
 				},
 				"ini": {
 					"version": "1.3.5",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
 					"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
 					"dev": true,
 					"optional": true
 				},
 				"is-fullwidth-code-point": {
 					"version": "1.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
 					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
 					"dev": true,
 					"optional": true,
@@ -15288,14 +15589,14 @@
 				},
 				"isarray": {
 					"version": "1.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
 					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
 					"dev": true,
 					"optional": true
 				},
 				"minimatch": {
 					"version": "3.0.4",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
 					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
 					"dev": true,
 					"optional": true,
@@ -15417,7 +15718,7 @@
 				},
 				"npmlog": {
 					"version": "4.1.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
 					"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
 					"dev": true,
 					"optional": true,
@@ -15430,21 +15731,21 @@
 				},
 				"number-is-nan": {
 					"version": "1.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
 					"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
 					"dev": true,
 					"optional": true
 				},
 				"object-assign": {
 					"version": "4.1.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
 					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
 					"dev": true,
 					"optional": true
 				},
 				"once": {
 					"version": "1.4.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
 					"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
 					"dev": true,
 					"optional": true,
@@ -15454,21 +15755,21 @@
 				},
 				"os-homedir": {
 					"version": "1.0.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
 					"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
 					"dev": true,
 					"optional": true
 				},
 				"os-tmpdir": {
 					"version": "1.0.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
 					"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
 					"dev": true,
 					"optional": true
 				},
 				"osenv": {
 					"version": "0.1.5",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
 					"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
 					"dev": true,
 					"optional": true,
@@ -15479,7 +15780,7 @@
 				},
 				"path-is-absolute": {
 					"version": "1.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
 					"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
 					"dev": true,
 					"optional": true
@@ -15493,7 +15794,7 @@
 				},
 				"rc": {
 					"version": "1.2.8",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
 					"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
 					"dev": true,
 					"optional": true,
@@ -15541,21 +15842,21 @@
 				},
 				"safe-buffer": {
 					"version": "5.1.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
 					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
 					"dev": true,
 					"optional": true
 				},
 				"safer-buffer": {
 					"version": "2.1.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
 					"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
 					"dev": true,
 					"optional": true
 				},
 				"sax": {
 					"version": "1.2.4",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
 					"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
 					"dev": true,
 					"optional": true
@@ -15569,21 +15870,21 @@
 				},
 				"set-blocking": {
 					"version": "2.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
 					"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
 					"dev": true,
 					"optional": true
 				},
 				"signal-exit": {
 					"version": "3.0.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
 					"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
 					"dev": true,
 					"optional": true
 				},
 				"string-width": {
 					"version": "1.0.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
 					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
 					"dev": true,
 					"optional": true,
@@ -15595,7 +15896,7 @@
 				},
 				"string_decoder": {
 					"version": "1.1.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
 					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 					"dev": true,
 					"optional": true,
@@ -15605,7 +15906,7 @@
 				},
 				"strip-ansi": {
 					"version": "3.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
 					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
 					"dev": true,
 					"optional": true,
@@ -15615,7 +15916,7 @@
 				},
 				"strip-json-comments": {
 					"version": "2.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
 					"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
 					"dev": true,
 					"optional": true
@@ -15638,14 +15939,14 @@
 				},
 				"util-deprecate": {
 					"version": "1.0.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
 					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
 					"dev": true,
 					"optional": true
 				},
 				"wide-align": {
 					"version": "1.1.3",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
 					"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
 					"dev": true,
 					"optional": true,
@@ -15655,7 +15956,7 @@
 				},
 				"wrappy": {
 					"version": "1.0.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
 					"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
 					"dev": true,
 					"optional": true
@@ -15864,6 +16165,11 @@
 			"integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
 			"dev": true
 		},
+		"get-node-dimensions": {
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/get-node-dimensions/-/get-node-dimensions-1.2.1.tgz",
+			"integrity": "sha512-2MSPMu7S1iOTL+BOa6K1S62hB2zUAYNF/lV0gSVlOaacd087lc6nR1H1r0e3B1CerTo+RceOmi1iJW+vp21xcQ=="
+		},
 		"get-stdin": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz",
@@ -18049,6 +18355,26 @@
 			"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
 			"dev": true
 		},
+		"isomorphic-fetch": {
+			"version": "2.2.1",
+			"resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
+			"integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
+			"requires": {
+				"node-fetch": "^1.0.1",
+				"whatwg-fetch": ">=0.10.0"
+			},
+			"dependencies": {
+				"node-fetch": {
+					"version": "1.7.3",
+					"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
+					"integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
+					"requires": {
+						"encoding": "^0.1.11",
+						"is-stream": "^1.0.1"
+					}
+				}
+			}
+		},
 		"isstream": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
@@ -19212,8 +19538,7 @@
 		"lodash.get": {
 			"version": "4.4.2",
 			"resolved": "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz",
-			"integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=",
-			"dev": true
+			"integrity": "sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk="
 		},
 		"lodash.has": {
 			"version": "4.5.2",
@@ -20093,7 +20418,7 @@
 			"dependencies": {
 				"asn1.js": {
 					"version": "4.10.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
 					"integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
 					"requires": {
 						"bn.js": "^4.0.0",
@@ -20103,7 +20428,7 @@
 				},
 				"assert": {
 					"version": "1.4.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
 					"integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
 					"requires": {
 						"util": "0.10.3"
@@ -20111,7 +20436,7 @@
 					"dependencies": {
 						"util": {
 							"version": "0.10.3",
-							"resolved": false,
+							"resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
 							"integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
 							"requires": {
 								"inherits": "2.0.1"
@@ -20121,22 +20446,22 @@
 				},
 				"base64-js": {
 					"version": "1.3.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
 					"integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="
 				},
 				"bn.js": {
 					"version": "4.11.8",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
 					"integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
 				},
 				"brorand": {
 					"version": "1.1.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
 					"integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
 				},
 				"browserify-aes": {
 					"version": "1.2.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
 					"integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
 					"requires": {
 						"buffer-xor": "^1.0.3",
@@ -20149,7 +20474,7 @@
 				},
 				"browserify-cipher": {
 					"version": "1.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
 					"integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
 					"requires": {
 						"browserify-aes": "^1.0.4",
@@ -20159,7 +20484,7 @@
 				},
 				"browserify-des": {
 					"version": "1.0.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
 					"integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
 					"requires": {
 						"cipher-base": "^1.0.1",
@@ -20170,7 +20495,7 @@
 				},
 				"browserify-rsa": {
 					"version": "4.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
 					"integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
 					"requires": {
 						"bn.js": "^4.1.0",
@@ -20179,7 +20504,7 @@
 				},
 				"browserify-sign": {
 					"version": "4.0.4",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
 					"integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
 					"requires": {
 						"bn.js": "^4.1.1",
@@ -20193,7 +20518,7 @@
 				},
 				"browserify-zlib": {
 					"version": "0.2.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
 					"integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
 					"requires": {
 						"pako": "~1.0.5"
@@ -20201,7 +20526,7 @@
 				},
 				"buffer": {
 					"version": "5.2.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz",
 					"integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==",
 					"requires": {
 						"base64-js": "^1.0.2",
@@ -20210,17 +20535,17 @@
 				},
 				"buffer-xor": {
 					"version": "1.0.3",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
 					"integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
 				},
 				"builtin-status-codes": {
 					"version": "3.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
 					"integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug="
 				},
 				"cipher-base": {
 					"version": "1.0.4",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
 					"integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
 					"requires": {
 						"inherits": "^2.0.1",
@@ -20229,7 +20554,7 @@
 				},
 				"console-browserify": {
 					"version": "1.1.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
 					"integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
 					"requires": {
 						"date-now": "^0.1.4"
@@ -20237,17 +20562,17 @@
 				},
 				"constants-browserify": {
 					"version": "1.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
 					"integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U="
 				},
 				"core-util-is": {
 					"version": "1.0.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
 					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
 				},
 				"create-ecdh": {
 					"version": "4.0.3",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
 					"integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
 					"requires": {
 						"bn.js": "^4.1.0",
@@ -20256,7 +20581,7 @@
 				},
 				"create-hash": {
 					"version": "1.2.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
 					"integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
 					"requires": {
 						"cipher-base": "^1.0.1",
@@ -20268,7 +20593,7 @@
 				},
 				"create-hmac": {
 					"version": "1.1.7",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
 					"integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
 					"requires": {
 						"cipher-base": "^1.0.3",
@@ -20281,7 +20606,7 @@
 				},
 				"crypto-browserify": {
 					"version": "3.12.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
 					"integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
 					"requires": {
 						"browserify-cipher": "^1.0.0",
@@ -20299,12 +20624,12 @@
 				},
 				"date-now": {
 					"version": "0.1.4",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
 					"integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs="
 				},
 				"des.js": {
 					"version": "1.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
 					"integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
 					"requires": {
 						"inherits": "^2.0.1",
@@ -20313,7 +20638,7 @@
 				},
 				"diffie-hellman": {
 					"version": "5.0.3",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
 					"integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
 					"requires": {
 						"bn.js": "^4.1.0",
@@ -20323,12 +20648,12 @@
 				},
 				"domain-browser": {
 					"version": "1.2.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
 					"integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="
 				},
 				"elliptic": {
 					"version": "6.4.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz",
 					"integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
 					"requires": {
 						"bn.js": "^4.4.0",
@@ -20342,12 +20667,12 @@
 				},
 				"events": {
 					"version": "3.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
 					"integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA=="
 				},
 				"evp_bytestokey": {
 					"version": "1.0.3",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
 					"integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
 					"requires": {
 						"md5.js": "^1.3.4",
@@ -20356,7 +20681,7 @@
 				},
 				"hash-base": {
 					"version": "3.0.4",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
 					"integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
 					"requires": {
 						"inherits": "^2.0.1",
@@ -20365,7 +20690,7 @@
 				},
 				"hash.js": {
 					"version": "1.1.7",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
 					"integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
 					"requires": {
 						"inherits": "^2.0.3",
@@ -20374,14 +20699,14 @@
 					"dependencies": {
 						"inherits": {
 							"version": "2.0.3",
-							"resolved": false,
+							"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
 							"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
 						}
 					}
 				},
 				"hmac-drbg": {
 					"version": "1.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
 					"integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
 					"requires": {
 						"hash.js": "^1.0.3",
@@ -20391,27 +20716,27 @@
 				},
 				"https-browserify": {
 					"version": "1.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
 					"integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM="
 				},
 				"ieee754": {
 					"version": "1.1.13",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
 					"integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
 				},
 				"inherits": {
 					"version": "2.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
 					"integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
 				},
 				"isarray": {
 					"version": "1.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
 					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
 				},
 				"md5.js": {
 					"version": "1.3.5",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
 					"integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
 					"requires": {
 						"hash-base": "^3.0.0",
@@ -20421,7 +20746,7 @@
 				},
 				"miller-rabin": {
 					"version": "4.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
 					"integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
 					"requires": {
 						"bn.js": "^4.0.0",
@@ -20430,27 +20755,27 @@
 				},
 				"minimalistic-assert": {
 					"version": "1.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
 					"integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
 				},
 				"minimalistic-crypto-utils": {
 					"version": "1.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
 					"integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
 				},
 				"os-browserify": {
 					"version": "0.3.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
 					"integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc="
 				},
 				"pako": {
 					"version": "1.0.10",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
 					"integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw=="
 				},
 				"parse-asn1": {
 					"version": "5.1.4",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz",
 					"integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
 					"requires": {
 						"asn1.js": "^4.0.0",
@@ -20463,12 +20788,12 @@
 				},
 				"path-browserify": {
 					"version": "1.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.0.tgz",
 					"integrity": "sha512-Hkavx/nY4/plImrZPHRk2CL9vpOymZLgEbMNX1U0bjcBL7QN9wODxyx0yaMZURSQaUtSEvDrfAvxa9oPb0at9g=="
 				},
 				"pbkdf2": {
 					"version": "3.0.17",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
 					"integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
 					"requires": {
 						"create-hash": "^1.1.2",
@@ -20480,17 +20805,17 @@
 				},
 				"process": {
 					"version": "0.11.10",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
 					"integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
 				},
 				"process-nextick-args": {
 					"version": "2.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
 					"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
 				},
 				"public-encrypt": {
 					"version": "4.0.3",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
 					"integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
 					"requires": {
 						"bn.js": "^4.1.0",
@@ -20503,22 +20828,22 @@
 				},
 				"punycode": {
 					"version": "2.1.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
 					"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
 				},
 				"querystring": {
 					"version": "0.2.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
 					"integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
 				},
 				"querystring-es3": {
 					"version": "0.2.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
 					"integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM="
 				},
 				"randombytes": {
 					"version": "2.1.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
 					"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
 					"requires": {
 						"safe-buffer": "^5.1.0"
@@ -20526,7 +20851,7 @@
 				},
 				"randomfill": {
 					"version": "1.0.4",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
 					"integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
 					"requires": {
 						"randombytes": "^2.0.5",
@@ -20535,7 +20860,7 @@
 				},
 				"readable-stream": {
 					"version": "3.3.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.3.0.tgz",
 					"integrity": "sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==",
 					"requires": {
 						"inherits": "^2.0.3",
@@ -20545,14 +20870,14 @@
 					"dependencies": {
 						"inherits": {
 							"version": "2.0.3",
-							"resolved": false,
+							"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
 							"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
 						}
 					}
 				},
 				"ripemd160": {
 					"version": "2.0.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
 					"integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
 					"requires": {
 						"hash-base": "^3.0.0",
@@ -20561,17 +20886,17 @@
 				},
 				"safe-buffer": {
 					"version": "5.1.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
 					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
 				},
 				"setimmediate": {
 					"version": "1.0.5",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
 					"integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
 				},
 				"sha.js": {
 					"version": "2.4.11",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
 					"integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
 					"requires": {
 						"inherits": "^2.0.1",
@@ -20580,7 +20905,7 @@
 				},
 				"stream-browserify": {
 					"version": "2.0.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
 					"integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
 					"requires": {
 						"inherits": "~2.0.1",
@@ -20589,7 +20914,7 @@
 					"dependencies": {
 						"readable-stream": {
 							"version": "2.3.6",
-							"resolved": false,
+							"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
 							"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
 							"requires": {
 								"core-util-is": "~1.0.0",
@@ -20603,14 +20928,14 @@
 							"dependencies": {
 								"inherits": {
 									"version": "2.0.3",
-									"resolved": false,
+									"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
 									"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
 								}
 							}
 						},
 						"string_decoder": {
 							"version": "1.1.1",
-							"resolved": false,
+							"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
 							"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 							"requires": {
 								"safe-buffer": "~5.1.0"
@@ -20620,7 +20945,7 @@
 				},
 				"stream-http": {
 					"version": "3.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.0.0.tgz",
 					"integrity": "sha512-JELJfd+btL9GHtxU3+XXhg9NLYrKFnhybfvRuDghtyVkOFydz3PKNT1df07AMr88qW03WHF+FSV0PySpXignCA==",
 					"requires": {
 						"builtin-status-codes": "^3.0.0",
@@ -20631,7 +20956,7 @@
 				},
 				"string_decoder": {
 					"version": "1.2.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz",
 					"integrity": "sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==",
 					"requires": {
 						"safe-buffer": "~5.1.0"
@@ -20639,7 +20964,7 @@
 				},
 				"timers-browserify": {
 					"version": "2.0.10",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
 					"integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
 					"requires": {
 						"setimmediate": "^1.0.4"
@@ -20647,12 +20972,12 @@
 				},
 				"tty-browserify": {
 					"version": "0.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
 					"integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw=="
 				},
 				"url": {
 					"version": "0.11.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
 					"integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
 					"requires": {
 						"punycode": "1.3.2",
@@ -20661,14 +20986,14 @@
 					"dependencies": {
 						"punycode": {
 							"version": "1.3.2",
-							"resolved": false,
+							"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
 							"integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
 						}
 					}
 				},
 				"util": {
 					"version": "0.11.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
 					"integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
 					"requires": {
 						"inherits": "2.0.3"
@@ -20676,24 +21001,24 @@
 					"dependencies": {
 						"inherits": {
 							"version": "2.0.3",
-							"resolved": false,
+							"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
 							"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
 						}
 					}
 				},
 				"util-deprecate": {
 					"version": "1.0.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
 					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
 				},
 				"vm-browserify": {
 					"version": "1.1.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz",
 					"integrity": "sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw=="
 				},
 				"xtend": {
 					"version": "4.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
 					"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
 				}
 			}
@@ -24146,6 +24471,14 @@
 			"integrity": "sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g=",
 			"dev": true
 		},
+		"raf": {
+			"version": "3.4.1",
+			"resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
+			"integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
+			"requires": {
+				"performance-now": "^2.1.0"
+			}
+		},
 		"ramda": {
 			"version": "0.21.0",
 			"resolved": "https://registry.npmjs.org/ramda/-/ramda-0.21.0.tgz",
@@ -25038,8 +25371,35 @@
 		"react-lifecycles-compat": {
 			"version": "3.0.4",
 			"resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
-			"integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==",
-			"dev": true
+			"integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
+		},
+		"react-measure": {
+			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/react-measure/-/react-measure-2.3.0.tgz",
+			"integrity": "sha512-dwAvmiOeblj5Dvpnk8Jm7Q8B4THF/f1l1HtKVi0XDecsG6LXwGvzV5R1H32kq3TW6RW64OAf5aoQxpIgLa4z8A==",
+			"requires": {
+				"@babel/runtime": "^7.2.0",
+				"get-node-dimensions": "^1.2.1",
+				"prop-types": "^15.6.2",
+				"resize-observer-polyfill": "^1.5.0"
+			}
+		},
+		"react-motion": {
+			"version": "0.5.2",
+			"resolved": "https://registry.npmjs.org/react-motion/-/react-motion-0.5.2.tgz",
+			"integrity": "sha512-9q3YAvHoUiWlP3cK0v+w1N5Z23HXMj4IF4YuvjvWegWqNPfLXsOBE/V7UvQGpXxHFKRQQcNcVQE31g9SB/6qgQ==",
+			"requires": {
+				"performance-now": "^0.2.0",
+				"prop-types": "^15.5.8",
+				"raf": "^3.1.0"
+			},
+			"dependencies": {
+				"performance-now": {
+					"version": "0.2.0",
+					"resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
+					"integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU="
+				}
+			}
 		},
 		"react-popper": {
 			"version": "1.3.7",
@@ -25303,6 +25663,26 @@
 				"resolve": "^1.1.6"
 			}
 		},
+		"recompose": {
+			"version": "0.30.0",
+			"resolved": "https://registry.npmjs.org/recompose/-/recompose-0.30.0.tgz",
+			"integrity": "sha512-ZTrzzUDa9AqUIhRk4KmVFihH0rapdCSMFXjhHbNrjAWxBuUD/guYlyysMnuHjlZC/KRiOKRtB4jf96yYSkKE8w==",
+			"requires": {
+				"@babel/runtime": "^7.0.0",
+				"change-emitter": "^0.1.2",
+				"fbjs": "^0.8.1",
+				"hoist-non-react-statics": "^2.3.1",
+				"react-lifecycles-compat": "^3.0.2",
+				"symbol-observable": "^1.0.4"
+			},
+			"dependencies": {
+				"hoist-non-react-statics": {
+					"version": "2.5.5",
+					"resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz",
+					"integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw=="
+				}
+			}
+		},
 		"recursive-readdir": {
 			"version": "2.2.2",
 			"resolved": "https://registry.npmjs.org/recursive-readdir/-/recursive-readdir-2.2.2.tgz",
@@ -25740,8 +26120,7 @@
 		"resize-observer-polyfill": {
 			"version": "1.5.1",
 			"resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
-			"integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==",
-			"dev": true
+			"integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
 		},
 		"resolve": {
 			"version": "1.8.1",
@@ -26137,8 +26516,7 @@
 		"setimmediate": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-			"integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
-			"dev": true
+			"integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
 		},
 		"setprototypeof": {
 			"version": "1.1.0",
@@ -27937,8 +28315,7 @@
 		"symbol-observable": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz",
-			"integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==",
-			"dev": true
+			"integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ=="
 		},
 		"symbol-tree": {
 			"version": "3.2.2",
diff --git a/package.json b/package.json
index 823a7669080c..86296c06c16d 100644
--- a/package.json
+++ b/package.json
@@ -124,10 +124,14 @@
 		"@google-cloud/language": "^3.7.0",
 		"@google-cloud/storage": "^2.3.1",
 		"@google-cloud/vision": "^1.8.0",
+		"@nivo/bar": "^0.61.1",
+		"@nivo/heatmap": "^0.61.0",
+		"@nivo/line": "^0.61.1",
+		"@nivo/pie": "^0.61.1",
 		"@rocket.chat/apps-engine": "^1.13.0-beta.2857",
-		"@rocket.chat/fuselage": "^0.3.0",
-		"@rocket.chat/fuselage-hooks": "^0.3.0",
-		"@rocket.chat/fuselage-ui-kit": "^0.3.0",
+		"@rocket.chat/fuselage": "^0.6.0",
+		"@rocket.chat/fuselage-hooks": "^0.6.0",
+		"@rocket.chat/fuselage-ui-kit": "^0.6.0",
 		"@rocket.chat/icons": "^0.3.0",
 		"@rocket.chat/ui-kit": "^0.3.0",
 		"@slack/client": "^4.8.0",
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 0fe71603ed59..379d32dd9698 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -223,6 +223,13 @@
   "Accounts_UserAddedEmailSubject_Default": "You have been added to [Site_Name]",
   "Accounts_UserAddedEmail_Description": "You may use the following placeholders: <br/><ul><li>[name], [fname], [lname] for the user's full name, first name or last name, respectively.</li><li>[email] for the user's email.</li><li>[password] for the user's password.</li><li>[Site_Name] and [Site_URL] for the Application Name and URL respectively.</li></ul>",
   "Activate": "Activate",
+  "Active_users": "Active users",
+  "Daily_Active_Users": "Daily Active Users",
+  "Weekly_Active_Users": "Weekly Active Users",
+  "Monthly_Active_Users": "Monthly Active Users",
+  "DAU_value": "DAU __value__",
+  "WAU_value": "WAU __value__",
+  "MAU_value": "MAU __value__",
   "Activity": "Activity",
   "Add": "Add",
   "add-oauth-service": "Add Oauth Service",
@@ -1011,6 +1018,7 @@
   "Create_A_New_Channel": "Create a New Channel",
   "Create_new": "Create new",
   "Create_unique_rules_for_this_channel": "Create unique rules for this channel",
+  "Created": "Created",
   "Created_at": "Created at",
   "Created_at_s_by_s": "Created at <strong>%s</strong> by <strong>%s</strong>",
   "Created_at_s_by_s_triggered_by_s": "Created at <strong>%s</strong> by <strong>%s</strong> triggered by <strong>%s</strong>",
@@ -1074,6 +1082,7 @@
   "Date_From": "From",
   "Date_to": "to",
   "days": "days",
+  "Days": "Days",
   "DB_Migration": "Database Migration",
   "DB_Migration_Date": "Database Migration Date",
   "DDP_Rate_Limit_IP_Enabled": "Limit by IP: enabled",
@@ -1271,6 +1280,7 @@
   "Emoji_provided_by_JoyPixels": "Emoji provided by <strong>JoyPixels</strong>",
   "EmojiCustomFilesystem": "Custom Emoji Filesystem",
   "Empty_title": "Empty title",
+  "Engagement_Dashboard": "Engagement Dashboard",
   "Enable": "Enable",
   "Enable_Auto_Away": "Enable Auto Away",
   "Enable_Desktop_Notifications": "Enable Desktop Notifications",
@@ -1890,6 +1900,7 @@
   "IssueLinks_Incompatible": "Warning: do not enable this and the 'Hex Color Preview' at the same time.",
   "IssueLinks_LinkTemplate": "Template for issue links",
   "IssueLinks_LinkTemplate_Description": "Template for issue links; %s will be replaced by the issue number.",
+  "Items_per_page:": "Items per page:",
   "It_works": "It works",
   "italic": "Italic",
   "italics": "italics",
@@ -1903,6 +1914,7 @@
   "Mobex_sms_gateway_restful_address": "Mobex SMS REST API Address",
   "Mobex_sms_gateway_restful_address_desc": "IP or Host of your Mobex REST API. E.g. `http://192.168.1.1:8080` or `https://www.example.com:8080`",
   "Mobex_sms_gateway_username": "Username",
+  "Most_popular_channels_top_5": "Most popular channels (Top 5)",
   "Jitsi_Chrome_Extension": "Chrome Extension Id",
   "Jitsi_Enabled_TokenAuth": "Enable JWT auth",
   "Jitsi_Application_ID": "Application ID (iss)",
@@ -1961,6 +1973,7 @@
   "Language_Russian": "Russian",
   "Language_Spanish": "Spanish",
   "Language_Version": "English Version",
+  "Last_active": "Last active",
   "Last_login": "Last login",
   "Last_Message_At": "Last Message At",
   "Last_seen": "Last seen",
@@ -1968,6 +1981,9 @@
   "Last_Message": "Last Message",
   "Last_Status": "Last Status",
   "Last_Updated": "Last Updated",
+  "Last_7_days": "Last 7 Days",
+  "Last_30_days": "Last 30 Days",
+  "Last_90_days": "Last 90 Days",
   "Launched_successfully": "Launched successfully",
   "Layout": "Layout",
   "Layout_Home_Body": "Home Body",
@@ -2339,6 +2355,7 @@
   "Message": "Message",
   "messages": "messages",
   "Messages": "Messages",
+  "Messages_sent": "Messages sent",
   "Messages_that_are_sent_to_the_Incoming_WebHook_will_be_posted_here": "Messages that are sent to the Incoming WebHook will be posted here.",
   "Meta": "Meta",
   "Meta_custom": "Custom Meta Tags",
@@ -2398,6 +2415,7 @@
   "Name_optional": "Name (optional)",
   "Name_Placeholder": "Please enter your name...",
   "Navigation_History": "Navigation History",
+  "New_users": "New users",
   "New_Application": "New Application",
   "New_chat_transfer": "New Chat Transfer: __transfer__",
   "New_Custom_Field": "New Custom Field",
@@ -2447,11 +2465,13 @@
   "No_discussions_yet": "No discussions yet",
   "No_Threads": "No threads found",
   "No_user_with_username_%s_was_found": "No user with username <strong>\"%s\"</strong> was found!",
+  "No_data_found": "No data found",
   "Nobody_available": "Nobody available",
   "Node_version": "Node Version",
   "None": "None",
   "Nonprofit": "Nonprofit",
   "Normal": "Normal",
+  "Not_enough_data": "Not enough data",
   "Not_authorized": "Not authorized",
   "Not_Available": "Not Available",
   "Not_found_or_not_allowed": "Not Found or Not Allowed",
@@ -2634,6 +2654,8 @@
   "Privacy_Policy": "Privacy Policy",
   "Private": "Private",
   "Private_Channel": "Private Channel",
+  "Private_Channels": "Private Channels",
+  "Private_Chats": "Private Chats",
   "Private_Group": "Private Group",
   "Private_Groups": "Private Groups",
   "Private_Groups_list": "List of Private Groups",
@@ -2661,6 +2683,7 @@
   "files_pruned": "files pruned",
   "Public": "Public",
   "Public_Channel": "Public Channel",
+  "Public_Channels": "Public Channels",
   "Public_Community": "Public Community",
   "Public_Relations": "Public Relations",
   "Public_URL": "Public URL",
@@ -3493,6 +3516,7 @@
   "Username_wants_to_start_otr_Do_you_want_to_accept": "__username__ wants to start OTR. Do you want to accept?",
   "Users": "Users",
   "Users_added": "The users have been added",
+  "Users_by_time_of_day": "Users by time of day",
   "Users_in_role": "Users in role",
   "Users must use Two Factor Authentication": "Users must use Two Factor Authentication",
   "Leave_the_description_field_blank_if_you_dont_want_to_show_the_role": "Leave the description field blank if you don't want to show the role",
@@ -3501,6 +3525,8 @@
   "UTF8_Names_Slugify": "UTF8 Names Slugify",
   "UTF8_Names_Validation": "UTF8 Names Validation",
   "UTF8_Names_Validation_Description": "RegExp that will be used to validate usernames and channel names",
+  "Value_messages": "__value__ messages",
+  "Value_users": "__value__ users",
   "Validate_email_address": "Validate Email Address",
   "Verification_email_body": "You have succesfully created an account on [Site_Name]. Please, click on the button below to confirm your email address and finish registration.",
   "Verification": "Verification",
@@ -3603,6 +3629,8 @@
   "Welcome": "Welcome <em>%s</em>.",
   "Welcome_to": "Welcome to __Site_Name__",
   "Welcome_to_the": "Welcome to the",
+  "Where_are_the_messages_being_sent?": "Where are the messages being sent?",
+  "When_is_the_chat_busier?": "When is the chat busier?",
   "Why_do_you_want_to_report_question_mark": "Why do you want to report?",
   "will_be_able_to": "will be able to",
   "Worldwide": "Worldwide",
diff --git a/server/main.js b/server/main.js
index 72ffa6273ffd..b096109e3e92 100644
--- a/server/main.js
+++ b/server/main.js
@@ -3,6 +3,7 @@ import '../imports/startup/server';
 
 import '../lib/RegExp';
 
+import '../ee/server';
 import './lib/accounts';
 import './lib/cordova';
 import './lib/roomFiles';
@@ -74,5 +75,3 @@ import './routes/avatar';
 import './stream/messages';
 import './stream/rooms';
 import './stream/streamBroadcast';
-
-import '../ee/server';

From 54b55236187987bb47a0759c07c8f6999bdcb42d Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Wed, 25 Mar 2020 09:05:44 -0300
Subject: [PATCH 068/223] [Regression] Replace the Omnichannel queue model
 observe with Stream (#16999)

* Replace LivechatInquiry observe by stream.

* Unify stream.

* Add hasPermission method.

* Add missing importers.

* Revert package-lock file.

* Improve the codebase.

* Add return statement.

* Fix remove listeners that were missing.

* Removed unnecessary imports.

* Remove unnecessary function parameters.
---
 app/livechat/client/lib/stream/inquiry.js     |  4 +-
 .../client/lib/stream/queueManager.js         | 27 ++++----
 .../client/views/app/livechatReadOnly.js      |  9 +--
 app/livechat/lib/stream/constants.js          |  1 -
 app/livechat/server/index.js                  |  1 -
 app/livechat/server/lib/stream/inquiry.js     | 34 ----------
 .../server/lib/stream/queueManager.js         | 64 ++++++++++---------
 7 files changed, 53 insertions(+), 87 deletions(-)
 delete mode 100644 app/livechat/server/lib/stream/inquiry.js

diff --git a/app/livechat/client/lib/stream/inquiry.js b/app/livechat/client/lib/stream/inquiry.js
index 333f67b3684a..03a15c20464f 100644
--- a/app/livechat/client/lib/stream/inquiry.js
+++ b/app/livechat/client/lib/stream/inquiry.js
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
 
-import { LIVECHAT_INQUIRY_DATA_STREAM_OBSERVER } from '../../../lib/stream/constants';
+import { LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER } from '../../../lib/stream/constants';
 
-export const inquiryDataStream = new Meteor.Streamer(LIVECHAT_INQUIRY_DATA_STREAM_OBSERVER);
+export const inquiryDataStream = new Meteor.Streamer(LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER);
diff --git a/app/livechat/client/lib/stream/queueManager.js b/app/livechat/client/lib/stream/queueManager.js
index 5f58fdc56376..497a961c55f7 100644
--- a/app/livechat/client/lib/stream/queueManager.js
+++ b/app/livechat/client/lib/stream/queueManager.js
@@ -1,31 +1,29 @@
-import { Meteor } from 'meteor/meteor';
-
 import { APIClient } from '../../../../utils/client';
 import { getLivechatInquiryCollection } from '../../collections/LivechatInquiry';
-import { LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER } from '../../../lib/stream/constants';
+import { inquiryDataStream } from './inquiry';
 import { hasRole } from '../../../../authorization/client';
 
-const livechatQueueStreamer = new Meteor.Streamer('livechat-queue-stream');
 let agentDepartments = [];
+const collection = getLivechatInquiryCollection();
 
 const events = {
-	added: (inquiry, collection) => {
+	added: (inquiry) => {
 		delete inquiry.type;
 		collection.insert(inquiry);
 	},
-	changed: (inquiry, collection) => {
+	changed: (inquiry) => {
 		if (inquiry.status !== 'queued' || (inquiry.department && !agentDepartments.includes(inquiry.department))) {
 			return collection.remove(inquiry._id);
 		}
 		delete inquiry.type;
 		collection.upsert({ _id: inquiry._id }, inquiry);
 	},
-	removed: (inquiry, collection) => collection.remove(inquiry._id),
+	removed: (inquiry) => collection.remove(inquiry._id),
 };
 
-const appendListenerToDepartment = (departmentId, collection) => livechatQueueStreamer.on(`${ LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER }/${ departmentId }`, (inquiry) => events[inquiry.type](inquiry, collection));
-
-const removeListenerOfDepartment = (departmentId) => livechatQueueStreamer.removeListener(`${ LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER }/${ departmentId }`);
+const updateCollection = (inquiry) => { events[inquiry.type](inquiry); };
+const appendListenerToDepartment = (departmentId) => inquiryDataStream.on(`department/${ departmentId }`, updateCollection);
+const removeListenerOfDepartment = (departmentId) => inquiryDataStream.removeListener(`department/${ departmentId }`, updateCollection);
 
 const getInquiriesFromAPI = async (url) => {
 	const { inquiries } = await APIClient.v1.get(url);
@@ -33,7 +31,6 @@ const getInquiriesFromAPI = async (url) => {
 };
 
 const updateInquiries = async (inquiries) => {
-	const collection = getLivechatInquiryCollection();
 	(inquiries || []).forEach((inquiry) => collection.upsert({ _id: inquiry._id }, inquiry));
 };
 
@@ -43,9 +40,8 @@ const getAgentsDepartments = async (userId) => {
 };
 
 const addListenerForeachDepartment = async (userId, departments) => {
-	const collection = getLivechatInquiryCollection();
 	if (departments && Array.isArray(departments) && departments.length) {
-		departments.forEach((department) => appendListenerToDepartment(department, collection));
+		departments.forEach((department) => appendListenerToDepartment(department));
 	}
 };
 
@@ -54,11 +50,10 @@ const removeDepartmentsListeners = (departments) => {
 };
 
 const removeGlobalListener = () => {
-	livechatQueueStreamer.removeListener(LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER);
+	inquiryDataStream.removeListener('public', updateCollection);
 };
 
 export const initializeLivechatInquiryStream = async (userId) => {
-	const collection = getLivechatInquiryCollection();
 	collection.remove({});
 	if (agentDepartments.length) {
 		removeDepartmentsListeners(agentDepartments);
@@ -68,6 +63,6 @@ export const initializeLivechatInquiryStream = async (userId) => {
 	agentDepartments = (await getAgentsDepartments(userId)).map((department) => department.departmentId);
 	await addListenerForeachDepartment(userId, agentDepartments);
 	if (agentDepartments.length === 0 || hasRole(userId, 'livechat-manager')) {
-		livechatQueueStreamer.on(LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER, (inquiry) => events[inquiry.type](inquiry, collection));
+		inquiryDataStream.on('public', updateCollection);
 	}
 };
diff --git a/app/livechat/client/views/app/livechatReadOnly.js b/app/livechat/client/views/app/livechatReadOnly.js
index 9ea5baf1b9c5..ef516a7ac885 100644
--- a/app/livechat/client/views/app/livechatReadOnly.js
+++ b/app/livechat/client/views/app/livechatReadOnly.js
@@ -49,11 +49,12 @@ Template.livechatReadOnly.onCreated(function() {
 	this.routingConfig = new ReactiveVar({});
 	this.preparing = new ReactiveVar(true);
 
-	this.updateInquiry = async (inquiry) => {
-		this.inquiry.set(inquiry);
-		if (!await call('canAccessRoom', inquiry.rid, Meteor.userId())) {
-			FlowRouter.go('/home');
+	this.updateInquiry = async ({ clientAction, ...inquiry }) => {
+		if (clientAction === 'removed' || !await call('canAccessRoom', inquiry.rid, Meteor.userId())) {
+			return FlowRouter.go('/home');
 		}
+
+		this.inquiry.set(inquiry);
 	};
 
 	Meteor.call('livechat:getRoutingConfig', (err, config) => {
diff --git a/app/livechat/lib/stream/constants.js b/app/livechat/lib/stream/constants.js
index d9c2ec1f0dd9..17c85f566f44 100644
--- a/app/livechat/lib/stream/constants.js
+++ b/app/livechat/lib/stream/constants.js
@@ -1,2 +1 @@
 export const LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER = 'livechat-inquiry-queue-observer';
-export const LIVECHAT_INQUIRY_DATA_STREAM_OBSERVER = 'livechat-inquiry-data-observer';
diff --git a/app/livechat/server/index.js b/app/livechat/server/index.js
index eb3ccee0feca..541cfb16ab4c 100644
--- a/app/livechat/server/index.js
+++ b/app/livechat/server/index.js
@@ -76,7 +76,6 @@ import './lib/routing/External';
 import './lib/routing/ManualSelection';
 import './lib/routing/AutoSelection';
 import './lib/stream/departmentAgents';
-import './lib/stream/inquiry';
 import './lib/stream/queueManager';
 import './sendMessageBySMS';
 import './unclosedLivechats';
diff --git a/app/livechat/server/lib/stream/inquiry.js b/app/livechat/server/lib/stream/inquiry.js
deleted file mode 100644
index 5328d07dbcca..000000000000
--- a/app/livechat/server/lib/stream/inquiry.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-import { LivechatInquiry } from '../../../../models/server';
-import { LIVECHAT_INQUIRY_DATA_STREAM_OBSERVER } from '../../../lib/stream/constants';
-import { hasPermission } from '../../../../authorization/server';
-
-export const inquiryDataStream = new Meteor.Streamer(LIVECHAT_INQUIRY_DATA_STREAM_OBSERVER);
-
-inquiryDataStream.allowWrite('none');
-
-inquiryDataStream.allowRead(function() {
-	return this.userId ? hasPermission(this.userId, 'view-l-room') : false;
-});
-
-const emitInquiryDataEvent = (id, data) => {
-	if (!data) {
-		return;
-	}
-
-	inquiryDataStream.emit(id, data);
-};
-
-LivechatInquiry.on('change', ({ clientAction, id }) => {
-	switch (clientAction) {
-		case 'inserted':
-		case 'updated':
-			emitInquiryDataEvent(id, LivechatInquiry.findOneById(id));
-			break;
-
-		case 'removed':
-			emitInquiryDataEvent(id, { _id: id });
-			break;
-	}
-});
diff --git a/app/livechat/server/lib/stream/queueManager.js b/app/livechat/server/lib/stream/queueManager.js
index 2548ac711ac4..dd1a088fec57 100644
--- a/app/livechat/server/lib/stream/queueManager.js
+++ b/app/livechat/server/lib/stream/queueManager.js
@@ -4,38 +4,44 @@ import { hasPermission } from '../../../../authorization/server';
 import { LivechatInquiry } from '../../../../models/server';
 import { LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER } from '../../../lib/stream/constants';
 
-const livechatQueueStreamer = new Meteor.Streamer('livechat-queue-stream');
-livechatQueueStreamer.allowWrite('none');
-livechatQueueStreamer.allowRead(function() {
+const queueDataStreamer = new Meteor.Streamer(LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER);
+queueDataStreamer.allowWrite('none');
+queueDataStreamer.allowRead(function() {
 	return this.userId ? hasPermission(this.userId, 'view-l-room') : false;
 });
 
-const emitEvent = (event, data) => livechatQueueStreamer.emit(event, data);
+const emitQueueDataEvent = (event, data) => queueDataStreamer.emit(event, data);
 const mountDataToEmit = (type, data) => ({ type, ...data });
 
-LivechatInquiry.find({}).observeChanges({
-	added(_id, record) {
-		if (record && record.department) {
-			return emitEvent(`${ LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER }/${ record.department }`, mountDataToEmit('added', { ...record, _id }));
-		}
-		emitEvent(LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER, mountDataToEmit('added', { ...record, _id }));
-	},
-	changed(_id, record) {
-		const isUpdatingDepartment = record && record.department;
-		const inquiry = LivechatInquiry.findOneById(_id);
-		if (inquiry && !inquiry.department) {
-			return emitEvent(LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER, mountDataToEmit('changed', inquiry));
-		}
-		if (isUpdatingDepartment) {
-			emitEvent(LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER, mountDataToEmit('changed', inquiry));
-		}
-		return emitEvent(`${ LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER }/${ inquiry.department }`, mountDataToEmit('changed', inquiry));
-	},
-	removed(_id) {
-		const inquiry = LivechatInquiry.trashFindOneById(_id);
-		if (inquiry && inquiry.department) {
-			return emitEvent(`${ LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER }/${ inquiry.department }`, mountDataToEmit('removed', { _id }));
-		}
-		emitEvent(LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER, mountDataToEmit('removed', { _id }));
-	},
+LivechatInquiry.on('change', ({ clientAction, id: _id, data: record }) => {
+	switch (clientAction) {
+		case 'inserted':
+			emitQueueDataEvent(_id, { ...record, clientAction });
+			if (record && record.department) {
+				return emitQueueDataEvent(`department/${ record.department }`, mountDataToEmit('added', record));
+			}
+			emitQueueDataEvent('public', mountDataToEmit('added', record));
+			break;
+		case 'updated':
+			const isUpdatingDepartment = record && record.department;
+			const updatedRecord = LivechatInquiry.findOneById(_id);
+			emitQueueDataEvent(_id, { ...updatedRecord, clientAction });
+			if (updatedRecord && !updatedRecord.department) {
+				return emitQueueDataEvent('public', mountDataToEmit('changed', updatedRecord));
+			}
+			if (isUpdatingDepartment) {
+				emitQueueDataEvent('public', mountDataToEmit('changed', updatedRecord));
+			}
+			emitQueueDataEvent(`department/${ updatedRecord.department }`, mountDataToEmit('changed', updatedRecord));
+			break;
+
+		case 'removed':
+			const removedRecord = LivechatInquiry.trashFindOneById(_id);
+			emitQueueDataEvent(_id, { _id, clientAction });
+			if (removedRecord && removedRecord.department) {
+				return emitQueueDataEvent(`department/${ removedRecord.department }`, mountDataToEmit('removed', { _id }));
+			}
+			emitQueueDataEvent('public', mountDataToEmit('removed', { _id }));
+			break;
+	}
 });

From 0bcf99772c1232bcee60e63d307bce3980b09cdb Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Thu, 19 Mar 2020 14:09:50 -0300
Subject: [PATCH 069/223] [FIX]  Keeps the agent in the room after accepting a
 new Omnichannel request (#16787)

---
 app/livechat/client/views/app/livechatReadOnly.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/livechat/client/views/app/livechatReadOnly.js b/app/livechat/client/views/app/livechatReadOnly.js
index da599cb65cb0..9ea5baf1b9c5 100644
--- a/app/livechat/client/views/app/livechatReadOnly.js
+++ b/app/livechat/client/views/app/livechatReadOnly.js
@@ -12,7 +12,7 @@ import { inquiryDataStream } from '../../lib/stream/inquiry';
 Template.livechatReadOnly.helpers({
 	inquiryOpen() {
 		const inquiry = Template.instance().inquiry.get();
-		return (inquiry && inquiry.status === 'queued') || FlowRouter.go('/home');
+		return inquiry && inquiry.status === 'queued';
 	},
 
 	roomOpen() {
@@ -49,8 +49,11 @@ Template.livechatReadOnly.onCreated(function() {
 	this.routingConfig = new ReactiveVar({});
 	this.preparing = new ReactiveVar(true);
 
-	this.updateInquiry = (inquiry) => {
+	this.updateInquiry = async (inquiry) => {
 		this.inquiry.set(inquiry);
+		if (!await call('canAccessRoom', inquiry.rid, Meteor.userId())) {
+			FlowRouter.go('/home');
+		}
 	};
 
 	Meteor.call('livechat:getRoutingConfig', (err, config) => {

From dd067bac8cc71da1fac75eb7733666e1b2b9ea57 Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Wed, 25 Mar 2020 09:05:44 -0300
Subject: [PATCH 070/223] [Regression] Replace the Omnichannel queue model
 observe with Stream (#16999)

* Replace LivechatInquiry observe by stream.

* Unify stream.

* Add hasPermission method.

* Add missing importers.

* Revert package-lock file.

* Improve the codebase.

* Add return statement.

* Fix remove listeners that were missing.

* Removed unnecessary imports.

* Remove unnecessary function parameters.
---
 app/livechat/client/lib/stream/inquiry.js     |  4 +-
 .../client/lib/stream/queueManager.js         | 27 ++++----
 .../client/views/app/livechatReadOnly.js      |  9 +--
 app/livechat/lib/stream/constants.js          |  1 -
 app/livechat/server/index.js                  |  1 -
 app/livechat/server/lib/stream/inquiry.js     | 34 ----------
 .../server/lib/stream/queueManager.js         | 64 ++++++++++---------
 7 files changed, 53 insertions(+), 87 deletions(-)
 delete mode 100644 app/livechat/server/lib/stream/inquiry.js

diff --git a/app/livechat/client/lib/stream/inquiry.js b/app/livechat/client/lib/stream/inquiry.js
index 333f67b3684a..03a15c20464f 100644
--- a/app/livechat/client/lib/stream/inquiry.js
+++ b/app/livechat/client/lib/stream/inquiry.js
@@ -1,5 +1,5 @@
 import { Meteor } from 'meteor/meteor';
 
-import { LIVECHAT_INQUIRY_DATA_STREAM_OBSERVER } from '../../../lib/stream/constants';
+import { LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER } from '../../../lib/stream/constants';
 
-export const inquiryDataStream = new Meteor.Streamer(LIVECHAT_INQUIRY_DATA_STREAM_OBSERVER);
+export const inquiryDataStream = new Meteor.Streamer(LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER);
diff --git a/app/livechat/client/lib/stream/queueManager.js b/app/livechat/client/lib/stream/queueManager.js
index 5f58fdc56376..497a961c55f7 100644
--- a/app/livechat/client/lib/stream/queueManager.js
+++ b/app/livechat/client/lib/stream/queueManager.js
@@ -1,31 +1,29 @@
-import { Meteor } from 'meteor/meteor';
-
 import { APIClient } from '../../../../utils/client';
 import { getLivechatInquiryCollection } from '../../collections/LivechatInquiry';
-import { LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER } from '../../../lib/stream/constants';
+import { inquiryDataStream } from './inquiry';
 import { hasRole } from '../../../../authorization/client';
 
-const livechatQueueStreamer = new Meteor.Streamer('livechat-queue-stream');
 let agentDepartments = [];
+const collection = getLivechatInquiryCollection();
 
 const events = {
-	added: (inquiry, collection) => {
+	added: (inquiry) => {
 		delete inquiry.type;
 		collection.insert(inquiry);
 	},
-	changed: (inquiry, collection) => {
+	changed: (inquiry) => {
 		if (inquiry.status !== 'queued' || (inquiry.department && !agentDepartments.includes(inquiry.department))) {
 			return collection.remove(inquiry._id);
 		}
 		delete inquiry.type;
 		collection.upsert({ _id: inquiry._id }, inquiry);
 	},
-	removed: (inquiry, collection) => collection.remove(inquiry._id),
+	removed: (inquiry) => collection.remove(inquiry._id),
 };
 
-const appendListenerToDepartment = (departmentId, collection) => livechatQueueStreamer.on(`${ LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER }/${ departmentId }`, (inquiry) => events[inquiry.type](inquiry, collection));
-
-const removeListenerOfDepartment = (departmentId) => livechatQueueStreamer.removeListener(`${ LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER }/${ departmentId }`);
+const updateCollection = (inquiry) => { events[inquiry.type](inquiry); };
+const appendListenerToDepartment = (departmentId) => inquiryDataStream.on(`department/${ departmentId }`, updateCollection);
+const removeListenerOfDepartment = (departmentId) => inquiryDataStream.removeListener(`department/${ departmentId }`, updateCollection);
 
 const getInquiriesFromAPI = async (url) => {
 	const { inquiries } = await APIClient.v1.get(url);
@@ -33,7 +31,6 @@ const getInquiriesFromAPI = async (url) => {
 };
 
 const updateInquiries = async (inquiries) => {
-	const collection = getLivechatInquiryCollection();
 	(inquiries || []).forEach((inquiry) => collection.upsert({ _id: inquiry._id }, inquiry));
 };
 
@@ -43,9 +40,8 @@ const getAgentsDepartments = async (userId) => {
 };
 
 const addListenerForeachDepartment = async (userId, departments) => {
-	const collection = getLivechatInquiryCollection();
 	if (departments && Array.isArray(departments) && departments.length) {
-		departments.forEach((department) => appendListenerToDepartment(department, collection));
+		departments.forEach((department) => appendListenerToDepartment(department));
 	}
 };
 
@@ -54,11 +50,10 @@ const removeDepartmentsListeners = (departments) => {
 };
 
 const removeGlobalListener = () => {
-	livechatQueueStreamer.removeListener(LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER);
+	inquiryDataStream.removeListener('public', updateCollection);
 };
 
 export const initializeLivechatInquiryStream = async (userId) => {
-	const collection = getLivechatInquiryCollection();
 	collection.remove({});
 	if (agentDepartments.length) {
 		removeDepartmentsListeners(agentDepartments);
@@ -68,6 +63,6 @@ export const initializeLivechatInquiryStream = async (userId) => {
 	agentDepartments = (await getAgentsDepartments(userId)).map((department) => department.departmentId);
 	await addListenerForeachDepartment(userId, agentDepartments);
 	if (agentDepartments.length === 0 || hasRole(userId, 'livechat-manager')) {
-		livechatQueueStreamer.on(LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER, (inquiry) => events[inquiry.type](inquiry, collection));
+		inquiryDataStream.on('public', updateCollection);
 	}
 };
diff --git a/app/livechat/client/views/app/livechatReadOnly.js b/app/livechat/client/views/app/livechatReadOnly.js
index 9ea5baf1b9c5..ef516a7ac885 100644
--- a/app/livechat/client/views/app/livechatReadOnly.js
+++ b/app/livechat/client/views/app/livechatReadOnly.js
@@ -49,11 +49,12 @@ Template.livechatReadOnly.onCreated(function() {
 	this.routingConfig = new ReactiveVar({});
 	this.preparing = new ReactiveVar(true);
 
-	this.updateInquiry = async (inquiry) => {
-		this.inquiry.set(inquiry);
-		if (!await call('canAccessRoom', inquiry.rid, Meteor.userId())) {
-			FlowRouter.go('/home');
+	this.updateInquiry = async ({ clientAction, ...inquiry }) => {
+		if (clientAction === 'removed' || !await call('canAccessRoom', inquiry.rid, Meteor.userId())) {
+			return FlowRouter.go('/home');
 		}
+
+		this.inquiry.set(inquiry);
 	};
 
 	Meteor.call('livechat:getRoutingConfig', (err, config) => {
diff --git a/app/livechat/lib/stream/constants.js b/app/livechat/lib/stream/constants.js
index d9c2ec1f0dd9..17c85f566f44 100644
--- a/app/livechat/lib/stream/constants.js
+++ b/app/livechat/lib/stream/constants.js
@@ -1,2 +1 @@
 export const LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER = 'livechat-inquiry-queue-observer';
-export const LIVECHAT_INQUIRY_DATA_STREAM_OBSERVER = 'livechat-inquiry-data-observer';
diff --git a/app/livechat/server/index.js b/app/livechat/server/index.js
index eb3ccee0feca..541cfb16ab4c 100644
--- a/app/livechat/server/index.js
+++ b/app/livechat/server/index.js
@@ -76,7 +76,6 @@ import './lib/routing/External';
 import './lib/routing/ManualSelection';
 import './lib/routing/AutoSelection';
 import './lib/stream/departmentAgents';
-import './lib/stream/inquiry';
 import './lib/stream/queueManager';
 import './sendMessageBySMS';
 import './unclosedLivechats';
diff --git a/app/livechat/server/lib/stream/inquiry.js b/app/livechat/server/lib/stream/inquiry.js
deleted file mode 100644
index 5328d07dbcca..000000000000
--- a/app/livechat/server/lib/stream/inquiry.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-import { LivechatInquiry } from '../../../../models/server';
-import { LIVECHAT_INQUIRY_DATA_STREAM_OBSERVER } from '../../../lib/stream/constants';
-import { hasPermission } from '../../../../authorization/server';
-
-export const inquiryDataStream = new Meteor.Streamer(LIVECHAT_INQUIRY_DATA_STREAM_OBSERVER);
-
-inquiryDataStream.allowWrite('none');
-
-inquiryDataStream.allowRead(function() {
-	return this.userId ? hasPermission(this.userId, 'view-l-room') : false;
-});
-
-const emitInquiryDataEvent = (id, data) => {
-	if (!data) {
-		return;
-	}
-
-	inquiryDataStream.emit(id, data);
-};
-
-LivechatInquiry.on('change', ({ clientAction, id }) => {
-	switch (clientAction) {
-		case 'inserted':
-		case 'updated':
-			emitInquiryDataEvent(id, LivechatInquiry.findOneById(id));
-			break;
-
-		case 'removed':
-			emitInquiryDataEvent(id, { _id: id });
-			break;
-	}
-});
diff --git a/app/livechat/server/lib/stream/queueManager.js b/app/livechat/server/lib/stream/queueManager.js
index 2548ac711ac4..dd1a088fec57 100644
--- a/app/livechat/server/lib/stream/queueManager.js
+++ b/app/livechat/server/lib/stream/queueManager.js
@@ -4,38 +4,44 @@ import { hasPermission } from '../../../../authorization/server';
 import { LivechatInquiry } from '../../../../models/server';
 import { LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER } from '../../../lib/stream/constants';
 
-const livechatQueueStreamer = new Meteor.Streamer('livechat-queue-stream');
-livechatQueueStreamer.allowWrite('none');
-livechatQueueStreamer.allowRead(function() {
+const queueDataStreamer = new Meteor.Streamer(LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER);
+queueDataStreamer.allowWrite('none');
+queueDataStreamer.allowRead(function() {
 	return this.userId ? hasPermission(this.userId, 'view-l-room') : false;
 });
 
-const emitEvent = (event, data) => livechatQueueStreamer.emit(event, data);
+const emitQueueDataEvent = (event, data) => queueDataStreamer.emit(event, data);
 const mountDataToEmit = (type, data) => ({ type, ...data });
 
-LivechatInquiry.find({}).observeChanges({
-	added(_id, record) {
-		if (record && record.department) {
-			return emitEvent(`${ LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER }/${ record.department }`, mountDataToEmit('added', { ...record, _id }));
-		}
-		emitEvent(LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER, mountDataToEmit('added', { ...record, _id }));
-	},
-	changed(_id, record) {
-		const isUpdatingDepartment = record && record.department;
-		const inquiry = LivechatInquiry.findOneById(_id);
-		if (inquiry && !inquiry.department) {
-			return emitEvent(LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER, mountDataToEmit('changed', inquiry));
-		}
-		if (isUpdatingDepartment) {
-			emitEvent(LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER, mountDataToEmit('changed', inquiry));
-		}
-		return emitEvent(`${ LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER }/${ inquiry.department }`, mountDataToEmit('changed', inquiry));
-	},
-	removed(_id) {
-		const inquiry = LivechatInquiry.trashFindOneById(_id);
-		if (inquiry && inquiry.department) {
-			return emitEvent(`${ LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER }/${ inquiry.department }`, mountDataToEmit('removed', { _id }));
-		}
-		emitEvent(LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER, mountDataToEmit('removed', { _id }));
-	},
+LivechatInquiry.on('change', ({ clientAction, id: _id, data: record }) => {
+	switch (clientAction) {
+		case 'inserted':
+			emitQueueDataEvent(_id, { ...record, clientAction });
+			if (record && record.department) {
+				return emitQueueDataEvent(`department/${ record.department }`, mountDataToEmit('added', record));
+			}
+			emitQueueDataEvent('public', mountDataToEmit('added', record));
+			break;
+		case 'updated':
+			const isUpdatingDepartment = record && record.department;
+			const updatedRecord = LivechatInquiry.findOneById(_id);
+			emitQueueDataEvent(_id, { ...updatedRecord, clientAction });
+			if (updatedRecord && !updatedRecord.department) {
+				return emitQueueDataEvent('public', mountDataToEmit('changed', updatedRecord));
+			}
+			if (isUpdatingDepartment) {
+				emitQueueDataEvent('public', mountDataToEmit('changed', updatedRecord));
+			}
+			emitQueueDataEvent(`department/${ updatedRecord.department }`, mountDataToEmit('changed', updatedRecord));
+			break;
+
+		case 'removed':
+			const removedRecord = LivechatInquiry.trashFindOneById(_id);
+			emitQueueDataEvent(_id, { _id, clientAction });
+			if (removedRecord && removedRecord.department) {
+				return emitQueueDataEvent(`department/${ removedRecord.department }`, mountDataToEmit('removed', { _id }));
+			}
+			emitQueueDataEvent('public', mountDataToEmit('removed', { _id }));
+			break;
+	}
 });

From 972277df8d6b82c3f9912620fe032a9c3cb95e71 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Wed, 25 Mar 2020 11:33:07 -0300
Subject: [PATCH 071/223] Bump version to 3.0.6

---
 .docker/Dockerfile.rhel   |  2 +-
 .github/history.json      | 30 ++++++++++++++++++++++++++++++
 HISTORY.md                | 23 +++++++++++++++++++++++
 app/utils/rocketchat.info |  2 +-
 package.json              |  2 +-
 5 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index dcad419af158..763a2c8f764c 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.0.5
+ENV RC_VERSION 3.0.6
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index c630065ab111..26e1a6902ba6 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -40017,6 +40017,36 @@
           ]
         }
       ]
+    },
+    "3.0.6": {
+      "node_version": "12.14.0",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "16999",
+          "title": "Regression: Replace the Omnichannel queue model observe with Stream",
+          "userLogin": "renatobecker",
+          "milestone": "3.1.0",
+          "contributors": [
+            "renatobecker"
+          ]
+        },
+        {
+          "pr": "16787",
+          "title": "[FIX]  Keeps the agent in the room after accepting a new Omnichannel request",
+          "userLogin": "renatobecker",
+          "milestone": "3.1.0",
+          "contributors": [
+            "renatobecker",
+            "web-flow"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/HISTORY.md b/HISTORY.md
index 3e5e2c562365..30e23dfddb68 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,27 @@
 
+# 3.0.6
+`2020-03-25  ·  1 🐛  ·  1 🔍  ·  1 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `12.14.0`
+- NPM: `6.13.4`
+- MongoDB: `3.4, 3.6, 4.0`
+
+### 🐛 Bug fixes
+
+- Keeps the agent in the room after accepting a new Omnichannel request ([#16787](https://github.com/RocketChat/Rocket.Chat/pull/16787))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+- Regression: Replace the Omnichannel queue model observe with Stream ([#16999](https://github.com/RocketChat/Rocket.Chat/pull/16999))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@renatobecker](https://github.com/renatobecker)
+
 # 3.0.5
 `2020-03-24  ·  1 🐛  ·  1 👩‍💻👨‍💻`
 
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index 67213e864fd0..e0039c670d9c 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.0.5"
+	"version": "3.0.6"
 }
diff --git a/package.json b/package.json
index ccfed4889e8f..e986faf06086 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.0.5",
+	"version": "3.0.6",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

From e16ef75be10489721b93db9b549185301ff30277 Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Wed, 25 Mar 2020 19:26:46 -0300
Subject: [PATCH 072/223] Regression: Remove deprecated Omnichannel setting
 used to fetch the queue data through subscription  (#17017)

* Removed deprecated omnichannel setting,

* Remove unnecessary setting creation.

* Add method to clear the inquiry collection on client-side before set up the stream.
---
 .../client/collections/LivechatInquiry.js       | 10 +---------
 app/livechat/client/lib/stream/queueManager.js  | 17 +++++++++--------
 app/livechat/client/views/sideNav/livechat.js   | 11 ++++-------
 app/livechat/lib/LivechatRoomType.js            |  8 ++++----
 app/livechat/server/config.js                   |  9 ---------
 server/startup/migrations/index.js              |  1 +
 server/startup/migrations/v178.js               | 14 ++++++++++++++
 7 files changed, 33 insertions(+), 37 deletions(-)
 create mode 100644 server/startup/migrations/v178.js

diff --git a/app/livechat/client/collections/LivechatInquiry.js b/app/livechat/client/collections/LivechatInquiry.js
index 2b1bd51bbf2a..c43a9cb31ca5 100644
--- a/app/livechat/client/collections/LivechatInquiry.js
+++ b/app/livechat/client/collections/LivechatInquiry.js
@@ -1,11 +1,3 @@
 import { Mongo } from 'meteor/mongo';
 
-import { settings } from '../../../settings/client';
-
-let collection;
-export const getLivechatInquiryCollection = () => {
-	if (!collection) {
-		collection = new Mongo.Collection(settings.get('Livechat_enable_inquiry_fetch_by_stream') ? null : 'rocketchat_livechat_inquiry');
-	}
-	return collection;
-};
+export const LivechatInquiry = new Mongo.Collection(null);
diff --git a/app/livechat/client/lib/stream/queueManager.js b/app/livechat/client/lib/stream/queueManager.js
index 497a961c55f7..efe6727d2756 100644
--- a/app/livechat/client/lib/stream/queueManager.js
+++ b/app/livechat/client/lib/stream/queueManager.js
@@ -1,24 +1,23 @@
 import { APIClient } from '../../../../utils/client';
-import { getLivechatInquiryCollection } from '../../collections/LivechatInquiry';
+import { LivechatInquiry } from '../../collections/LivechatInquiry';
 import { inquiryDataStream } from './inquiry';
 import { hasRole } from '../../../../authorization/client';
 
 let agentDepartments = [];
-const collection = getLivechatInquiryCollection();
 
 const events = {
 	added: (inquiry) => {
 		delete inquiry.type;
-		collection.insert(inquiry);
+		LivechatInquiry.insert(inquiry);
 	},
 	changed: (inquiry) => {
 		if (inquiry.status !== 'queued' || (inquiry.department && !agentDepartments.includes(inquiry.department))) {
-			return collection.remove(inquiry._id);
+			return LivechatInquiry.remove(inquiry._id);
 		}
 		delete inquiry.type;
-		collection.upsert({ _id: inquiry._id }, inquiry);
+		LivechatInquiry.upsert({ _id: inquiry._id }, inquiry);
 	},
-	removed: (inquiry) => collection.remove(inquiry._id),
+	removed: (inquiry) => LivechatInquiry.remove(inquiry._id),
 };
 
 const updateCollection = (inquiry) => { events[inquiry.type](inquiry); };
@@ -31,7 +30,7 @@ const getInquiriesFromAPI = async (url) => {
 };
 
 const updateInquiries = async (inquiries) => {
-	(inquiries || []).forEach((inquiry) => collection.upsert({ _id: inquiry._id }, inquiry));
+	(inquiries || []).forEach((inquiry) => LivechatInquiry.upsert({ _id: inquiry._id }, inquiry));
 };
 
 const getAgentsDepartments = async (userId) => {
@@ -54,12 +53,14 @@ const removeGlobalListener = () => {
 };
 
 export const initializeLivechatInquiryStream = async (userId) => {
-	collection.remove({});
+	LivechatInquiry.remove({});
+
 	if (agentDepartments.length) {
 		removeDepartmentsListeners(agentDepartments);
 	}
 	removeGlobalListener();
 	await updateInquiries(await getInquiriesFromAPI('livechat/inquiries.queued?sort={"ts": 1}'));
+
 	agentDepartments = (await getAgentsDepartments(userId)).map((department) => department.departmentId);
 	await addListenerForeachDepartment(userId, agentDepartments);
 	if (agentDepartments.length === 0 || hasRole(userId, 'livechat-manager')) {
diff --git a/app/livechat/client/views/sideNav/livechat.js b/app/livechat/client/views/sideNav/livechat.js
index d3faba2b3092..cf53b5726636 100644
--- a/app/livechat/client/views/sideNav/livechat.js
+++ b/app/livechat/client/views/sideNav/livechat.js
@@ -9,7 +9,7 @@ import { KonchatNotification } from '../../../../ui';
 import { settings } from '../../../../settings';
 import { hasPermission } from '../../../../authorization';
 import { t, handleError, getUserPreference } from '../../../../utils';
-import { getLivechatInquiryCollection } from '../../collections/LivechatInquiry';
+import { LivechatInquiry } from '../../collections/LivechatInquiry';
 import { Notifications } from '../../../../notifications/client';
 import { initializeLivechatInquiryStream } from '../../lib/stream/queueManager';
 
@@ -50,7 +50,7 @@ Template.livechat.helpers({
 	},
 
 	inquiries() {
-		const inqs = getLivechatInquiryCollection().find({
+		const inqs = LivechatInquiry.find({
 			status: 'queued',
 		}, {
 			sort: {
@@ -131,11 +131,8 @@ Template.livechat.onCreated(function() {
 			this.statusLivechat.set();
 		}
 	});
-	if (!settings.get('Livechat_enable_inquiry_fetch_by_stream')) {
-		this.subscribe('livechat:inquiry');
-	} else {
-		initializeLivechatInquiryStream(Meteor.userId());
-	}
+
+	initializeLivechatInquiryStream(Meteor.userId());
 	this.updateAgentDepartments = () => initializeLivechatInquiryStream(Meteor.userId());
 	this.autorun(() => this.inquiriesLimit.set(settings.get('Livechat_guest_pool_max_number_incoming_livechats_displayed')));
 
diff --git a/app/livechat/lib/LivechatRoomType.js b/app/livechat/lib/LivechatRoomType.js
index 4feaa0d61d23..19dccc3201e9 100644
--- a/app/livechat/lib/LivechatRoomType.js
+++ b/app/livechat/lib/LivechatRoomType.js
@@ -8,9 +8,9 @@ import { openRoom } from '../../ui-utils';
 import { RoomSettingsEnum, UiTextContext, RoomTypeRouteConfig, RoomTypeConfig } from '../../utils';
 import { getAvatarURL } from '../../utils/lib/getAvatarURL';
 
-let getLivechatInquiryCollection;
+let LivechatInquiry;
 if (Meteor.isClient) {
-	({ getLivechatInquiryCollection } = require('../client/collections/LivechatInquiry'));
+	({ LivechatInquiry } = require('../client/collections/LivechatInquiry'));
 }
 
 class LivechatRoomRoute extends RoomTypeRouteConfig {
@@ -72,7 +72,7 @@ export default class LivechatRoomType extends RoomTypeConfig {
 		if (room) {
 			return room.v && room.v.status;
 		}
-		const inquiry = getLivechatInquiryCollection().findOne({ rid });
+		const inquiry = LivechatInquiry.findOne({ rid });
 		return inquiry && inquiry.v && inquiry.v.status;
 	}
 
@@ -102,7 +102,7 @@ export default class LivechatRoomType extends RoomTypeConfig {
 			return true;
 		}
 
-		const inquiry = getLivechatInquiryCollection().findOne({ rid }, { fields: { status: 1 } });
+		const inquiry = LivechatInquiry.findOne({ rid }, { fields: { status: 1 } });
 		if (inquiry && inquiry.status === 'queued') {
 			return true;
 		}
diff --git a/app/livechat/server/config.js b/app/livechat/server/config.js
index c9bec96c0eb8..4af508e8c01a 100644
--- a/app/livechat/server/config.js
+++ b/app/livechat/server/config.js
@@ -526,13 +526,4 @@ Meteor.startup(function() {
 		i18nLabel: 'How_long_to_wait_to_consider_visitor_abandonment',
 		i18nDescription: 'Time_in_seconds',
 	});
-
-	settings.add('Livechat_enable_inquiry_fetch_by_stream', true, {
-		type: 'boolean',
-		group: 'Omnichannel',
-		section: 'Routing',
-		public: true,
-		i18nLabel: 'Enable_inquiry_fetch_by_stream',
-		enableQuery: { _id: 'Livechat_Routing_Method', value: 'Manual_Selection' },
-	});
 });
diff --git a/server/startup/migrations/index.js b/server/startup/migrations/index.js
index 1dd59ebbd7cc..ecc2aa96f5ee 100644
--- a/server/startup/migrations/index.js
+++ b/server/startup/migrations/index.js
@@ -175,4 +175,5 @@ import './v174';
 import './v175';
 import './v176';
 import './v177';
+import './v178';
 import './xrun';
diff --git a/server/startup/migrations/v178.js b/server/startup/migrations/v178.js
new file mode 100644
index 000000000000..77a38e3eb50d
--- /dev/null
+++ b/server/startup/migrations/v178.js
@@ -0,0 +1,14 @@
+import {
+	Migrations,
+} from '../../../app/migrations';
+import {
+	Settings,
+} from '../../../app/models';
+
+
+Migrations.add({
+	version: 178,
+	up() {
+		Settings.remove({ _id: 'Livechat_enable_inquiry_fetch_by_stream' });
+	},
+});

From dfa8fd3c9b0933bc875b44b53b43f70f45731fac Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Wed, 25 Mar 2020 19:26:46 -0300
Subject: [PATCH 073/223] Regression: Remove deprecated Omnichannel setting
 used to fetch the queue data through subscription  (#17017)

* Removed deprecated omnichannel setting,

* Remove unnecessary setting creation.

* Add method to clear the inquiry collection on client-side before set up the stream.
---
 .../client/collections/LivechatInquiry.js       | 10 +---------
 app/livechat/client/lib/stream/queueManager.js  | 17 +++++++++--------
 app/livechat/client/views/sideNav/livechat.js   | 11 ++++-------
 app/livechat/lib/LivechatRoomType.js            |  8 ++++----
 app/livechat/server/config.js                   |  9 ---------
 server/startup/migrations/v178.js               | 14 ++++++++++++++
 6 files changed, 32 insertions(+), 37 deletions(-)
 create mode 100644 server/startup/migrations/v178.js

diff --git a/app/livechat/client/collections/LivechatInquiry.js b/app/livechat/client/collections/LivechatInquiry.js
index 2b1bd51bbf2a..c43a9cb31ca5 100644
--- a/app/livechat/client/collections/LivechatInquiry.js
+++ b/app/livechat/client/collections/LivechatInquiry.js
@@ -1,11 +1,3 @@
 import { Mongo } from 'meteor/mongo';
 
-import { settings } from '../../../settings/client';
-
-let collection;
-export const getLivechatInquiryCollection = () => {
-	if (!collection) {
-		collection = new Mongo.Collection(settings.get('Livechat_enable_inquiry_fetch_by_stream') ? null : 'rocketchat_livechat_inquiry');
-	}
-	return collection;
-};
+export const LivechatInquiry = new Mongo.Collection(null);
diff --git a/app/livechat/client/lib/stream/queueManager.js b/app/livechat/client/lib/stream/queueManager.js
index 497a961c55f7..efe6727d2756 100644
--- a/app/livechat/client/lib/stream/queueManager.js
+++ b/app/livechat/client/lib/stream/queueManager.js
@@ -1,24 +1,23 @@
 import { APIClient } from '../../../../utils/client';
-import { getLivechatInquiryCollection } from '../../collections/LivechatInquiry';
+import { LivechatInquiry } from '../../collections/LivechatInquiry';
 import { inquiryDataStream } from './inquiry';
 import { hasRole } from '../../../../authorization/client';
 
 let agentDepartments = [];
-const collection = getLivechatInquiryCollection();
 
 const events = {
 	added: (inquiry) => {
 		delete inquiry.type;
-		collection.insert(inquiry);
+		LivechatInquiry.insert(inquiry);
 	},
 	changed: (inquiry) => {
 		if (inquiry.status !== 'queued' || (inquiry.department && !agentDepartments.includes(inquiry.department))) {
-			return collection.remove(inquiry._id);
+			return LivechatInquiry.remove(inquiry._id);
 		}
 		delete inquiry.type;
-		collection.upsert({ _id: inquiry._id }, inquiry);
+		LivechatInquiry.upsert({ _id: inquiry._id }, inquiry);
 	},
-	removed: (inquiry) => collection.remove(inquiry._id),
+	removed: (inquiry) => LivechatInquiry.remove(inquiry._id),
 };
 
 const updateCollection = (inquiry) => { events[inquiry.type](inquiry); };
@@ -31,7 +30,7 @@ const getInquiriesFromAPI = async (url) => {
 };
 
 const updateInquiries = async (inquiries) => {
-	(inquiries || []).forEach((inquiry) => collection.upsert({ _id: inquiry._id }, inquiry));
+	(inquiries || []).forEach((inquiry) => LivechatInquiry.upsert({ _id: inquiry._id }, inquiry));
 };
 
 const getAgentsDepartments = async (userId) => {
@@ -54,12 +53,14 @@ const removeGlobalListener = () => {
 };
 
 export const initializeLivechatInquiryStream = async (userId) => {
-	collection.remove({});
+	LivechatInquiry.remove({});
+
 	if (agentDepartments.length) {
 		removeDepartmentsListeners(agentDepartments);
 	}
 	removeGlobalListener();
 	await updateInquiries(await getInquiriesFromAPI('livechat/inquiries.queued?sort={"ts": 1}'));
+
 	agentDepartments = (await getAgentsDepartments(userId)).map((department) => department.departmentId);
 	await addListenerForeachDepartment(userId, agentDepartments);
 	if (agentDepartments.length === 0 || hasRole(userId, 'livechat-manager')) {
diff --git a/app/livechat/client/views/sideNav/livechat.js b/app/livechat/client/views/sideNav/livechat.js
index d3faba2b3092..cf53b5726636 100644
--- a/app/livechat/client/views/sideNav/livechat.js
+++ b/app/livechat/client/views/sideNav/livechat.js
@@ -9,7 +9,7 @@ import { KonchatNotification } from '../../../../ui';
 import { settings } from '../../../../settings';
 import { hasPermission } from '../../../../authorization';
 import { t, handleError, getUserPreference } from '../../../../utils';
-import { getLivechatInquiryCollection } from '../../collections/LivechatInquiry';
+import { LivechatInquiry } from '../../collections/LivechatInquiry';
 import { Notifications } from '../../../../notifications/client';
 import { initializeLivechatInquiryStream } from '../../lib/stream/queueManager';
 
@@ -50,7 +50,7 @@ Template.livechat.helpers({
 	},
 
 	inquiries() {
-		const inqs = getLivechatInquiryCollection().find({
+		const inqs = LivechatInquiry.find({
 			status: 'queued',
 		}, {
 			sort: {
@@ -131,11 +131,8 @@ Template.livechat.onCreated(function() {
 			this.statusLivechat.set();
 		}
 	});
-	if (!settings.get('Livechat_enable_inquiry_fetch_by_stream')) {
-		this.subscribe('livechat:inquiry');
-	} else {
-		initializeLivechatInquiryStream(Meteor.userId());
-	}
+
+	initializeLivechatInquiryStream(Meteor.userId());
 	this.updateAgentDepartments = () => initializeLivechatInquiryStream(Meteor.userId());
 	this.autorun(() => this.inquiriesLimit.set(settings.get('Livechat_guest_pool_max_number_incoming_livechats_displayed')));
 
diff --git a/app/livechat/lib/LivechatRoomType.js b/app/livechat/lib/LivechatRoomType.js
index c6824041b396..8e6c498cfbd5 100644
--- a/app/livechat/lib/LivechatRoomType.js
+++ b/app/livechat/lib/LivechatRoomType.js
@@ -8,9 +8,9 @@ import { openRoom } from '../../ui-utils';
 import { RoomSettingsEnum, UiTextContext, RoomTypeRouteConfig, RoomTypeConfig } from '../../utils';
 import { getAvatarURL } from '../../utils/lib/getAvatarURL';
 
-let getLivechatInquiryCollection;
+let LivechatInquiry;
 if (Meteor.isClient) {
-	({ getLivechatInquiryCollection } = require('../client/collections/LivechatInquiry'));
+	({ LivechatInquiry } = require('../client/collections/LivechatInquiry'));
 }
 
 class LivechatRoomRoute extends RoomTypeRouteConfig {
@@ -68,7 +68,7 @@ export default class LivechatRoomType extends RoomTypeConfig {
 		if (room) {
 			return room.v && room.v.status;
 		}
-		const inquiry = getLivechatInquiryCollection().findOne({ rid });
+		const inquiry = LivechatInquiry.findOne({ rid });
 		return inquiry && inquiry.v && inquiry.v.status;
 	}
 
@@ -98,7 +98,7 @@ export default class LivechatRoomType extends RoomTypeConfig {
 			return true;
 		}
 
-		const inquiry = getLivechatInquiryCollection().findOne({ rid }, { fields: { status: 1 } });
+		const inquiry = LivechatInquiry.findOne({ rid }, { fields: { status: 1 } });
 		if (inquiry && inquiry.status === 'queued') {
 			return true;
 		}
diff --git a/app/livechat/server/config.js b/app/livechat/server/config.js
index 5ab52d806fe6..3df2482685dc 100644
--- a/app/livechat/server/config.js
+++ b/app/livechat/server/config.js
@@ -487,13 +487,4 @@ Meteor.startup(function() {
 		i18nLabel: 'How_long_to_wait_to_consider_visitor_abandonment',
 		i18nDescription: 'Time_in_seconds',
 	});
-
-	settings.add('Livechat_enable_inquiry_fetch_by_stream', true, {
-		type: 'boolean',
-		group: 'Livechat',
-		section: 'Routing',
-		public: true,
-		i18nLabel: 'Enable_inquiry_fetch_by_stream',
-		enableQuery: { _id: 'Livechat_Routing_Method', value: 'Manual_Selection' },
-	});
 });
diff --git a/server/startup/migrations/v178.js b/server/startup/migrations/v178.js
new file mode 100644
index 000000000000..77a38e3eb50d
--- /dev/null
+++ b/server/startup/migrations/v178.js
@@ -0,0 +1,14 @@
+import {
+	Migrations,
+} from '../../../app/migrations';
+import {
+	Settings,
+} from '../../../app/models';
+
+
+Migrations.add({
+	version: 178,
+	up() {
+		Settings.remove({ _id: 'Livechat_enable_inquiry_fetch_by_stream' });
+	},
+});

From 5e4bd0739af1ac10f0d86a14db655fe33af2f090 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Wed, 25 Mar 2020 19:43:41 -0300
Subject: [PATCH 074/223] Bump version to 3.0.7

---
 .docker/Dockerfile.rhel   |  2 +-
 .github/history.json      | 20 ++++++++++++++++++++
 HISTORY.md                | 19 +++++++++++++++++++
 app/utils/rocketchat.info |  2 +-
 package.json              |  2 +-
 5 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 763a2c8f764c..6da776c4700f 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.0.6
+ENV RC_VERSION 3.0.7
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index 26e1a6902ba6..8352e9effef3 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -40047,6 +40047,26 @@
           ]
         }
       ]
+    },
+    "3.0.7": {
+      "node_version": "12.14.0",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "17017",
+          "title": "Regression: Remove deprecated Omnichannel setting used to fetch the queue data through subscription ",
+          "userLogin": "renatobecker",
+          "milestone": "3.1.0",
+          "contributors": [
+            "renatobecker"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/HISTORY.md b/HISTORY.md
index 30e23dfddb68..e5eea1c8a5c0 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,23 @@
 
+# 3.0.7
+`2020-03-25  ·  1 🔍  ·  1 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `12.14.0`
+- NPM: `6.13.4`
+- MongoDB: `3.4, 3.6, 4.0`
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+- Regression: Remove deprecated Omnichannel setting used to fetch the queue data through subscription  ([#17017](https://github.com/RocketChat/Rocket.Chat/pull/17017))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@renatobecker](https://github.com/renatobecker)
+
 # 3.0.6
 `2020-03-25  ·  1 🐛  ·  1 🔍  ·  1 👩‍💻👨‍💻`
 
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index e0039c670d9c..824c3e9bcca4 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.0.6"
+	"version": "3.0.7"
 }
diff --git a/package.json b/package.json
index e986faf06086..6363e22d4376 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.0.6",
+	"version": "3.0.7",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

From 3e1fdbd4727bf389d2c6c8bbd665d5bbe8c3cb24 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Thu, 26 Mar 2020 00:24:52 -0300
Subject: [PATCH 075/223] [NEW] Direct message between multiple users (#16761)

Co-authored-by: gnidorah <gnidorah@users.noreply.github.com>
Co-authored-by: Dumitru Zavrotschi <11751017+zdumitru@users.noreply.github.com>
Co-authored-by: Sebastien Legare <slegare@gmail.com>
Co-authored-by: Diego Sampaio <chinello@gmail.com>
---
 app/apps/server/bridges/rooms.js              |   5 +-
 app/apps/server/converters/rooms.js           |   2 +
 .../server/hooks/afterCreateDirectRoom.js     |  33 +-
 app/integrations/server/lib/triggerHandler.js |  40 +--
 app/lib/client/defaultTabBars.js              |  26 ++
 app/lib/lib/roomTypes/direct.js               |  32 +-
 app/lib/server/functions/createDirectRoom.js  | 130 ++++----
 app/lib/server/functions/createRoom.js        |   9 +-
 app/lib/server/functions/deleteUser.js        |  24 +-
 app/lib/server/functions/saveUser.js          |  17 +-
 app/lib/server/functions/saveUserIdentity.js  |  68 ++++
 app/lib/server/functions/setRealName.js       |  11 +-
 app/lib/server/functions/setUsername.js       |  28 +-
 .../server/functions/updateGroupDMsName.js    |  40 +++
 app/lib/server/methods/setUsername.js         |   5 +-
 app/lib/server/startup/settings.js            |   4 +
 app/models/server/models/Rooms.js             |  62 +++-
 app/models/server/models/Subscriptions.js     |  31 +-
 app/notifications/server/lib/Notifications.js |   3 +
 app/otr/client/rocketchat.otr.room.js         |   3 +-
 app/otr/client/views/otrFlexTab.js            |   3 +-
 app/ui-flextab/client/tabs/membersList.js     |   6 +-
 app/ui-flextab/client/tabs/userActions.js     |   2 +-
 app/ui-master/public/icons/group.svg          |   6 +
 app/ui-sidenav/client/chatRoomItem.js         |   8 +-
 app/ui-sidenav/client/sidebarHeader.js        |  69 ++--
 app/ui-sidenav/client/sidebarItem.js          |   5 +-
 app/ui-utils/client/lib/callMethod.js         |   9 +
 .../client/lib/getUidDirectMessage.js         |  15 +
 app/ui-utils/client/lib/openRoom.js           | 128 +++----
 .../client/components/header/headerRoom.html  |   4 +-
 app/ui/client/components/header/headerRoom.js |  17 +-
 app/ui/client/index.js                        |   2 +
 app/ui/client/lib/notification.js             |   2 +-
 .../client/views/app/CreateDirectMessage.html |  31 ++
 .../client/views/app/CreateDirectMessage.js   | 105 ++++++
 app/ui/client/views/app/RoomForeword.html     |   3 +
 app/ui/client/views/app/RoomForeword.js       |  73 ++++
 app/ui/client/views/app/createChannel.js      |   3 +-
 app/ui/client/views/app/room.html             |   3 +-
 app/ui/client/views/app/room.js               |  32 +-
 .../server/cronProcessDownloads.js            |   2 +-
 app/utils/lib/RoomTypesCommon.js              |   1 +
 package-lock.json                             | 313 ++++++++----------
 package.json                                  |  12 +-
 packages/rocketchat-i18n/i18n/en.i18n.json    |   2 +
 private/public/icons.svg                      |   2 +-
 public/public/icons.html                      |   8 +-
 server/methods/createDirectMessage.js         |  38 +--
 server/methods/saveUserProfile.js             |  45 +--
 server/publications/room/index.js             |   6 +-
 server/startup/migrations/index.js            |   1 +
 server/startup/migrations/v179.js             |  87 +++++
 53 files changed, 1098 insertions(+), 518 deletions(-)
 create mode 100644 app/lib/server/functions/saveUserIdentity.js
 create mode 100644 app/lib/server/functions/updateGroupDMsName.js
 create mode 100644 app/ui-master/public/icons/group.svg
 create mode 100644 app/ui-utils/client/lib/getUidDirectMessage.js
 create mode 100644 app/ui/client/views/app/CreateDirectMessage.html
 create mode 100755 app/ui/client/views/app/CreateDirectMessage.js
 create mode 100644 app/ui/client/views/app/RoomForeword.html
 create mode 100644 app/ui/client/views/app/RoomForeword.js
 create mode 100644 server/startup/migrations/v179.js

diff --git a/app/apps/server/bridges/rooms.js b/app/apps/server/bridges/rooms.js
index 250f25aa22c3..d8bc4e76d4ac 100644
--- a/app/apps/server/bridges/rooms.js
+++ b/app/apps/server/bridges/rooms.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { RoomType } from '@rocket.chat/apps-engine/definition/rooms';
 
-import { Rooms, Subscriptions, Users } from '../../../models';
+import { Rooms, Subscriptions, Users } from '../../../models/server';
 import { addUserToRoom } from '../../../lib/server/functions/addUserToRoom';
 
 export class AppRoomBridge {
@@ -38,8 +38,7 @@ export class AppRoomBridge {
 			delete extraData.customFields;
 			let info;
 			if (room.type === RoomType.DIRECT_MESSAGE) {
-				members.splice(members.indexOf(room.creator.username), 1);
-				info = Meteor.call(method, members[0]);
+				info = Meteor.call(method, ...members);
 			} else {
 				info = Meteor.call(method, rcRoom.name, members, rcRoom.ro, rcRoom.customFields, extraData);
 			}
diff --git a/app/apps/server/converters/rooms.js b/app/apps/server/converters/rooms.js
index d39050d7d0e3..a511f471d256 100644
--- a/app/apps/server/converters/rooms.js
+++ b/app/apps/server/converters/rooms.js
@@ -79,6 +79,7 @@ export class AppRoomsConverter {
 			servedBy,
 			closedBy,
 			members: room.members,
+			uids: room.userIds,
 			default: typeof room.isDefault === 'undefined' ? false : room.isDefault,
 			ro: typeof room.isReadOnly === 'undefined' ? false : room.isReadOnly,
 			sysMes: typeof room.displaySystemMessages === 'undefined' ? true : room.displaySystemMessages,
@@ -105,6 +106,7 @@ export class AppRoomsConverter {
 			displayName: 'fname',
 			slugifiedName: 'name',
 			members: 'members',
+			userIds: 'uids',
 			messageCount: 'msgs',
 			createdAt: 'ts',
 			updatedAt: '_updatedAt',
diff --git a/app/federation/server/hooks/afterCreateDirectRoom.js b/app/federation/server/hooks/afterCreateDirectRoom.js
index 1c792b280f7d..a0048fcb24a6 100644
--- a/app/federation/server/hooks/afterCreateDirectRoom.js
+++ b/app/federation/server/hooks/afterCreateDirectRoom.js
@@ -29,36 +29,19 @@ async function afterCreateDirectRoom(room, extras) {
 		// Ensure a genesis event for this room
 		const genesisEvent = await FederationRoomEvents.createGenesisEvent(getFederationDomain(), normalizedRoom);
 
-		//
-		// Source User
-		//
-
-		// Add the source user to the room
-		const sourceUser = extras.from;
-		const normalizedSourceUser = normalizers.normalizeUser(sourceUser);
-
-		const sourceSubscription = Subscriptions.findOne({ rid: normalizedRoom._id, 'u._id': normalizedSourceUser._id });
-		const normalizedSourceSubscription = normalizers.normalizeSubscription(sourceSubscription);
-
-		// Build the source user event
-		const sourceUserEvent = await FederationRoomEvents.createAddUserEvent(getFederationDomain(), normalizedRoom._id, normalizedSourceUser, normalizedSourceSubscription);
-
-		//
-		// Target User
-		//
 
-		// Add the target user to the room
-		const targetUser = extras.to;
-		const normalizedTargetUser = normalizers.normalizeUser(targetUser);
+		const events = await Promise.all(extras.members.map((member) => {
+			const normalizedMember = normalizers.normalizeUser(member);
 
-		const targetSubscription = Subscriptions.findOne({ rid: normalizedRoom._id, 'u._id': normalizedTargetUser._id });
-		const normalizedTargetSubscription = normalizers.normalizeSubscription(targetSubscription);
+			const sourceSubscription = Subscriptions.findOne({ rid: normalizedRoom._id, 'u._id': normalizedMember._id });
+			const normalizedSourceSubscription = normalizers.normalizeSubscription(sourceSubscription);
 
-		// Dispatch the target user event
-		const targetUserEvent = await FederationRoomEvents.createAddUserEvent(getFederationDomain(), normalizedRoom._id, normalizedTargetUser, normalizedTargetSubscription);
+			// Build the user event
+			return FederationRoomEvents.createAddUserEvent(getFederationDomain(), normalizedRoom._id, normalizedMember, normalizedSourceSubscription);
+		}));
 
 		// Dispatch the events
-		dispatchEvents(normalizedRoom.federation.domains, [genesisEvent, sourceUserEvent, targetUserEvent]);
+		dispatchEvents(normalizedRoom.federation.domains, [genesisEvent, ...events]);
 	} catch (err) {
 		await deleteRoom(room._id);
 
diff --git a/app/integrations/server/lib/triggerHandler.js b/app/integrations/server/lib/triggerHandler.js
index 04c4227fa023..eca745531fa4 100644
--- a/app/integrations/server/lib/triggerHandler.js
+++ b/app/integrations/server/lib/triggerHandler.js
@@ -492,48 +492,44 @@ integrations.triggerHandler = new class RocketChatIntegrationHandler {
 	}
 
 	getTriggersToExecute(room, message) {
-		const triggersToExecute = [];
+		const triggersToExecute = new Set();
 		if (room) {
 			switch (room.t) {
 				case 'd':
-					const id = room._id.replace(message.u._id, '');
-					const username = _.without(room.usernames, message.u.username)[0];
-
-					if (this.triggers[`@${ id }`]) {
-						for (const trigger of Object.values(this.triggers[`@${ id }`])) {
-							triggersToExecute.push(trigger);
-						}
-					}
-
 					if (this.triggers.all_direct_messages) {
 						for (const trigger of Object.values(this.triggers.all_direct_messages)) {
-							triggersToExecute.push(trigger);
+							triggersToExecute.add(trigger);
 						}
 					}
 
-					if (id !== username && this.triggers[`@${ username }`]) {
+					room.uids.filter((uid) => this.triggers[`@${ uid }`]).forEach((uid) => {
+						for (const trigger of Object.values(this.triggers[`@${ uid }`])) {
+							triggersToExecute.add(trigger);
+						}
+					});
+
+					room.usernames.filter((username) => username !== message.u.username && this.triggers[`@${ username }`]).forEach((username) => {
 						for (const trigger of Object.values(this.triggers[`@${ username }`])) {
-							triggersToExecute.push(trigger);
+							triggersToExecute.add(trigger);
 						}
-					}
+					});
 					break;
-
 				case 'c':
 					if (this.triggers.all_public_channels) {
 						for (const trigger of Object.values(this.triggers.all_public_channels)) {
-							triggersToExecute.push(trigger);
+							triggersToExecute.add(trigger);
 						}
 					}
 
 					if (this.triggers[`#${ room._id }`]) {
 						for (const trigger of Object.values(this.triggers[`#${ room._id }`])) {
-							triggersToExecute.push(trigger);
+							triggersToExecute.add(trigger);
 						}
 					}
 
 					if (room._id !== room.name && this.triggers[`#${ room.name }`]) {
 						for (const trigger of Object.values(this.triggers[`#${ room.name }`])) {
-							triggersToExecute.push(trigger);
+							triggersToExecute.add(trigger);
 						}
 					}
 					break;
@@ -541,25 +537,25 @@ integrations.triggerHandler = new class RocketChatIntegrationHandler {
 				default:
 					if (this.triggers.all_private_groups) {
 						for (const trigger of Object.values(this.triggers.all_private_groups)) {
-							triggersToExecute.push(trigger);
+							triggersToExecute.add(trigger);
 						}
 					}
 
 					if (this.triggers[`#${ room._id }`]) {
 						for (const trigger of Object.values(this.triggers[`#${ room._id }`])) {
-							triggersToExecute.push(trigger);
+							triggersToExecute.add(trigger);
 						}
 					}
 
 					if (room._id !== room.name && this.triggers[`#${ room.name }`]) {
 						for (const trigger of Object.values(this.triggers[`#${ room.name }`])) {
-							triggersToExecute.push(trigger);
+							triggersToExecute.add(trigger);
 						}
 					}
 					break;
 			}
 		}
-		return triggersToExecute;
+		return [...triggersToExecute];
 	}
 
 	executeTriggers(...args) {
diff --git a/app/lib/client/defaultTabBars.js b/app/lib/client/defaultTabBars.js
index 4ce7441e4c58..25938ee9db4c 100644
--- a/app/lib/client/defaultTabBars.js
+++ b/app/lib/client/defaultTabBars.js
@@ -3,6 +3,7 @@ import { Session } from 'meteor/session';
 import { TabBar } from '../../ui-utils';
 import { Rooms } from '../../models';
 import { hasAllPermission } from '../../authorization';
+import { roomTypes } from '../../utils/client';
 
 TabBar.addButton({
 	groups: ['channel', 'group', 'direct'],
@@ -20,6 +21,31 @@ TabBar.addButton({
 	icon: 'user',
 	template: 'membersList',
 	order: 2,
+	condition() {
+		const rid = Session.get('openedRoom');
+		const room = Rooms.findOne({
+			_id: rid,
+		});
+
+		return room && !roomTypes.getConfig(room.t).isGroupChat(room);
+	},
+});
+
+TabBar.addButton({
+	groups: ['direct'],
+	id: 'user-info-group',
+	i18nTitle: 'Members_List',
+	icon: 'team',
+	template: 'membersList',
+	order: 2,
+	condition() {
+		const rid = Session.get('openedRoom');
+		const room = Rooms.findOne({
+			_id: rid,
+		});
+
+		return room && roomTypes.getConfig(room.t).isGroupChat(room);
+	},
 });
 
 TabBar.addButton({
diff --git a/app/lib/lib/roomTypes/direct.js b/app/lib/lib/roomTypes/direct.js
index 42dd405c6fcf..b564d3e3e012 100644
--- a/app/lib/lib/roomTypes/direct.js
+++ b/app/lib/lib/roomTypes/direct.js
@@ -7,21 +7,22 @@ import { getUserPreference, RoomTypeConfig, RoomTypeRouteConfig, RoomSettingsEnu
 import { hasPermission, hasAtLeastOnePermission } from '../../../authorization';
 import { settings } from '../../../settings';
 import { getUserAvatarURL } from '../../../utils/lib/getUserAvatarURL';
+import { getAvatarURL } from '../../../utils/lib/getAvatarURL';
 
 export class DirectMessageRoomRoute extends RoomTypeRouteConfig {
 	constructor() {
 		super({
 			name: 'direct',
-			path: '/direct/:username',
+			path: '/direct/:rid',
 		});
 	}
 
 	action(params) {
-		return openRoom('d', params.username);
+		return openRoom('d', params.rid);
 	}
 
 	link(sub) {
-		return { username: sub.name };
+		return { rid: sub.rid || sub.name };
 	}
 }
 
@@ -36,6 +37,14 @@ export class DirectMessageRoomType extends RoomTypeConfig {
 		});
 	}
 
+
+	getIcon(roomData) {
+		if (this.isGroupChat(roomData)) {
+			return 'team';
+		}
+		return this.icon;
+	}
+
 	findRoom(identifier) {
 		if (!hasPermission('view-d-room')) {
 			return null;
@@ -43,7 +52,10 @@ export class DirectMessageRoomType extends RoomTypeConfig {
 
 		const query = {
 			t: 'd',
-			name: identifier,
+			$or: [
+				{ name: identifier },
+				{ rid: identifier },
+			],
 		};
 
 		const subscription = Subscriptions.findOne(query);
@@ -161,11 +173,19 @@ export class DirectMessageRoomType extends RoomTypeConfig {
 		return { title, text };
 	}
 
-	getAvatarPath(roomData) {
-		return getUserAvatarURL(roomData.name || this.roomName(roomData));
+	getAvatarPath(roomData, subData) {
+		if (roomData && this.isGroupChat(roomData)) {
+			return getAvatarURL({ username: roomData.uids.length + roomData.usernames.join() });
+		}
+		const sub = subData || Subscriptions.findOne({ rid: roomData._id }, { fields: { name: 1 } });
+		return getUserAvatarURL(sub.name || this.roomName(roomData));
 	}
 
 	includeInDashboard() {
 		return true;
 	}
+
+	isGroupChat(room) {
+		return room.uids && room.uids.length > 2;
+	}
 }
diff --git a/app/lib/server/functions/createDirectRoom.js b/app/lib/server/functions/createDirectRoom.js
index a209e841569b..ae1ee8b20c4c 100644
--- a/app/lib/server/functions/createDirectRoom.js
+++ b/app/lib/server/functions/createDirectRoom.js
@@ -1,83 +1,91 @@
 import { Rooms, Subscriptions } from '../../../models/server';
+import { settings } from '../../../settings/lib/settings';
 import { getDefaultSubscriptionPref } from '../../../utils/server';
 import { callbacks } from '../../../callbacks/server';
 
-export const createDirectRoom = function(source, target, extraData, options) {
-	const rid = [source._id, target._id].sort().join('');
+const generateSubscription = (fname, name, user, extra) => ({
+	alert: false,
+	unread: 0,
+	userMentions: 0,
+	groupMentions: 0,
+	...user.customFields && { customFields: user.customFields },
+	...getDefaultSubscriptionPref(user),
+	...extra,
+	t: 'd',
+	fname,
+	name,
+	u: {
+		_id: user._id,
+		username: user.username,
+	},
+});
 
-	const now = new Date();
+const getFname = (members) => members.map(({ name, username }) => name || username).join(', ');
+const getName = (members) => members.map(({ username }) => username).join(', ');
 
-	const roomUpsertResult = Rooms.upsert({ _id: rid }, {
-		$set: {
-			usernames: [source.username, target.username],
-		},
-		$setOnInsert: Object.assign({
-			t: 'd',
-			msgs: 0,
-			ts: now,
-			usersCount: 2,
-		}, extraData),
-	});
+export const createDirectRoom = function(members, roomExtraData = {}, options = {}) {
+	if (members.length > (settings.get('DirectMesssage_maxUsers') || 1)) {
+		throw new Error('error-direct-message-max-user-exceeded');
+	}
 
-	const targetNotificationPref = getDefaultSubscriptionPref(target);
+	const sortedMembers = members.sort((u1, u2) => (u1.name || u1.username).localeCompare(u2.name || u2.username));
 
-	Subscriptions.upsert({ rid, 'u._id': target._id }, {
-		$setOnInsert: Object.assign({
-			fname: source.name,
-			name: source.username,
-			t: 'd',
-			open: false,
-			alert: false,
-			unread: 0,
-			userMentions: 0,
-			groupMentions: 0,
-			customFields: target.customFields,
-			u: {
-				_id: target._id,
-				username: target.username,
-			},
-			ts: now,
-			...targetNotificationPref,
-		}, options.subscriptionExtra),
-	});
+	const usernames = sortedMembers.map(({ username }) => username);
+	const uids = members.map(({ _id }) => _id).sort();
+
+	// Deprecated: using users' _id to compose the room _id is deprecated
+	const room = uids.length <= 2
+		? Rooms.findById(uids.join(''), { fields: { _id: 1 } })
+		: Rooms.findDirectRoomContainingAllUserIDs(uids, { fields: { _id: 1 } });
 
-	const sourceNotificationPref = getDefaultSubscriptionPref(source);
+	const isNewRoom = !room;
 
-	Subscriptions.upsert({ rid, 'u._id': source._id }, {
-		$set: {
-			ls: now,
-			open: true,
-			...target.active === false && {
-				archived: true,
-			},
-		},
-		$setOnInsert: Object.assign({
-			fname: target.name,
-			name: target.username,
-			t: 'd',
-			alert: false,
-			unread: 0,
-			userMentions: 0,
-			groupMentions: 0,
-			customFields: source.customFields,
-			u: {
-				_id: source._id,
-				username: source.username,
-			},
-			ts: now,
-			...sourceNotificationPref,
-		}, options.subscriptionExtra),
+	const rid = room?._id || Rooms.insert({
+		...uids.length <= 2 && { _id: uids.join('') }, // Deprecated: using users' _id to compose the room _id is deprecated
+		t: 'd',
+		usernames,
+		usersCount: members.length,
+		msgs: 0,
+		ts: new Date(),
+		uids,
+		...roomExtraData,
 	});
 
+	if (members.length === 1) { // dm to yourself
+		Subscriptions.upsert({ rid, 'u._id': members[0]._id }, {
+			$set: { open: true },
+			$setOnInsert: generateSubscription(members[0].name || members[0].username, members[0].username, members[0], { ...options.subscriptionExtra }),
+		});
+	} else {
+		members.forEach((member) => {
+			const otherMembers = sortedMembers.filter(({ _id }) => _id !== member._id);
+
+			Subscriptions.upsert({ rid, 'u._id': member._id }, {
+				...options.creator === member._id && { $set: { open: true } },
+				$setOnInsert: generateSubscription(
+					getFname(otherMembers),
+					getName(otherMembers),
+					member,
+					{
+						...options.subscriptionExtra,
+						...options.creator !== member._id && { open: members.length > 2 },
+					},
+				),
+			});
+		});
+	}
+
 	// If the room is new, run a callback
-	if (roomUpsertResult.insertedId) {
+	if (isNewRoom) {
 		const insertedRoom = Rooms.findOneById(rid);
 
-		callbacks.run('afterCreateDirectRoom', insertedRoom, { from: source, to: target });
+		callbacks.run('afterCreateDirectRoom', insertedRoom, { members });
 	}
 
 	return {
 		_id: rid,
+		usernames,
 		t: 'd',
+		inserted: isNewRoom,
 	};
 };
diff --git a/app/lib/server/functions/createRoom.js b/app/lib/server/functions/createRoom.js
index e82cb8806fbb..9b43a9c16080 100644
--- a/app/lib/server/functions/createRoom.js
+++ b/app/lib/server/functions/createRoom.js
@@ -13,7 +13,7 @@ export const createRoom = function(type, name, owner, members = [], readOnly, ex
 	callbacks.run('beforeCreateRoom', { type, name, owner, members, readOnly, extraData, options });
 
 	if (type === 'd') {
-		return createDirectRoom(members[0], members[1], extraData, options);
+		return createDirectRoom(members, extraData, options);
 	}
 
 	name = s.trim(name);
@@ -25,6 +25,7 @@ export const createRoom = function(type, name, owner, members = [], readOnly, ex
 	}
 
 	owner = Users.findOneByUsernameIgnoringCase(owner, { fields: { username: 1 } });
+
 	if (!owner) {
 		throw new Meteor.Error('error-invalid-user', 'Invalid user', { function: 'RocketChat.createRoom' });
 	}
@@ -46,7 +47,7 @@ export const createRoom = function(type, name, owner, members = [], readOnly, ex
 		validRoomNameOptions.nameValidationRegex = options.nameValidationRegex;
 	}
 
-	let room = Object.assign({
+	let room = {
 		name: getValidRoomName(name, null, validRoomNameOptions),
 		fname: name,
 		t: type,
@@ -56,10 +57,10 @@ export const createRoom = function(type, name, owner, members = [], readOnly, ex
 			_id: owner._id,
 			username: owner.username,
 		},
-	}, extraData, {
+		...extraData,
 		ts: now,
 		ro: readOnly === true,
-	});
+	};
 
 	if (Apps && Apps.isLoaded()) {
 		const prevent = Promise.await(Apps.getBridges().getListenerBridge().roomEvent('IPreRoomCreatePrevent', room));
diff --git a/app/lib/server/functions/deleteUser.js b/app/lib/server/functions/deleteUser.js
index 4962c5522f06..f5b59b8c7e24 100644
--- a/app/lib/server/functions/deleteUser.js
+++ b/app/lib/server/functions/deleteUser.js
@@ -2,10 +2,11 @@ import { Meteor } from 'meteor/meteor';
 import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { FileUpload } from '../../../file-upload';
-import { Users, Subscriptions, Messages, Rooms, Integrations, FederationServers } from '../../../models';
-import { hasRole, getUsersInRole } from '../../../authorization';
-import { settings } from '../../../settings';
-import { Notifications } from '../../../notifications';
+import { Users, Subscriptions, Messages, Rooms, Integrations, FederationServers } from '../../../models/server';
+import { hasRole, getUsersInRole } from '../../../authorization/server';
+import { settings } from '../../../settings/server';
+import { Notifications } from '../../../notifications/server';
+import { updateGroupDMsName } from './updateGroupDMsName';
 
 export const deleteUser = function(userId) {
 	const user = Users.findOneById(userId, {
@@ -87,8 +88,8 @@ export const deleteUser = function(userId) {
 				roomData.subscribers = Subscriptions.findByRoomId(roomData.rid).count();
 			}
 
-			// Remove DMs and non-channel rooms with only 1 user (the one being deleted)
-			if (roomData.t === 'd' || (roomData.t !== 'c' && roomData.subscribers === 1)) {
+			// Remove non-channel rooms with only 1 user (the one being deleted)
+			if (roomData.t !== 'c' && roomData.subscribers === 1) {
 				Subscriptions.removeByRoomId(roomData.rid);
 				FileUpload.removeFilesByRoomId(roomData.rid);
 				Messages.removeByRoomId(roomData.rid);
@@ -96,9 +97,12 @@ export const deleteUser = function(userId) {
 			}
 		});
 
-		Subscriptions.removeByUserId(userId); // Remove user subscriptions
+		// TODO: do not remove group DMs
+		Rooms.updateGroupDMsRemovingUsernamesByUsername(user.username); // Remove direct rooms with the user
 		Rooms.removeDirectRoomContainingUsername(user.username); // Remove direct rooms with the user
 
+		Subscriptions.removeByUserId(userId); // Remove user subscriptions
+
 		// removes user's avatar
 		if (user.avatarOrigin === 'upload' || user.avatarOrigin === 'url') {
 			FileUpload.getStore('Avatars').deleteByName(user.username);
@@ -108,7 +112,11 @@ export const deleteUser = function(userId) {
 		Notifications.notifyLogged('Users:Deleted', { userId });
 	}
 
-	Users.removeById(userId); // Remove user from users database
+	// Remove user from users database
+	Users.removeById(userId);
+
+	// update name and fname of group direct messages
+	updateGroupDMsName(user);
 
 	// Refresh the servers list
 	FederationServers.refreshServers();
diff --git a/app/lib/server/functions/saveUser.js b/app/lib/server/functions/saveUser.js
index b52edb7d1097..953a14e2b5c7 100644
--- a/app/lib/server/functions/saveUser.js
+++ b/app/lib/server/functions/saveUser.js
@@ -10,8 +10,9 @@ import { getRoles, hasPermission } from '../../../authorization';
 import { settings } from '../../../settings';
 import { passwordPolicy } from '../lib/passwordPolicy';
 import { validateEmailDomain } from '../lib';
+import { saveUserIdentity } from './saveUserIdentity';
 
-import { checkEmailAvailability, checkUsernameAvailability, setUserAvatar, setEmail, setRealName, setUsername, setStatusText } from '.';
+import { checkEmailAvailability, checkUsernameAvailability, setUserAvatar, setEmail, setStatusText } from '.';
 
 let html = '';
 let passwordChangedHtml = '';
@@ -264,12 +265,14 @@ export const saveUser = function(userId, userData) {
 	validateUserEditing(userId, userData);
 
 	// update user
-	if (userData.username) {
-		setUsername(userData._id, userData.username);
-	}
-
-	if (userData.hasOwnProperty('name')) {
-		setRealName(userData._id, userData.name);
+	if (userData.hasOwnProperty('username') || userData.hasOwnProperty('name')) {
+		if (!saveUserIdentity(userId, {
+			_id: userData._id,
+			username: userData.username,
+			name: userData.name,
+		})) {
+			throw new Meteor.Error('error-could-not-save-identity', 'Could not save user identity', { method: 'saveUser' });
+		}
 	}
 
 	if (typeof userData.statusText === 'string') {
diff --git a/app/lib/server/functions/saveUserIdentity.js b/app/lib/server/functions/saveUserIdentity.js
new file mode 100644
index 000000000000..62e0a123a7f6
--- /dev/null
+++ b/app/lib/server/functions/saveUserIdentity.js
@@ -0,0 +1,68 @@
+import { setUsername } from './setUsername';
+import { setRealName } from './setRealName';
+import { Messages, Rooms, Subscriptions, LivechatDepartmentAgents, Users } from '../../../models/server';
+import { FileUpload } from '../../../file-upload/server';
+import { updateGroupDMsName } from './updateGroupDMsName';
+
+/**
+ *
+ * @param {string} userId user performing the action
+ * @param {object} changes changes to the user
+ */
+export function saveUserIdentity(userId, { _id, name: rawName, username: rawUsername }) {
+	if (!_id) {
+		return false;
+	}
+
+	const name = String(rawName).trim();
+	const username = String(rawUsername).trim();
+
+	const user = Users.findOneById(_id);
+
+	const previousUsername = user.username;
+
+	if (typeof rawUsername !== 'undefined') {
+		if (!setUsername(_id, username, user)) {
+			return false;
+		}
+		user.username = username;
+	}
+
+	if (typeof rawName !== 'undefined') {
+		if (!setRealName(_id, name, user)) {
+			return false;
+		}
+	}
+
+	// if coming from old username, update all references
+	if (previousUsername) {
+		if (typeof rawUsername !== 'undefined') {
+			Messages.updateAllUsernamesByUserId(user._id, username);
+			Messages.updateUsernameOfEditByUserId(user._id, username);
+			Messages.findByMention(previousUsername).forEach(function(msg) {
+				const updatedMsg = msg.msg.replace(new RegExp(`@${ previousUsername }`, 'ig'), `@${ username }`);
+				return Messages.updateUsernameAndMessageOfMentionByIdAndOldUsername(msg._id, previousUsername, username, updatedMsg);
+			});
+			Rooms.replaceUsername(previousUsername, username);
+			Rooms.replaceMutedUsername(previousUsername, username);
+			Rooms.replaceUsernameOfUserByUserId(user._id, username);
+			Subscriptions.setUserUsernameByUserId(user._id, username);
+
+			LivechatDepartmentAgents.replaceUsernameOfAgentByUserId(user._id, username);
+
+			const fileStore = FileUpload.getStore('Avatars');
+			const file = fileStore.model.findOneByName(previousUsername);
+			if (file) {
+				fileStore.model.updateFileNameById(file._id, username);
+			}
+		}
+
+		// update name and fname of 1-on-1 direct messages
+		Subscriptions.updateDirectNameAndFnameByName(previousUsername, rawUsername && username, rawName && name);
+
+		// update name and fname of group direct messages
+		updateGroupDMsName(user);
+	}
+
+	return true;
+}
diff --git a/app/lib/server/functions/setRealName.js b/app/lib/server/functions/setRealName.js
index 40262fd612bf..190fc1b739bc 100644
--- a/app/lib/server/functions/setRealName.js
+++ b/app/lib/server/functions/setRealName.js
@@ -1,20 +1,20 @@
 import { Meteor } from 'meteor/meteor';
 import s from 'underscore.string';
 
-import { Users, Subscriptions } from '../../../models';
+import { Users } from '../../../models/server';
 import { settings } from '../../../settings';
 import { Notifications } from '../../../notifications';
 import { hasPermission } from '../../../authorization';
 import { RateLimiter } from '../lib';
 
-export const _setRealName = function(userId, name) {
+export const _setRealName = function(userId, name, fullUser) {
 	name = s.trim(name);
 
 	if (!userId || (settings.get('Accounts_RequireNameForSignUp') && !name)) {
 		return false;
 	}
 
-	const user = Users.findOneById(userId);
+	const user = fullUser || Users.findOneById(userId);
 
 	// User already has desired name, return
 	if (s.trim(user.name) === name) {
@@ -29,11 +29,6 @@ export const _setRealName = function(userId, name) {
 	}
 	user.name = name;
 
-	// if user has no username, there is no need to updated any direct messages (there is none)
-	if (user.username && user.username !== '') {
-		Subscriptions.updateDirectFNameByName(user.username, name);
-	}
-
 	if (settings.get('UI_Use_Real_Name') === true) {
 		Notifications.notifyLogged('Users:NameChanged', {
 			_id: user._id,
diff --git a/app/lib/server/functions/setUsername.js b/app/lib/server/functions/setUsername.js
index 7656e7dbe4af..6e5f08cf3990 100644
--- a/app/lib/server/functions/setUsername.js
+++ b/app/lib/server/functions/setUsername.js
@@ -2,9 +2,8 @@ import { Meteor } from 'meteor/meteor';
 import s from 'underscore.string';
 import { Accounts } from 'meteor/accounts-base';
 
-import { FileUpload } from '../../../file-upload';
 import { settings } from '../../../settings';
-import { Users, Messages, Subscriptions, Rooms, LivechatDepartmentAgents, Invites } from '../../../models';
+import { Users, Invites } from '../../../models/server';
 import { hasPermission } from '../../../authorization';
 import { RateLimiter } from '../lib';
 import { Notifications } from '../../../notifications/server';
@@ -12,7 +11,7 @@ import { addUserToRoom } from './addUserToRoom';
 
 import { checkUsernameAvailability, setUserAvatar, getAvatarSuggestionForUser } from '.';
 
-export const _setUsername = function(userId, u) {
+export const _setUsername = function(userId, u, fullUser) {
 	const username = s.trim(u);
 	if (!userId || !username) {
 		return false;
@@ -26,7 +25,7 @@ export const _setUsername = function(userId, u) {
 	if (!nameValidation.test(username)) {
 		return false;
 	}
-	const user = Users.findOneById(userId);
+	const user = fullUser || Users.findOneById(userId);
 	// User already has desired username, return
 	if (user.username === username) {
 		return user;
@@ -68,27 +67,6 @@ export const _setUsername = function(userId, u) {
 			setUserAvatar(user, gravatar.blob, gravatar.contentType, 'gravatar');
 		}
 	}
-	// Username is available; if coming from old username, update all references
-	if (previousUsername) {
-		Messages.updateAllUsernamesByUserId(user._id, username);
-		Messages.updateUsernameOfEditByUserId(user._id, username);
-		Messages.findByMention(previousUsername).forEach(function(msg) {
-			const updatedMsg = msg.msg.replace(new RegExp(`@${ previousUsername }`, 'ig'), `@${ username }`);
-			return Messages.updateUsernameAndMessageOfMentionByIdAndOldUsername(msg._id, previousUsername, username, updatedMsg);
-		});
-		Rooms.replaceUsername(previousUsername, username);
-		Rooms.replaceMutedUsername(previousUsername, username);
-		Rooms.replaceUsernameOfUserByUserId(user._id, username);
-		Subscriptions.setUserUsernameByUserId(user._id, username);
-		Subscriptions.setNameForDirectRoomsWithOldName(previousUsername, username);
-		LivechatDepartmentAgents.replaceUsernameOfAgentByUserId(user._id, username);
-
-		const fileStore = FileUpload.getStore('Avatars');
-		const file = fileStore.model.findOneByName(previousUsername);
-		if (file) {
-			fileStore.model.updateFileNameById(file._id, username);
-		}
-	}
 
 	// If it's the first username and the user has an invite Token, then join the invite room
 	if (!previousUsername && user.inviteToken) {
diff --git a/app/lib/server/functions/updateGroupDMsName.js b/app/lib/server/functions/updateGroupDMsName.js
new file mode 100644
index 000000000000..7fb3b08a7195
--- /dev/null
+++ b/app/lib/server/functions/updateGroupDMsName.js
@@ -0,0 +1,40 @@
+import { Rooms, Subscriptions, Users } from '../../../models/server';
+
+const getFname = (members) => members.map(({ name, username }) => name || username).join(', ');
+const getName = (members) => members.map(({ username }) => username).join(',');
+
+export const updateGroupDMsName = (user) => {
+	if (!user.username) {
+		return;
+	}
+
+	const userIds = new Set();
+	const users = new Map();
+
+	const rooms = Rooms.findGroupDMsByUids(user._id, { fields: { uids: 1 } });
+
+	if (rooms.count() === 0) {
+		return;
+	}
+
+	// add all users to single array so we can fetch details from them all at once
+	rooms.forEach((room) => room.uids.forEach((uid) => uid !== user._id && userIds.add(uid)));
+
+	Users.findByIds([...userIds], { fields: { username: 1, name: 1 } })
+		.forEach((user) => users.set(user._id, user));
+
+	const getMembers = (uids) => uids.map((uid) => users.get(uid)).filter(Boolean);
+
+	// loop rooms to update the subcriptions from them all
+	rooms.forEach((room) => {
+		const members = getMembers(room.uids);
+		const sortedMembers = members.sort((u1, u2) => (u1.name || u1.username).localeCompare(u2.name || u2.username));
+
+		const subs = Subscriptions.findByRoomId(room._id, { fields: { _id: 1, 'u._id': 1 } });
+		subs.forEach((sub) => {
+			const otherMembers = sortedMembers.filter(({ _id }) => _id !== sub.u._id);
+
+			Subscriptions.updateNameAndFnameById(sub._id, getName(otherMembers), getFname(otherMembers));
+		});
+	});
+};
diff --git a/app/lib/server/methods/setUsername.js b/app/lib/server/methods/setUsername.js
index 5a8ed788d8fa..10a604038857 100644
--- a/app/lib/server/methods/setUsername.js
+++ b/app/lib/server/methods/setUsername.js
@@ -5,8 +5,9 @@ import _ from 'underscore';
 import { settings } from '../../../settings';
 import { Users } from '../../../models';
 import { callbacks } from '../../../callbacks';
-import { setUsername, checkUsernameAvailability } from '../functions';
+import { checkUsernameAvailability } from '../functions';
 import { RateLimiter } from '../lib';
+import { saveUserIdentity } from '../functions/saveUserIdentity';
 
 Meteor.methods({
 	setUsername(username, param = {}) {
@@ -42,7 +43,7 @@ Meteor.methods({
 			throw new Meteor.Error('error-field-unavailable', `<strong>${ _.escape(username) }</strong> is already in use :(`, { method: 'setUsername', field: username });
 		}
 
-		if (!setUsername(user._id, username)) {
+		if (!saveUserIdentity(user._id, { _id: user._id, username })) {
 			throw new Meteor.Error('error-could-not-change-username', 'Could not change username', { method: 'setUsername' });
 		}
 
diff --git a/app/lib/server/startup/settings.js b/app/lib/server/startup/settings.js
index d586d2116663..2e87a40b2eb6 100644
--- a/app/lib/server/startup/settings.js
+++ b/app/lib/server/startup/settings.js
@@ -1111,6 +1111,10 @@ settings.addGroup('Message', function() {
 		values: MessageTypesValues,
 	});
 
+	this.add('DirectMesssage_maxUsers', 8, {
+		type: 'int',
+		public: true,
+	});
 
 	this.add('Message_ErasureType', 'Delete', {
 		type: 'select',
diff --git a/app/models/server/models/Rooms.js b/app/models/server/models/Rooms.js
index 633a4055df91..a9034630737f 100644
--- a/app/models/server/models/Rooms.js
+++ b/app/models/server/models/Rooms.js
@@ -19,6 +19,9 @@ export class Rooms extends Base {
 		this.tryEnsureIndex({ prid: 1 }, { sparse: true });
 		// Livechat - statistics
 		this.tryEnsureIndex({ closedAt: 1 }, { sparse: true });
+
+		// field used for DMs only
+		this.tryEnsureIndex({ uids: 1 }, { sparse: true });
 	}
 
 	findOneByIdOrName(_idOrName, options) {
@@ -463,19 +466,20 @@ export class Rooms extends Base {
 		return this.find(query, options);
 	}
 
-	findDirectRoomContainingUsername(username, options) {
+	findDirectRoomContainingAllUsernames(usernames, options) {
 		const query = {
 			t: 'd',
-			usernames: username,
+			usernames: { $size: usernames.length, $all: usernames },
+			usersCount: usernames.length,
 		};
 
-		return this.find(query, options);
+		return this.findOne(query, options);
 	}
 
-	findDirectRoomContainingAllUsernames(usernames, options) {
+	findDirectRoomContainingAllUserIDs(uid, options) {
 		const query = {
 			t: 'd',
-			usernames: { $size: usernames.length, $all: usernames },
+			uids: { $size: uid.length, $all: uid },
 		};
 
 		return this.findOne(query, options);
@@ -490,6 +494,18 @@ export class Rooms extends Base {
 		return this.findOne(query, options);
 	}
 
+	findByTypeAndNameOrId(type, identifier, options) {
+		const query = {
+			t: type,
+			$or: [
+				{ name: identifier },
+				{ _id: identifier },
+			],
+		};
+
+		return this.findOne(query, options);
+	}
+
 	findByTypeAndNameContaining(type, name, options) {
 		const nameRegex = new RegExp(s.trim(s.escapeRegExp(name)), 'i');
 
@@ -527,6 +543,13 @@ export class Rooms extends Base {
 		return this.find(query, options);
 	}
 
+	findGroupDMsByUids(uids, options) {
+		return this.find({
+			usersCount: { $gt: 2 },
+			uids,
+		}, options);
+	}
+
 	// UPDATE
 	addImportIds(_id, importIds) {
 		importIds = [].concat(importIds);
@@ -637,11 +660,12 @@ export class Rooms extends Base {
 		return this.update(query, update);
 	}
 
-	incUsersCountByIds(ids, inc = 1) {
+	incUsersCountNotDMsByIds(ids, inc = 1) {
 		const query = {
 			_id: {
 				$in: ids,
 			},
+			t: { $ne: 'd' },
 		};
 
 		const update = {
@@ -930,6 +954,22 @@ export class Rooms extends Base {
 		return this.update(query, update);
 	}
 
+	updateGroupDMsRemovingUsernamesByUsername(username) {
+		const query = {
+			t: 'd',
+			usernames: username,
+			usersCount: { $gt: 2 },
+		};
+
+		const update = {
+			$pull: {
+				usernames: username,
+			},
+		};
+
+		return this.update(query, update, { multi: true });
+	}
+
 	// INSERT
 	createWithTypeNameUserAndUsernames(type, name, fname, user, usernames, extraData) {
 		const room = {
@@ -982,10 +1022,20 @@ export class Rooms extends Base {
 		return this.remove(query);
 	}
 
+	remove1on1ById(_id) {
+		const query = {
+			_id,
+			usersCount: { $lte: 2 },
+		};
+
+		return this.remove(query);
+	}
+
 	removeDirectRoomContainingUsername(username) {
 		const query = {
 			t: 'd',
 			usernames: username,
+			usersCount: { $lte: 2 },
 		};
 
 		return this.remove(query);
diff --git a/app/models/server/models/Subscriptions.js b/app/models/server/models/Subscriptions.js
index 86a00565d4c2..50396a886367 100644
--- a/app/models/server/models/Subscriptions.js
+++ b/app/models/server/models/Subscriptions.js
@@ -822,6 +822,19 @@ export class Subscriptions extends Base {
 		return this.update(query, update, { multi: true });
 	}
 
+	updateNameAndFnameById(_id, name, fname) {
+		const query = { _id };
+
+		const update = {
+			$set: {
+				name,
+				fname,
+			},
+		};
+
+		return this.update(query, update, { multi: true });
+	}
+
 	setUserUsernameByUserId(userId, username) {
 		const query =			{ 'u._id': userId };
 
@@ -849,6 +862,22 @@ export class Subscriptions extends Base {
 		return this.update(query, update, { multi: true });
 	}
 
+	updateDirectNameAndFnameByName(name, newName, newFname) {
+		const query = {
+			name,
+			t: 'd',
+		};
+
+		const update = {
+			$set: {
+				...newName && { name: newName },
+				...newFname && { fname: newFname },
+			},
+		};
+
+		return this.update(query, update, { multi: true });
+	}
+
 	incUnreadForRoomIdExcludingUserId(roomId, userId, inc) {
 		if (inc == null) {
 			inc = 1;
@@ -1267,7 +1296,7 @@ export class Subscriptions extends Base {
 		const result = this.remove(query);
 
 		if (Match.test(result, Number) && result > 0) {
-			Rooms.incUsersCountByIds(roomIds, -1);
+			Rooms.incUsersCountNotDMsByIds(roomIds, -1);
 		}
 
 		return result;
diff --git a/app/notifications/server/lib/Notifications.js b/app/notifications/server/lib/Notifications.js
index 7881aa650d40..003db8f22f14 100644
--- a/app/notifications/server/lib/Notifications.js
+++ b/app/notifications/server/lib/Notifications.js
@@ -38,6 +38,9 @@ class RoomStreamer extends Meteor.Streamer {
 					case 'inserted':
 						rooms.push({ rid });
 						this.on(rid, roomEvent);
+
+						// after a subscription is added need to emit the room again
+						roomEvent('inserted', Rooms.findOneById(rid));
 						break;
 
 					case 'removed':
diff --git a/app/otr/client/rocketchat.otr.room.js b/app/otr/client/rocketchat.otr.room.js
index 2747f625d180..fcb34184e376 100644
--- a/app/otr/client/rocketchat.otr.room.js
+++ b/app/otr/client/rocketchat.otr.room.js
@@ -12,12 +12,13 @@ import toastr from 'toastr';
 import { OTR } from './rocketchat.otr';
 import { Notifications } from '../../notifications';
 import { modal } from '../../ui-utils';
+import { getUidDirectMessage } from '../../ui-utils/client/lib/getUidDirectMessage';
 
 OTR.Room = class {
 	constructor(userId, roomId) {
 		this.userId = userId;
 		this.roomId = roomId;
-		this.peerId = roomId.replace(userId, '');
+		this.peerId = getUidDirectMessage(roomId);
 		this.established = new ReactiveVar(false);
 		this.establishing = new ReactiveVar(false);
 
diff --git a/app/otr/client/views/otrFlexTab.js b/app/otr/client/views/otrFlexTab.js
index f15f69e4b204..12c01d98d8c3 100644
--- a/app/otr/client/views/otrFlexTab.js
+++ b/app/otr/client/views/otrFlexTab.js
@@ -4,6 +4,7 @@ import { Template } from 'meteor/templating';
 import { OTR } from '../rocketchat.otr';
 import { modal } from '../../../ui-utils';
 import { t } from '../../../utils';
+import { getUidDirectMessage } from '../../../ui-utils/client/lib/getUidDirectMessage';
 
 Template.otrFlexTab.helpers({
 	otrAvailable() {
@@ -16,7 +17,7 @@ Template.otrFlexTab.helpers({
 		}
 
 		if (this.rid) {
-			const peerId = this.rid.replace(Meteor.userId(), '');
+			const peerId = getUidDirectMessage(this.rid);
 			if (peerId) {
 				const user = Meteor.users.findOne(peerId);
 				const online = user && user.status !== 'offline';
diff --git a/app/ui-flextab/client/tabs/membersList.js b/app/ui-flextab/client/tabs/membersList.js
index 261f311dd1fc..07f286909e79 100644
--- a/app/ui-flextab/client/tabs/membersList.js
+++ b/app/ui-flextab/client/tabs/membersList.js
@@ -23,7 +23,7 @@ Template.membersList.helpers({
 
 	isGroupChat() {
 		const room = ChatRoom.findOne(this.rid, { reactive: false });
-		return roomTypes.getConfig(room.t).isGroupChat();
+		return roomTypes.getConfig(room.t).isGroupChat(room);
 	},
 
 	isDirectChat() {
@@ -117,7 +117,7 @@ Template.membersList.helpers({
 	},
 
 	userInfoDetail() {
-		const room = ChatRoom.findOne(this.rid, { fields: { t: 1 } });
+		const room = ChatRoom.findOne(this.rid, { fields: { t: 1, usernames: 1 } });
 
 		return {
 			tabBar: Template.currentData().tabBar,
@@ -126,7 +126,7 @@ Template.membersList.helpers({
 			showAll: roomTypes.getConfig(room.t).userDetailShowAll(room) || false,
 			hideAdminControls: roomTypes.getConfig(room.t).userDetailShowAdmin(room) || false,
 			video: ['d'].includes(room && room.t),
-			showBackButton: roomTypes.getConfig(room.t).isGroupChat(),
+			showBackButton: roomTypes.getConfig(room.t).isGroupChat(room),
 		};
 	},
 	displayName() {
diff --git a/app/ui-flextab/client/tabs/userActions.js b/app/ui-flextab/client/tabs/userActions.js
index 070d7ff6ea9f..cc0bd80ecc3b 100644
--- a/app/ui-flextab/client/tabs/userActions.js
+++ b/app/ui-flextab/client/tabs/userActions.js
@@ -101,7 +101,7 @@ export const getActions = ({ user, directActions, hideAdminControls }) => {
 			icon: 'message',
 			name: t('Conversation'),
 			action: prevent(getUser, ({ username }) =>
-				Meteor.call('createDirectMessage', username, success((result) => result.rid && FlowRouter.go('direct', { username }, FlowRouter.current().queryParams))),
+				Meteor.call('createDirectMessage', username, success((result) => result.rid && FlowRouter.go('direct', { rid: result.rid }, FlowRouter.current().queryParams))),
 			),
 			condition() {
 				return canDirectMessageTo(this.username, directActions);
diff --git a/app/ui-master/public/icons/group.svg b/app/ui-master/public/icons/group.svg
new file mode 100644
index 000000000000..987955ea978b
--- /dev/null
+++ b/app/ui-master/public/icons/group.svg
@@ -0,0 +1,6 @@
+<svg viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M4.66669 0.666687C6.0474 0.666687 7.16669 1.78598 7.16669 3.16669C7.16669 4.5474 6.0474 5.66669 4.66669 5.66669C3.28598 5.66669 2.16669 4.5474 2.16669 3.16669C2.16669 1.78597 3.28598 0.666687 4.66669 0.666687ZM5.83336 3.16669C5.83336 2.52235 5.31102 2.00002 4.66669 2.00002C4.02236 2.00002 3.50002 2.52235 3.50002 3.16669C3.50002 3.81102 4.02236 4.33335 4.66669 4.33335C5.31102 4.33335 5.83336 3.81102 5.83336 3.16669Z" />
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M5.90093 6.27198C7.38054 5.96655 9.00002 7.0074 9.00002 8.6586V10.1111C9.00002 10.7862 8.45281 11.3334 7.7778 11.3334H1.55558C0.880562 11.3334 0.333353 10.7862 0.333353 10.1111V8.6586C0.333353 7.0074 1.95283 5.96655 3.43244 6.27198C3.88712 6.36583 4.3178 6.42504 4.66669 6.42504C5.01558 6.42504 5.44625 6.36583 5.90093 6.27198ZM7.66669 8.6586C7.66669 7.98969 6.96307 7.41417 6.17048 7.57778C5.67613 7.67982 5.14527 7.75837 4.66669 7.75837C4.1881 7.75837 3.65725 7.67982 3.1629 7.57778C2.37031 7.41417 1.66669 7.98969 1.66669 8.6586V10H7.66669V8.6586Z" />
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M12 3.33335C12 2.22878 11.1046 1.33335 10 1.33335C8.89545 1.33335 8.00002 2.22878 8.00002 3.33335C8.00002 4.43792 8.89545 5.33335 10 5.33335C11.1046 5.33335 12 4.43792 12 3.33335ZM10 2.66669C10.3682 2.66669 10.6667 2.96516 10.6667 3.33335C10.6667 3.70154 10.3682 4.00002 10 4.00002C9.63183 4.00002 9.33335 3.70154 9.33335 3.33335C9.33335 2.96516 9.63183 2.66669 10 2.66669Z" />
+    <path d="M10.8376 7.22276C11.6565 7.10237 12.3334 7.68142 12.3334 8.33107V8.66669H9.70217C9.72965 9.11069 9.72307 9.56509 9.70856 10H12.4445C13.1195 10 13.6667 9.45281 13.6667 8.7778V8.33107C13.6667 6.69484 12.0864 5.69151 10.6437 5.9036C10.4039 5.93885 10.1852 5.95835 10 5.95835C9.81486 5.95835 9.59617 5.93885 9.35637 5.9036C9.02127 5.85434 8.67876 5.87065 8.35034 5.94523C8.90819 6.22492 9.24568 6.69464 9.44613 7.25916C9.6332 7.27941 9.82019 7.29169 10 7.29169C10.271 7.29169 10.5583 7.26381 10.8376 7.22276Z" />
+</svg>
diff --git a/app/ui-sidenav/client/chatRoomItem.js b/app/ui-sidenav/client/chatRoomItem.js
index 801c415babe9..d3c050e2e243 100644
--- a/app/ui-sidenav/client/chatRoomItem.js
+++ b/app/ui-sidenav/client/chatRoomItem.js
@@ -16,12 +16,14 @@ Template.chatRoomItem.helpers({
 
 		const archivedClass = this.archived ? 'archived' : false;
 
-		const icon = this.t !== 'd' && roomTypes.getIcon(this);
+		const room = Rooms.findOne(this.rid);
+
+		const icon = roomTypes.getIcon(this.t === 'd' ? room : this);
 
 		const roomData = {
 			...this,
-			icon,
-			avatar: roomType.getAvatarPath(this),
+			icon: icon !== 'at' && icon,
+			avatar: roomTypes.getConfig(this.t).getAvatarPath(room, this),
 			username: this.name,
 			route: roomTypes.getRouteLink(this.t, this),
 			name: roomType.roomName(this),
diff --git a/app/ui-sidenav/client/sidebarHeader.js b/app/ui-sidenav/client/sidebarHeader.js
index 90562d7f83d3..1117e6460b5b 100644
--- a/app/ui-sidenav/client/sidebarHeader.js
+++ b/app/ui-sidenav/client/sidebarHeader.js
@@ -9,6 +9,7 @@ import { callbacks } from '../../callbacks';
 import { settings } from '../../settings';
 import { hasAtLeastOnePermission } from '../../authorization';
 import { userStatus } from '../../user-status';
+import { hasPermission } from '../../authorization/client';
 
 const setStatus = (status, statusText) => {
 	AccountBox.setStatus(status, statusText);
@@ -155,14 +156,14 @@ const toolbarButtons = (user) => [{
 {
 	name: t('Create_new'),
 	icon: 'edit-rounded',
-	condition: () => hasAtLeastOnePermission(['create-c', 'create-p']),
+	condition: () => hasAtLeastOnePermission(['create-c', 'create-p', 'create-d', 'start-discussion', 'start-discussion-other-user']),
 	hasPopup: true,
 	action: (e) => {
-		const createChannel = (e) => {
+		const action = (title, content) => (e) => {
 			e.preventDefault();
 			modal.open({
-				title: t('Create_A_New_Channel'),
-				content: 'createChannel',
+				title: t(title),
+				content,
 				data: {
 					onCreate() {
 						modal.close();
@@ -175,42 +176,42 @@ const toolbarButtons = (user) => [{
 			});
 		};
 
-		const discussionEnabled = settings.get('Discussion_enabled');
-		if (!discussionEnabled) {
-			return createChannel(e);
+		const createChannel = action('Create_A_New_Channel', 'createChannel');
+		const createDirectMessage = action('Direct_Messages', 'CreateDirectMessage');
+		const createDiscussion = action('Discussion_title', 'CreateDiscussion');
+
+
+		const items = [
+			hasAtLeastOnePermission(['create-c', 'create-p'])
+			&& {
+				icon: 'hashtag',
+				name: t('Channel'),
+				action: createChannel,
+			},
+			hasPermission('create-d')
+			&& {
+				icon: 'team',
+				name: t('Direct_Messages'),
+				action: createDirectMessage,
+			},
+			settings.get('Discussion_enabled') && hasAtLeastOnePermission(['start-discussion', 'start-discussion-other-user'])
+			&& {
+				icon: 'discussion',
+				name: t('Discussion'),
+				action: createDiscussion,
+			},
+		].filter(Boolean);
+
+		if (items.length === 1) {
+			return items[0].action(e);
 		}
+
 		const config = {
 			columns: [
 				{
 					groups: [
 						{
-							items: [
-								{
-									icon: 'hashtag',
-									name: t('Channel'),
-									action: createChannel,
-								},
-								{
-									icon: 'discussion',
-									name: t('Discussion'),
-									action: (e) => {
-										e.preventDefault();
-										modal.open({
-											title: t('Discussion_title'),
-											content: 'CreateDiscussion',
-											data: {
-												onCreate() {
-													modal.close();
-												},
-											},
-											modifier: 'modal',
-											showConfirmButton: false,
-											showCancelButton: false,
-											confirmOnEnter: false,
-										});
-									},
-								},
-							],
+							items,
 						},
 					],
 				},
diff --git a/app/ui-sidenav/client/sidebarItem.js b/app/ui-sidenav/client/sidebarItem.js
index d1eb0292ba6e..1021b70a8674 100644
--- a/app/ui-sidenav/client/sidebarItem.js
+++ b/app/ui-sidenav/client/sidebarItem.js
@@ -5,10 +5,11 @@ import { Template } from 'meteor/templating';
 
 import { t, getUserPreference, roomTypes } from '../../utils';
 import { popover, renderMessageBody, menu } from '../../ui-utils';
-import { Users, ChatSubscription } from '../../models';
+import { Users, ChatSubscription } from '../../models/client';
 import { settings } from '../../settings';
 import { hasAtLeastOnePermission } from '../../authorization';
 import { timeAgo } from '../../lib/client/lib/formatDate';
+import { getUidDirectMessage } from '../../ui-utils/client/lib/getUidDirectMessage';
 
 Template.sidebarItem.helpers({
 	streaming() {
@@ -205,7 +206,7 @@ Template.sidebarItemIcon.helpers({
 		if (!this.rid) {
 			return this._id;
 		}
-		return this.rid.replace(this.u._id, '');
+		return getUidDirectMessage(this.rid);
 	},
 	isRoom() {
 		return this.rid || this._id;
diff --git a/app/ui-utils/client/lib/callMethod.js b/app/ui-utils/client/lib/callMethod.js
index 9b5f3e9d5afe..390c1ea21bc8 100644
--- a/app/ui-utils/client/lib/callMethod.js
+++ b/app/ui-utils/client/lib/callMethod.js
@@ -17,3 +17,12 @@ export const call = (method, ...params) => new Promise((resolve, reject) => {
 		return resolve(result);
 	});
 });
+
+export const callMethod = (method, ...params) => new Promise((resolve, reject) => {
+	Meteor.call(method, ...params, (err, result) => {
+		if (err) {
+			return reject(err);
+		}
+		return resolve(result);
+	});
+});
diff --git a/app/ui-utils/client/lib/getUidDirectMessage.js b/app/ui-utils/client/lib/getUidDirectMessage.js
new file mode 100644
index 000000000000..ecfe3b48fc99
--- /dev/null
+++ b/app/ui-utils/client/lib/getUidDirectMessage.js
@@ -0,0 +1,15 @@
+import { Meteor } from 'meteor/meteor';
+
+import { Rooms } from '../../../models/client';
+
+export const getUidDirectMessage = (rid, userId = Meteor.userId()) => {
+	const room = Rooms.findOne({ _id: rid }, { fields: { uids: 1 } });
+
+	if (!room || !room.uids || room.uids.length > 2) {
+		return false;
+	}
+
+	const other = room && room.uids.filter((uid) => uid !== userId);
+
+	return other && other[0];
+};
diff --git a/app/ui-utils/client/lib/openRoom.js b/app/ui-utils/client/lib/openRoom.js
index 8f64b36ce092..18d644323c83 100644
--- a/app/ui-utils/client/lib/openRoom.js
+++ b/app/ui-utils/client/lib/openRoom.js
@@ -11,7 +11,8 @@ import _ from 'underscore';
 import { ChatSubscription, Rooms } from '../../../models';
 import { settings } from '../../../settings';
 import { callbacks } from '../../../callbacks';
-import { roomTypes, handleError } from '../../../utils';
+import { roomTypes } from '../../../utils';
+import { call, callMethod } from './callMethod';
 
 import { RoomManager, fireGlobalEvent, RoomHistoryManager } from '..';
 
@@ -39,82 +40,87 @@ function replaceCenterDomBy(dom) {
 	return mainNode;
 }
 
-export const openRoom = function(type, name) {
-	window.currentTracker = Tracker.autorun(function(c) {
+const waitUntilRoomBeInserted = async (type, rid) => new Promise((resolve) => {
+	Tracker.autorun((c) => {
+		const room = roomTypes.findRoom(type, rid, Meteor.user());
+		if (room) {
+			c.stop();
+			return resolve(room);
+		}
+	});
+});
+
+export const openRoom = async function(type, name) {
+	window.currentTracker && window.currentTracker.stop();
+	window.currentTracker = Tracker.autorun(async function(c) {
 		const user = Meteor.user();
 		if ((user && user.username == null) || (user == null && settings.get('Accounts_AllowAnonymousRead') === false)) {
 			BlazeLayout.render('main');
 			return;
 		}
 
-		if (RoomManager.open(type + name).ready() !== true) {
-			if (settings.get('Accounts_AllowAnonymousRead')) {
-				BlazeLayout.render('main');
-			}
-			replaceCenterDomBy(getDomOfLoading());
-			return;
-		}
-		if (window.currentTracker) {
-			window.currentTracker = undefined;
-		}
-		c.stop();
+		try {
+			const room = roomTypes.findRoom(type, name, user) || await callMethod('getRoomByTypeAndName', type, name);
 
-		const room = roomTypes.findRoom(type, name, user);
-		if (room == null) {
-			if (type === 'd') {
-				Meteor.call('createDirectMessage', name, function(error) {
-					if (!error) {
-						RoomManager.close(type + name);
-						return openRoom('d', name);
-					}
-					Session.set('roomNotFound', { type, name, error });
-					BlazeLayout.render('main', { center: 'roomNotFound' });
-				});
-			} else {
-				Meteor.call('getRoomByTypeAndName', type, name, function(error, record) {
-					if (error) {
-						Session.set('roomNotFound', { type, name, error });
-						return BlazeLayout.render('main', { center: 'roomNotFound' });
-					}
-					Rooms.upsert({ _id: record._id }, _.omit(record, '_id'));
-					RoomManager.close(type + name);
-					return openRoom(type, name);
-				});
+			if (RoomManager.open(type + name).ready() !== true) {
+				if (settings.get('Accounts_AllowAnonymousRead')) {
+					BlazeLayout.render('main');
+				}
+				replaceCenterDomBy(getDomOfLoading());
+				return;
 			}
-			return;
-		}
 
-		const roomDom = RoomManager.getDomOfRoom(type + name, room._id);
-		const mainNode = replaceCenterDomBy(roomDom);
+			c.stop();
+
+			Rooms.upsert({ _id: room._id }, _.omit(room, '_id'));
 
-		if (mainNode) {
-			if (roomDom.classList.contains('room-container')) {
-				roomDom.querySelector('.messages-box > .wrapper').scrollTop = roomDom.oldScrollTop;
+			if (window.currentTracker) {
+				window.currentTracker = undefined;
 			}
-		}
 
-		Session.set('openedRoom', room._id);
-		RoomManager.openedRoom = room._id;
+			if (room._id !== name && type === 'd') { // Redirect old url using username to rid
+				RoomManager.close(type + name);
+				return FlowRouter.go('direct', { rid: room._id }, FlowRouter.current().queryParams);
+			}
 
-		fireGlobalEvent('room-opened', _.omit(room, 'usernames'));
+			const roomDom = RoomManager.getDomOfRoom(type + name, room._id);
+			const mainNode = replaceCenterDomBy(roomDom);
 
-		Session.set('editRoomTitle', false);
-		// KonchatNotification.removeRoomNotification(params._id)
-		// update user's room subscription
-		const sub = ChatSubscription.findOne({ rid: room._id });
-		if (sub && sub.open === false) {
-			Meteor.call('openRoom', room._id, function(err) {
-				if (err) {
-					return handleError(err);
+			if (mainNode) {
+				if (roomDom.classList.contains('room-container')) {
+					roomDom.querySelector('.messages-box > .wrapper').scrollTop = roomDom.oldScrollTop;
 				}
-			});
-		}
+			}
 
-		if (FlowRouter.getQueryParam('msg')) {
-			const msg = { _id: FlowRouter.getQueryParam('msg'), rid: room._id };
-			RoomHistoryManager.getSurroundingMessages(msg);
-		}
+			Session.set('openedRoom', room._id);
+			RoomManager.openedRoom = room._id;
+
+			fireGlobalEvent('room-opened', _.omit(room, 'usernames'));
+
+			Session.set('editRoomTitle', false);
+			// KonchatNotification.removeRoomNotification(params._id)
+			// update user's room subscription
+			const sub = ChatSubscription.findOne({ rid: room._id });
+			if (sub && sub.open === false) {
+				call('openRoom', room._id);
+			}
 
-		return callbacks.run('enter-room', sub);
+			if (FlowRouter.getQueryParam('msg')) {
+				const msg = { _id: FlowRouter.getQueryParam('msg'), rid: room._id };
+				RoomHistoryManager.getSurroundingMessages(msg);
+			}
+
+			return callbacks.run('enter-room', sub);
+		} catch (error) {
+			c.stop();
+			if (type === 'd') {
+				const result = await call('createDirectMessage', ...name.split(', ')).then((result) => waitUntilRoomBeInserted(type, result.rid)).catch(() => {});
+				if (result) {
+					return FlowRouter.go('direct', { rid: result._id }, FlowRouter.current().queryParams);
+				}
+			}
+			Session.set('roomNotFound', { type, name, error });
+			return BlazeLayout.render('main', { center: 'roomNotFound' });
+		}
 	});
 };
diff --git a/app/ui/client/components/header/headerRoom.html b/app/ui/client/components/header/headerRoom.html
index 456547049fed..9b849f09cb2b 100644
--- a/app/ui/client/components/header/headerRoom.html
+++ b/app/ui/client/components/header/headerRoom.html
@@ -29,7 +29,7 @@
 				{{#if isDirect}}
 				<div class="rc-header__block">
 					<div class="rc-header__image">
-						{{> avatar username=avatarBackground}}
+						{{> avatar url=avatarBackground}}
 					</div>
 				</div>
 				{{/if}}
@@ -41,7 +41,7 @@
 					<div class="rc-header__name">{{roomName}} <div class="rc-header__username">@{{secondaryName}}</div></div>
 					{{/unless}}
 
-					{{#if isDirect}}
+					{{#if hasPresence}}
 					{{# userPresence uid=uid}}<span class="rc-header__status">
 						<div class="rc-header__status-bullet rc-header__status-bullet--{{userStatus}}" title="{{_ userStatus}}"></div>
 						<div class="rc-header__visual-status">{{userStatusText}}</div>
diff --git a/app/ui/client/components/header/headerRoom.js b/app/ui/client/components/header/headerRoom.js
index 52f5360d7f5c..ec921d7e1901 100644
--- a/app/ui/client/components/header/headerRoom.js
+++ b/app/ui/client/components/header/headerRoom.js
@@ -13,6 +13,7 @@ import { settings } from '../../../../settings';
 import { emoji } from '../../../../emoji';
 import { Markdown } from '../../../../markdown/client';
 import { hasAllPermission } from '../../../../authorization';
+import { getUidDirectMessage } from '../../../../ui-utils/client/lib/getUidDirectMessage';
 
 import './headerRoom.html';
 
@@ -28,12 +29,17 @@ const getUserStatusText = (id) => {
 
 Template.headerRoom.helpers({
 	isDiscussion: () => Template.instance().state.get('discussion'),
+	hasPresence() {
+		const room = Rooms.findOne(this._id);
+		return !roomTypes.getConfig(room.t).isGroupChat(room);
+	},
+	isDirect() { return Rooms.findOne(this._id).t === 'd'; },
 	isToggleFavoriteButtonVisible: () => Template.instance().state.get('favorite') !== null,
 	isToggleFavoriteButtonChecked: () => Template.instance().state.get('favorite'),
 	toggleFavoriteButtonIconLabel: () => (Template.instance().state.get('favorite') ? t('Unfavorite') : t('Favorite')),
 	toggleFavoriteButtonIcon: () => (Template.instance().state.get('favorite') ? 'star-filled' : 'star'),
 	uid() {
-		return this._id.replace(Meteor.userId(), '');
+		return getUidDirectMessage(this._id);
 	},
 	back() {
 		return Template.instance().data.back;
@@ -41,7 +47,7 @@ Template.headerRoom.helpers({
 	avatarBackground() {
 		const roomData = Session.get(`roomData${ this._id }`);
 		if (!roomData) { return ''; }
-		return roomTypes.getSecondaryRoomName(roomData.t, roomData) || roomTypes.getRoomName(roomData.t, roomData);
+		return roomTypes.getConfig(roomData.t).getAvatarPath(roomData);
 	},
 	buttons() {
 		return TabBar.getButtons();
@@ -51,11 +57,6 @@ Template.headerRoom.helpers({
 		const sub = ChatSubscription.findOne({ rid: this._id }, { fields: { autoTranslate: 1, autoTranslateLanguage: 1 } });
 		return settings.get('AutoTranslate_Enabled') && ((sub != null ? sub.autoTranslate : undefined) === true) && (sub.autoTranslateLanguage != null);
 	},
-
-	isDirect() {
-		return Rooms.findOne(this._id).t === 'd';
-	},
-
 	roomName() {
 		const roomData = Session.get(`roomData${ this._id }`);
 		if (!roomData) { return ''; }
@@ -192,7 +193,7 @@ const loadUserStatusText = () => {
 		return;
 	}
 
-	const userId = id.replace(Meteor.userId(), '');
+	const userId = getUidDirectMessage(id);
 
 	// If the user is already on the local collection, the method call is not necessary
 	const found = Meteor.users.findOne(userId, { fields: { _id: 1 } });
diff --git a/app/ui/client/index.js b/app/ui/client/index.js
index 786881dac290..f44ba3083e41 100644
--- a/app/ui/client/index.js
+++ b/app/ui/client/index.js
@@ -33,6 +33,7 @@ import './views/cmsPage';
 import './views/404/roomNotFound';
 import './views/app/burger';
 import './views/app/createChannel';
+import './views/app/CreateDirectMessage';
 import './views/app/editStatus';
 import './views/app/fullModal';
 import './views/app/home';
@@ -43,6 +44,7 @@ import './views/app/invite';
 import './views/app/videoCall/videoButtons';
 import './views/app/videoCall/videoCall';
 import './views/app/photoswipe';
+import './views/app/RoomForeword';
 import './components/icon';
 import './components/status';
 import './components/table.html';
diff --git a/app/ui/client/lib/notification.js b/app/ui/client/lib/notification.js
index 27ff9d7e903a..14e1bebc7381 100644
--- a/app/ui/client/lib/notification.js
+++ b/app/ui/client/lib/notification.js
@@ -65,7 +65,7 @@ export const KonchatNotification = {
 						window.focus();
 						switch (notification.payload.type) {
 							case 'd':
-								return FlowRouter.go('direct', { username: notification.payload.sender.username }, FlowRouter.current().queryParams);
+								return FlowRouter.go('direct', { rid: notification.payload.rid }, FlowRouter.current().queryParams);
 							case 'c':
 								return FlowRouter.go('channel', { name: notification.payload.name }, FlowRouter.current().queryParams);
 							case 'p':
diff --git a/app/ui/client/views/app/CreateDirectMessage.html b/app/ui/client/views/app/CreateDirectMessage.html
new file mode 100644
index 000000000000..5472f585849f
--- /dev/null
+++ b/app/ui/client/views/app/CreateDirectMessage.html
@@ -0,0 +1,31 @@
+<template name="CreateDirectMessage">
+
+	<section class="create-channel">
+		<div class="create-channel__wrapper">
+			<form id="create-dm" class="create-channel__content">
+				<div class="create-channel__inputs">
+					{{> SearchCreateDiscussion
+						onClickTag=onClickTagUser
+						deleteLastItem=deleteLastItemUser
+						list=selectedUsers
+						onSelect=onSelectUser
+						collection='UserAndRoom'
+						endpoint='users.autocomplete'
+						field='username'
+						sort='username'
+						label="Direct_message_creation_description"
+						placeholder="Username_Placeholder"
+						name="directMessageUsers"
+						icon="at"
+						noMatchTemplate="userSearchEmpty"
+						templateItem="popupList_item_default"
+						modifier=userModifier
+					}}
+				</div>
+			</form>
+			<div class="rc-input">
+				<button form="create-dm" class="rc-button rc-button--primary js-save-dm {{createIsDisabled}}" {{createIsDisabled}}>{{_ " Create "}}</button>
+			</div>
+		</div>
+	</section>
+</template>
diff --git a/app/ui/client/views/app/CreateDirectMessage.js b/app/ui/client/views/app/CreateDirectMessage.js
new file mode 100755
index 000000000000..667a4e63d49a
--- /dev/null
+++ b/app/ui/client/views/app/CreateDirectMessage.js
@@ -0,0 +1,105 @@
+import { Tracker } from 'meteor/tracker';
+import { Meteor } from 'meteor/meteor';
+import { Template } from 'meteor/templating';
+
+import { roomTypes } from '../../../../utils/client';
+import { call } from '../../../../ui-utils/client';
+import './CreateDirectMessage.html';
+
+Template.CreateDirectMessage.helpers({
+	onSelectUser() {
+		return Template.instance().onSelectUser;
+	},
+	createIsDisabled() {
+		return Template.instance().selectedUsers.get().length === 0 ? 'disabled' : '';
+	},
+	parentChannel() {
+		const instance = Template.instance();
+		return instance.parentChannel.get();
+	},
+	selectedUsers() {
+		const myUsername = Meteor.user().username;
+		const { message } = this;
+		const users = Template.instance().selectedUsers.get().map((e) => e);
+		if (message) {
+			users.unshift(message.u);
+		}
+		return users.filter(({ username }) => myUsername !== username);
+	},
+
+	onClickTagUser() {
+		return Template.instance().onClickTagUser;
+	},
+	deleteLastItemUser() {
+		return Template.instance().deleteLastItemUser;
+	},
+	onClickTagRoom() {
+		return Template.instance().onClickTagRoom;
+	},
+	selectedRoom() {
+		return Template.instance().selectedRoom.get();
+	},
+	userModifier() {
+		return (filter, text = '') => {
+			const f = filter.get();
+			return `@${ f.length === 0 ? text : text.replace(new RegExp(filter.get()), (part) => `<strong>${ part }</strong>`) }`;
+		};
+	},
+	nameSuggestion() {
+		return Template.instance().discussionName.get();
+	},
+});
+
+const waitUntilRoomBeInserted = async (rid) => new Promise((resolve) => {
+	Tracker.autorun((c) => {
+		const room = roomTypes.findRoom('d', rid, Meteor.user());
+		if (room) {
+			c.stop();
+			return resolve(room);
+		}
+	});
+});
+
+Template.CreateDirectMessage.events({
+	async 'submit #create-dm, click .js-save-dm'(event, instance) {
+		event.preventDefault();
+		const users = instance.selectedUsers.get().map(({ username }) => username).filter((value, index, self) => self.indexOf(value) === index);
+
+		const result = await call('createDirectMessage', ...users);
+
+		if (instance.data.onCreate) {
+			instance.data.onCreate(result);
+		}
+
+		await waitUntilRoomBeInserted(result.rid);
+
+		const user = Meteor.user();
+		roomTypes.openRouteLink(result.t, { ...result, name: result.usernames.filter((username) => username !== user.username).join(', ') });
+	},
+});
+
+Template.CreateDirectMessage.onRendered(function() {
+	this.find('#directMessageUsers').focus();
+});
+
+Template.CreateDirectMessage.onCreated(function() {
+	this.onSelectUser = ({ item: user }) => {
+		if (user.username === Meteor.user().username) {
+			return;
+		}
+		const users = this.selectedUsers.get();
+		if (!users.find((u) => user.username === u.username)) {
+			this.selectedUsers.set([...users, user]);
+		}
+	};
+
+	this.onClickTagUser = ({ username }) => {
+		this.selectedUsers.set(this.selectedUsers.get().filter((user) => user.username !== username));
+	};
+
+	this.deleteLastItemUser = () => {
+		const arr = this.selectedUsers.get();
+		arr.pop();
+		this.selectedUsers.set(arr);
+	};
+});
diff --git a/app/ui/client/views/app/RoomForeword.html b/app/ui/client/views/app/RoomForeword.html
new file mode 100644
index 000000000000..72b2b7734c0e
--- /dev/null
+++ b/app/ui/client/views/app/RoomForeword.html
@@ -0,0 +1,3 @@
+<template name="RoomForeword">
+	<div style='display: flex; flex-direction: column;'></div>
+</template>
diff --git a/app/ui/client/views/app/RoomForeword.js b/app/ui/client/views/app/RoomForeword.js
new file mode 100644
index 000000000000..ef068e3b3219
--- /dev/null
+++ b/app/ui/client/views/app/RoomForeword.js
@@ -0,0 +1,73 @@
+import React from 'react';
+import { Meteor } from 'meteor/meteor';
+import { Avatar, Margins, Flex, Box, Tag } from '@rocket.chat/fuselage';
+import { Template } from 'meteor/templating';
+
+import './RoomForeword.html';
+import { Rooms, Users } from '../../../../models';
+import { useTranslation } from '../../../../../client/contexts/TranslationContext';
+
+
+const RoomForeword = ({ room, user }) => {
+	const t = useTranslation();
+
+	if (room.t !== 'd') {
+		return t('Start_of_conversation');
+	}
+
+	const users = room.usernames.filter((username) => username !== user.username);
+	if (users.length < 1) {
+		return null;
+	}
+
+	return <Avatar.Context.Provider value={{ baseUrl: '/avatar/' }}>
+		<Flex.Container justifyContent='center' direction='column'>
+			<Flex.Item grow={1}>
+				<Box is='div'>
+					<Flex.Item grow={1}>
+						<Margins block='x24'>
+							<Avatar.Stack>
+								{users.map((username, index) => <Avatar size='x48' title={username} url={username} key={index} data-username={username} />)}
+							</Avatar.Stack>
+						</Margins>
+					</Flex.Item>
+					<Flex.Item grow={1}>
+						<Box textColor='default' textStyle='headline' >
+							{ t('Direct_message_you_have_joined') }
+						</Box>
+					</Flex.Item>
+					<Flex.Item grow={1}>
+						<Margins block='x8'>
+							<Box is='div'>
+								{users.map((username, index) => <Margins inline='x4' key={index}><Tag textStyle='p2' is='a' href={ `/direct/${ username }` } data-username={username} className='mention-link mention-link--user'>{username}</Tag></Margins>)}
+							</Box>
+						</Margins>
+					</Flex.Item>
+				</Box>
+			</Flex.Item>
+		</Flex.Container>
+	</Avatar.Context.Provider>;
+};
+
+Template.RoomForeword.onRendered(async function() {
+	const { MeteorProvider } = await import('../../../../../client/providers/MeteorProvider');
+	const ReactDOM = await import('react-dom');
+	this.container = this.firstNode;
+	this.autorun(() => {
+		const data = Template.currentData();
+		const { _id: rid } = data;
+
+		const user = Users.findOne(Meteor.userId(), { username: 1 });
+
+		const room = Rooms.findOne({ _id: rid });
+		ReactDOM.render(React.createElement(MeteorProvider, {
+			children: React.createElement(RoomForeword, { ...data, room, user }),
+		}), this.container);
+	});
+});
+
+
+Template.RoomForeword.onDestroyed(async function() {
+	const ReactDOM = await import('react-dom');
+	this.container && ReactDOM.unmountComponentAtNode(this.container);
+});
diff --git a/app/ui/client/views/app/createChannel.js b/app/ui/client/views/app/createChannel.js
index 3d1b56de00f7..778f2a708d40 100644
--- a/app/ui/client/views/app/createChannel.js
+++ b/app/ui/client/views/app/createChannel.js
@@ -264,7 +264,8 @@ Template.createChannel.events({
 			if (instance.data.onCreate) {
 				instance.data.onCreate(result);
 			}
-			return FlowRouter.go(isPrivate ? 'group' : 'channel', { name: result.name }, FlowRouter.current().queryParams);
+
+			return FlowRouter.go(isPrivate ? 'group' : 'channel', { ...result }, FlowRouter.current().queryParams);
 		});
 		return false;
 	},
diff --git a/app/ui/client/views/app/room.html b/app/ui/client/views/app/room.html
index 09ee9c49e4c5..2ec39c4854ea 100644
--- a/app/ui/client/views/app/room.html
+++ b/app/ui/client/views/app/room.html
@@ -121,7 +121,8 @@
 													{{/unless}}
 												</div>
 											{{/if}}
-											{{_ "Start_of_conversation"}}
+
+											{{> RoomForeword }}
 										</li>
 									{{/if}}
 								{{/if}}
diff --git a/app/ui/client/views/app/room.js b/app/ui/client/views/app/room.js
index a956a8a265d9..435cfa4ee9db 100644
--- a/app/ui/client/views/app/room.js
+++ b/app/ui/client/views/app/room.js
@@ -879,6 +879,9 @@ Template.room.events({
 		FlowRouter.go(FlowRouter.current().context.pathname, null, { msg: repliedMessageId, hash: Random.id() });
 	},
 	'click .mention-link'(e, instance) {
+		e.stopPropagation();
+		e.preventDefault();
+
 		if (!Meteor.userId()) {
 			return;
 		}
@@ -894,8 +897,6 @@ Template.room.events({
 		}
 
 		if (group) {
-			e.stopPropagation();
-			e.preventDefault();
 			openMembersListTab(instance, group);
 			return;
 		}
@@ -1018,10 +1019,32 @@ Template.room.onCreated(function() {
 
 	this.subscription = new ReactiveVar();
 	this.state = new ReactiveDict();
+	this.userDetail = new ReactiveVar('');
+	const user = Meteor.user();
+	this.autorun((c) => {
+		const room = Rooms.findOne({ _id: rid }, {
+			fields: {
+				t: 1,
+				usernames: 1,
+				uids: 1,
+			},
+		});
+
+		if (room.t !== 'd') {
+			return c.stop();
+		}
+
+		if (roomTypes.getConfig(room.t).isGroupChat(room)) {
+			return;
+		}
+
+		this.userDetail.set(room.usernames.filter((username) => username !== user.username)[0]);
+	});
 
 	this.autorun(() => {
 		const rid = Template.currentData()._id;
-		this.state.set('announcement', Rooms.findOne({ _id: rid }, { fields: { announcement: 1 } }).announcement);
+		const room = Rooms.findOne({ _id: rid }, { fields: { announcement: 1 } });
+		this.state.set('announcement', room.announcement);
 	});
 
 	this.autorun(() => {
@@ -1045,7 +1068,6 @@ Template.room.onCreated(function() {
 
 	this.flexTemplate = new ReactiveVar();
 
-	this.userDetail = new ReactiveVar(FlowRouter.getParam('username'));
 	this.groupDetail = new ReactiveVar();
 
 	this.tabBar = new RocketChatTabBar();
@@ -1346,7 +1368,7 @@ Template.room.onRendered(function() {
 
 		const room = Rooms.findOne({ _id: template.data._id });
 		if (!room) {
-			FlowRouter.go('home');
+			return FlowRouter.go('home');
 		}
 
 		callbacks.run('onRenderRoom', template, room);
diff --git a/app/user-data-download/server/cronProcessDownloads.js b/app/user-data-download/server/cronProcessDownloads.js
index 552c420dd230..e8388c7a17c0 100644
--- a/app/user-data-download/server/cronProcessDownloads.js
+++ b/app/user-data-download/server/cronProcessDownloads.js
@@ -47,7 +47,7 @@ const loadUserSubscriptions = function(exportOperation) {
 		const roomId = subscription.rid;
 		const roomData = Rooms.findOneById(roomId);
 		const roomName = roomData && roomData.name && subscription.t !== 'd' ? roomData.name : roomId;
-		const userId = subscription.t === 'd' ? roomId.replace(exportUserId, '') : null;
+		const [userId] = subscription.t === 'd' ? roomId.uids.filter((uid) => uid !== exportUserId) : [null];
 		const fileName = exportOperation.fullExport ? roomId : roomName;
 		const fileType = exportOperation.fullExport ? 'json' : 'html';
 		const targetFile = `${ fileName }.${ fileType }`;
diff --git a/app/utils/lib/RoomTypesCommon.js b/app/utils/lib/RoomTypesCommon.js
index fface1a028f1..7125764139f1 100644
--- a/app/utils/lib/RoomTypesCommon.js
+++ b/app/utils/lib/RoomTypesCommon.js
@@ -108,6 +108,7 @@ export class RoomTypesCommon {
 			routeData = this.roomTypes[roomType].route.link(subData);
 		} else if (subData && subData.name) {
 			routeData = {
+				rid: subData.rid || subData._id,
 				name: subData.name,
 			};
 		}
diff --git a/package-lock.json b/package-lock.json
index b7d03fdf0c35..f9284e1d890b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2844,9 +2844,9 @@
 			}
 		},
 		"@rocket.chat/apps-engine": {
-			"version": "1.13.0-beta.2857",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/apps-engine/-/apps-engine-1.13.0-beta.2857.tgz",
-			"integrity": "sha512-zWOmvGv1p1sj7s4aJAoPWIJ9Mmuz7Hlq3BKQYNh8ELjM1IiRXd1dwuyl+5q1hBuru+QZ7T7QZ+qCOa2OcM8tfQ==",
+			"version": "1.13.0-beta.2931",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/apps-engine/-/apps-engine-1.13.0-beta.2931.tgz",
+			"integrity": "sha512-+0imJAd/vb0Yfqg+FUTCZ9e0+wZyh9ZCwtCakOmuJN5hp40NtouiVnTqwzHwUHwfHd8NYmxQ8Vb35zLsvUiYbg==",
 			"requires": {
 				"adm-zip": "^0.4.9",
 				"cryptiles": "^4.1.3",
@@ -2857,11 +2857,6 @@
 				"uuid": "^3.2.1"
 			},
 			"dependencies": {
-				"adm-zip": {
-					"version": "0.4.14",
-					"resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.14.tgz",
-					"integrity": "sha512-/9aQCnQHF+0IiCl0qhXoK7qs//SwYE7zX8lsr/DNk1BRAHYxeLZPL4pguwK29gUEqasYQjqPtEpDRSWEkdHn9g=="
-				},
 				"typescript": {
 					"version": "2.9.2",
 					"resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
@@ -2870,9 +2865,9 @@
 			}
 		},
 		"@rocket.chat/css-in-js": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/css-in-js/-/css-in-js-0.6.0.tgz",
-			"integrity": "sha512-XbkUl2kJ/j24qGOAhBY/FP8yxeiHN0WnGw46WppDrZufDv/yBqCKUkWOSfsYPZq3lqUsu7sPv//pVTMfn8ao4Q==",
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/css-in-js/-/css-in-js-0.6.1.tgz",
+			"integrity": "sha512-LNvPIj06YQmEI7kl1RFHAOk6ts95lCczafl5Nqx5jXo5SY8XKCjrR0qK1awD5sTSU9mGrDv/rE3tPTKbQPIH6A==",
 			"requires": {
 				"@emotion/hash": "^0.8.0",
 				"@emotion/stylis": "^0.8.5"
@@ -2895,51 +2890,37 @@
 			}
 		},
 		"@rocket.chat/fuselage": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.6.0.tgz",
-			"integrity": "sha512-+jZmEO89xo7wW2yMEC/ZrGQUD4TxQJQH1hNL0hV1t39d7YzGdJO3eMNGYEIeADwPpCm1TMgAmavivaDkSUH58A==",
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.6.1.tgz",
+			"integrity": "sha512-B3Q7hoD3gw2qfbUmqwT8byOiRnJQju3ozHJcBMyJ8z9qFDdf2qBpMbU0FQ8Gq/lrIy4cSv17+kI5RtOURyfadQ==",
 			"requires": {
-				"@rocket.chat/css-in-js": "^0.6.0",
-				"@rocket.chat/fuselage-tokens": "^0.6.0",
-				"@rocket.chat/icons": "^0.6.0"
-			},
-			"dependencies": {
-				"@rocket.chat/icons": {
-					"version": "0.6.0",
-					"resolved": "https://registry.npmjs.org/@rocket.chat/icons/-/icons-0.6.0.tgz",
-					"integrity": "sha512-Kl2C5m9glngFq6J2JxvijMMmrq6f+TAcxPUUEYeglHiORvIJtfYgHT7dwzLhlUiAwMUJSBVsYUzvsAvgiOxdbQ=="
-				}
+				"@rocket.chat/css-in-js": "^0.6.1",
+				"@rocket.chat/fuselage-tokens": "^0.6.1",
+				"@rocket.chat/icons": "^0.6.1"
 			}
 		},
 		"@rocket.chat/fuselage-hooks": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-hooks/-/fuselage-hooks-0.6.0.tgz",
-			"integrity": "sha512-RacebD01VEL1UWa+0qt0X5KwyAzx9bgfk0RC2T9WfwcYWntI0MX3RlMnM6Ld8KwTqOpWs5iIpOasQYCCKM7Ljw=="
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-hooks/-/fuselage-hooks-0.6.1.tgz",
+			"integrity": "sha512-/M4lqd3D443GgKstncUokNgJYii7BgiaDLlIgV8LhDcWeLPzc2xDlRfrSmFN7MGcazmrwECq5DUmDSnbVsoCyw=="
 		},
 		"@rocket.chat/fuselage-tokens": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-tokens/-/fuselage-tokens-0.6.0.tgz",
-			"integrity": "sha512-QKObG0aTnWTzOQGOkqE4yYZRmKg7aZnV97uPnx42iKjyNEE8fM++L9hBaWEnJDfqUrLA1UNCjOn5snO5/bGPNw=="
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-tokens/-/fuselage-tokens-0.6.1.tgz",
+			"integrity": "sha512-8G3h9PTT6I57wddxvJCBqLmGJwzce3v6cSTOjcvnMAQ8xYEjY+NXK2Asq/Xh4Nxwhqwl7vsQLHbBz6XBCNqWZQ=="
 		},
 		"@rocket.chat/fuselage-ui-kit": {
-			"version": "0.6.0",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-ui-kit/-/fuselage-ui-kit-0.6.0.tgz",
-			"integrity": "sha512-PGCw+IvNsW4A/msAahUXpkv6A6PDcxTGhMEGmA/DiOc7Y72u+7giQl43vLTuW/u5pafJ0gG83TKNxwCBcHPw8g==",
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-ui-kit/-/fuselage-ui-kit-0.6.1.tgz",
+			"integrity": "sha512-Pj2vU4NXmZl+WznJVtVWBD9fHDyL5kt1y0rGDteoOobHLrCnJVwSCTvBDcgO4rTlf5seiqV/qTE7Qdo0Fm5vdg==",
 			"requires": {
-				"@rocket.chat/ui-kit": "^0.6.0"
-			},
-			"dependencies": {
-				"@rocket.chat/ui-kit": {
-					"version": "0.6.0",
-					"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.6.0.tgz",
-					"integrity": "sha512-Mh82FDw2AOp88LI0IqqT20N6g+cNHfmnXsUU5BZUFh9rI5dMZDrOiYEOZpiWyC5idnWjlmPnxiANemyb8e3Gow=="
-				}
+				"@rocket.chat/ui-kit": "^0.6.1"
 			}
 		},
 		"@rocket.chat/icons": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/icons/-/icons-0.3.0.tgz",
-			"integrity": "sha512-cE8tq4MzfqJq3AiSKMQS6RWj5gYKDhnQZNP63q0ljtvcZDzGX/LL3zmACmrCwwjT4Y0XNp2CpPW9mNFtG20iNQ=="
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/icons/-/icons-0.6.1.tgz",
+			"integrity": "sha512-uXg4oXscOQKhNP5DxF/O5f9zG8rKfLVJoXzv3AhNf/YGutqwUzLUCzt3O6bO2aeL43GjdfhxD9tZnpZlviZM9Q=="
 		},
 		"@rocket.chat/livechat": {
 			"version": "1.4.0",
@@ -3029,9 +3010,9 @@
 			}
 		},
 		"@rocket.chat/ui-kit": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.3.0.tgz",
-			"integrity": "sha512-YAV5l6iVIWuileg5DOU/0NQ/23/AULEr8UblIUSF3OShPN8nWanGMdG0E6xFLyXT+KHvmvzhiQe0/ju3Tk7x8A=="
+			"version": "0.6.1",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.6.1.tgz",
+			"integrity": "sha512-YlcrDZta5CiqIF6F4w+V6zpOGlb/O9vNKctAfnM7YPBnIz2ERnjZ+jkGH5mD6yfLaQa0YMdMseJXofWlLrPayw=="
 		},
 		"@samverschueren/stream-to-observable": {
 			"version": "0.3.0",
@@ -15362,28 +15343,28 @@
 			"dependencies": {
 				"abbrev": {
 					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+					"resolved": false,
 					"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
 					"dev": true,
 					"optional": true
 				},
 				"ansi-regex": {
 					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
 					"dev": true,
 					"optional": true
 				},
 				"aproba": {
 					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
 					"dev": true,
 					"optional": true
 				},
 				"are-we-there-yet": {
 					"version": "1.1.5",
-					"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
+					"resolved": false,
 					"integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
 					"dev": true,
 					"optional": true,
@@ -15394,14 +15375,14 @@
 				},
 				"balanced-match": {
 					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
 					"dev": true,
 					"optional": true
 				},
 				"brace-expansion": {
 					"version": "1.1.11",
-					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+					"resolved": false,
 					"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
 					"dev": true,
 					"optional": true,
@@ -15419,28 +15400,28 @@
 				},
 				"code-point-at": {
 					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
 					"dev": true,
 					"optional": true
 				},
 				"concat-map": {
 					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
 					"dev": true,
 					"optional": true
 				},
 				"console-control-strings": {
 					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
 					"dev": true,
 					"optional": true
 				},
 				"core-util-is": {
 					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+					"resolved": false,
 					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
 					"dev": true,
 					"optional": true
@@ -15457,21 +15438,21 @@
 				},
 				"deep-extend": {
 					"version": "0.6.0",
-					"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
 					"dev": true,
 					"optional": true
 				},
 				"delegates": {
 					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
 					"dev": true,
 					"optional": true
 				},
 				"detect-libc": {
 					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+					"resolved": false,
 					"integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
 					"dev": true,
 					"optional": true
@@ -15488,14 +15469,14 @@
 				},
 				"fs.realpath": {
 					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
 					"dev": true,
 					"optional": true
 				},
 				"gauge": {
 					"version": "2.7.4",
-					"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+					"resolved": false,
 					"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
 					"dev": true,
 					"optional": true,
@@ -15527,14 +15508,14 @@
 				},
 				"has-unicode": {
 					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
 					"dev": true,
 					"optional": true
 				},
 				"iconv-lite": {
 					"version": "0.4.24",
-					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+					"resolved": false,
 					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
 					"dev": true,
 					"optional": true,
@@ -15554,7 +15535,7 @@
 				},
 				"inflight": {
 					"version": "1.0.6",
-					"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+					"resolved": false,
 					"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
 					"dev": true,
 					"optional": true,
@@ -15572,14 +15553,14 @@
 				},
 				"ini": {
 					"version": "1.3.5",
-					"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+					"resolved": false,
 					"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
 					"dev": true,
 					"optional": true
 				},
 				"is-fullwidth-code-point": {
 					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
 					"dev": true,
 					"optional": true,
@@ -15589,14 +15570,14 @@
 				},
 				"isarray": {
 					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
 					"dev": true,
 					"optional": true
 				},
 				"minimatch": {
 					"version": "3.0.4",
-					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+					"resolved": false,
 					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
 					"dev": true,
 					"optional": true,
@@ -15718,7 +15699,7 @@
 				},
 				"npmlog": {
 					"version": "4.1.2",
-					"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+					"resolved": false,
 					"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
 					"dev": true,
 					"optional": true,
@@ -15731,21 +15712,21 @@
 				},
 				"number-is-nan": {
 					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
 					"dev": true,
 					"optional": true
 				},
 				"object-assign": {
 					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
 					"dev": true,
 					"optional": true
 				},
 				"once": {
 					"version": "1.4.0",
-					"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
 					"dev": true,
 					"optional": true,
@@ -15755,21 +15736,21 @@
 				},
 				"os-homedir": {
 					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+					"resolved": false,
 					"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
 					"dev": true,
 					"optional": true
 				},
 				"os-tmpdir": {
 					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+					"resolved": false,
 					"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
 					"dev": true,
 					"optional": true
 				},
 				"osenv": {
 					"version": "0.1.5",
-					"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+					"resolved": false,
 					"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
 					"dev": true,
 					"optional": true,
@@ -15780,7 +15761,7 @@
 				},
 				"path-is-absolute": {
 					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
 					"dev": true,
 					"optional": true
@@ -15794,7 +15775,7 @@
 				},
 				"rc": {
 					"version": "1.2.8",
-					"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+					"resolved": false,
 					"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
 					"dev": true,
 					"optional": true,
@@ -15842,21 +15823,21 @@
 				},
 				"safe-buffer": {
 					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+					"resolved": false,
 					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
 					"dev": true,
 					"optional": true
 				},
 				"safer-buffer": {
 					"version": "2.1.2",
-					"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+					"resolved": false,
 					"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
 					"dev": true,
 					"optional": true
 				},
 				"sax": {
 					"version": "1.2.4",
-					"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+					"resolved": false,
 					"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
 					"dev": true,
 					"optional": true
@@ -15870,21 +15851,21 @@
 				},
 				"set-blocking": {
 					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
 					"dev": true,
 					"optional": true
 				},
 				"signal-exit": {
 					"version": "3.0.2",
-					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+					"resolved": false,
 					"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
 					"dev": true,
 					"optional": true
 				},
 				"string-width": {
 					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+					"resolved": false,
 					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
 					"dev": true,
 					"optional": true,
@@ -15896,7 +15877,7 @@
 				},
 				"string_decoder": {
 					"version": "1.1.1",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+					"resolved": false,
 					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 					"dev": true,
 					"optional": true,
@@ -15906,7 +15887,7 @@
 				},
 				"strip-ansi": {
 					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
 					"dev": true,
 					"optional": true,
@@ -15916,7 +15897,7 @@
 				},
 				"strip-json-comments": {
 					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
 					"dev": true,
 					"optional": true
@@ -15939,14 +15920,14 @@
 				},
 				"util-deprecate": {
 					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+					"resolved": false,
 					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
 					"dev": true,
 					"optional": true
 				},
 				"wide-align": {
 					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+					"resolved": false,
 					"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
 					"dev": true,
 					"optional": true,
@@ -15956,7 +15937,7 @@
 				},
 				"wrappy": {
 					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+					"resolved": false,
 					"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
 					"dev": true,
 					"optional": true
@@ -20418,7 +20399,7 @@
 			"dependencies": {
 				"asn1.js": {
 					"version": "4.10.1",
-					"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+					"resolved": false,
 					"integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
 					"requires": {
 						"bn.js": "^4.0.0",
@@ -20428,7 +20409,7 @@
 				},
 				"assert": {
 					"version": "1.4.1",
-					"resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
 					"requires": {
 						"util": "0.10.3"
@@ -20436,7 +20417,7 @@
 					"dependencies": {
 						"util": {
 							"version": "0.10.3",
-							"resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+							"resolved": false,
 							"integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
 							"requires": {
 								"inherits": "2.0.1"
@@ -20446,22 +20427,22 @@
 				},
 				"base64-js": {
 					"version": "1.3.0",
-					"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="
 				},
 				"bn.js": {
 					"version": "4.11.8",
-					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+					"resolved": false,
 					"integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
 				},
 				"brorand": {
 					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
 				},
 				"browserify-aes": {
 					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
 					"requires": {
 						"buffer-xor": "^1.0.3",
@@ -20474,7 +20455,7 @@
 				},
 				"browserify-cipher": {
 					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
 					"requires": {
 						"browserify-aes": "^1.0.4",
@@ -20484,7 +20465,7 @@
 				},
 				"browserify-des": {
 					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+					"resolved": false,
 					"integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
 					"requires": {
 						"cipher-base": "^1.0.1",
@@ -20495,7 +20476,7 @@
 				},
 				"browserify-rsa": {
 					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
 					"requires": {
 						"bn.js": "^4.1.0",
@@ -20504,7 +20485,7 @@
 				},
 				"browserify-sign": {
 					"version": "4.0.4",
-					"resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
+					"resolved": false,
 					"integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
 					"requires": {
 						"bn.js": "^4.1.1",
@@ -20518,7 +20499,7 @@
 				},
 				"browserify-zlib": {
 					"version": "0.2.0",
-					"resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
 					"requires": {
 						"pako": "~1.0.5"
@@ -20526,7 +20507,7 @@
 				},
 				"buffer": {
 					"version": "5.2.1",
-					"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz",
+					"resolved": false,
 					"integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==",
 					"requires": {
 						"base64-js": "^1.0.2",
@@ -20535,17 +20516,17 @@
 				},
 				"buffer-xor": {
 					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+					"resolved": false,
 					"integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
 				},
 				"builtin-status-codes": {
 					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug="
 				},
 				"cipher-base": {
 					"version": "1.0.4",
-					"resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+					"resolved": false,
 					"integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
 					"requires": {
 						"inherits": "^2.0.1",
@@ -20554,7 +20535,7 @@
 				},
 				"console-browserify": {
 					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
 					"requires": {
 						"date-now": "^0.1.4"
@@ -20562,17 +20543,17 @@
 				},
 				"constants-browserify": {
 					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U="
 				},
 				"core-util-is": {
 					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+					"resolved": false,
 					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
 				},
 				"create-ecdh": {
 					"version": "4.0.3",
-					"resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
+					"resolved": false,
 					"integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
 					"requires": {
 						"bn.js": "^4.1.0",
@@ -20581,7 +20562,7 @@
 				},
 				"create-hash": {
 					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
 					"requires": {
 						"cipher-base": "^1.0.1",
@@ -20593,7 +20574,7 @@
 				},
 				"create-hmac": {
 					"version": "1.1.7",
-					"resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+					"resolved": false,
 					"integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
 					"requires": {
 						"cipher-base": "^1.0.3",
@@ -20606,7 +20587,7 @@
 				},
 				"crypto-browserify": {
 					"version": "3.12.0",
-					"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
 					"requires": {
 						"browserify-cipher": "^1.0.0",
@@ -20624,12 +20605,12 @@
 				},
 				"date-now": {
 					"version": "0.1.4",
-					"resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
+					"resolved": false,
 					"integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs="
 				},
 				"des.js": {
 					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
 					"requires": {
 						"inherits": "^2.0.1",
@@ -20638,7 +20619,7 @@
 				},
 				"diffie-hellman": {
 					"version": "5.0.3",
-					"resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+					"resolved": false,
 					"integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
 					"requires": {
 						"bn.js": "^4.1.0",
@@ -20648,12 +20629,12 @@
 				},
 				"domain-browser": {
 					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="
 				},
 				"elliptic": {
 					"version": "6.4.1",
-					"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz",
+					"resolved": false,
 					"integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
 					"requires": {
 						"bn.js": "^4.4.0",
@@ -20667,12 +20648,12 @@
 				},
 				"events": {
 					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA=="
 				},
 				"evp_bytestokey": {
 					"version": "1.0.3",
-					"resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+					"resolved": false,
 					"integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
 					"requires": {
 						"md5.js": "^1.3.4",
@@ -20681,7 +20662,7 @@
 				},
 				"hash-base": {
 					"version": "3.0.4",
-					"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+					"resolved": false,
 					"integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
 					"requires": {
 						"inherits": "^2.0.1",
@@ -20690,7 +20671,7 @@
 				},
 				"hash.js": {
 					"version": "1.1.7",
-					"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+					"resolved": false,
 					"integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
 					"requires": {
 						"inherits": "^2.0.3",
@@ -20699,14 +20680,14 @@
 					"dependencies": {
 						"inherits": {
 							"version": "2.0.3",
-							"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+							"resolved": false,
 							"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
 						}
 					}
 				},
 				"hmac-drbg": {
 					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
 					"requires": {
 						"hash.js": "^1.0.3",
@@ -20716,27 +20697,27 @@
 				},
 				"https-browserify": {
 					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM="
 				},
 				"ieee754": {
 					"version": "1.1.13",
-					"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+					"resolved": false,
 					"integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
 				},
 				"inherits": {
 					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
 				},
 				"isarray": {
 					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
 				},
 				"md5.js": {
 					"version": "1.3.5",
-					"resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+					"resolved": false,
 					"integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
 					"requires": {
 						"hash-base": "^3.0.0",
@@ -20746,7 +20727,7 @@
 				},
 				"miller-rabin": {
 					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
 					"requires": {
 						"bn.js": "^4.0.0",
@@ -20755,27 +20736,27 @@
 				},
 				"minimalistic-assert": {
 					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
 				},
 				"minimalistic-crypto-utils": {
 					"version": "1.0.1",
-					"resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
 				},
 				"os-browserify": {
 					"version": "0.3.0",
-					"resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc="
 				},
 				"pako": {
 					"version": "1.0.10",
-					"resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
+					"resolved": false,
 					"integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw=="
 				},
 				"parse-asn1": {
 					"version": "5.1.4",
-					"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz",
+					"resolved": false,
 					"integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
 					"requires": {
 						"asn1.js": "^4.0.0",
@@ -20788,12 +20769,12 @@
 				},
 				"path-browserify": {
 					"version": "1.0.0",
-					"resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-Hkavx/nY4/plImrZPHRk2CL9vpOymZLgEbMNX1U0bjcBL7QN9wODxyx0yaMZURSQaUtSEvDrfAvxa9oPb0at9g=="
 				},
 				"pbkdf2": {
 					"version": "3.0.17",
-					"resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
+					"resolved": false,
 					"integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
 					"requires": {
 						"create-hash": "^1.1.2",
@@ -20805,17 +20786,17 @@
 				},
 				"process": {
 					"version": "0.11.10",
-					"resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+					"resolved": false,
 					"integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
 				},
 				"process-nextick-args": {
 					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
 				},
 				"public-encrypt": {
 					"version": "4.0.3",
-					"resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+					"resolved": false,
 					"integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
 					"requires": {
 						"bn.js": "^4.1.0",
@@ -20828,22 +20809,22 @@
 				},
 				"punycode": {
 					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+					"resolved": false,
 					"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
 				},
 				"querystring": {
 					"version": "0.2.0",
-					"resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
 				},
 				"querystring-es3": {
 					"version": "0.2.1",
-					"resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM="
 				},
 				"randombytes": {
 					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
 					"requires": {
 						"safe-buffer": "^5.1.0"
@@ -20851,7 +20832,7 @@
 				},
 				"randomfill": {
 					"version": "1.0.4",
-					"resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+					"resolved": false,
 					"integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
 					"requires": {
 						"randombytes": "^2.0.5",
@@ -20860,7 +20841,7 @@
 				},
 				"readable-stream": {
 					"version": "3.3.0",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.3.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==",
 					"requires": {
 						"inherits": "^2.0.3",
@@ -20870,14 +20851,14 @@
 					"dependencies": {
 						"inherits": {
 							"version": "2.0.3",
-							"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+							"resolved": false,
 							"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
 						}
 					}
 				},
 				"ripemd160": {
 					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+					"resolved": false,
 					"integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
 					"requires": {
 						"hash-base": "^3.0.0",
@@ -20886,17 +20867,17 @@
 				},
 				"safe-buffer": {
 					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+					"resolved": false,
 					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
 				},
 				"setimmediate": {
 					"version": "1.0.5",
-					"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+					"resolved": false,
 					"integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
 				},
 				"sha.js": {
 					"version": "2.4.11",
-					"resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+					"resolved": false,
 					"integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
 					"requires": {
 						"inherits": "^2.0.1",
@@ -20905,7 +20886,7 @@
 				},
 				"stream-browserify": {
 					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+					"resolved": false,
 					"integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
 					"requires": {
 						"inherits": "~2.0.1",
@@ -20914,7 +20895,7 @@
 					"dependencies": {
 						"readable-stream": {
 							"version": "2.3.6",
-							"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+							"resolved": false,
 							"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
 							"requires": {
 								"core-util-is": "~1.0.0",
@@ -20928,14 +20909,14 @@
 							"dependencies": {
 								"inherits": {
 									"version": "2.0.3",
-									"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+									"resolved": false,
 									"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
 								}
 							}
 						},
 						"string_decoder": {
 							"version": "1.1.1",
-							"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+							"resolved": false,
 							"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 							"requires": {
 								"safe-buffer": "~5.1.0"
@@ -20945,7 +20926,7 @@
 				},
 				"stream-http": {
 					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.0.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-JELJfd+btL9GHtxU3+XXhg9NLYrKFnhybfvRuDghtyVkOFydz3PKNT1df07AMr88qW03WHF+FSV0PySpXignCA==",
 					"requires": {
 						"builtin-status-codes": "^3.0.0",
@@ -20956,7 +20937,7 @@
 				},
 				"string_decoder": {
 					"version": "1.2.0",
-					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==",
 					"requires": {
 						"safe-buffer": "~5.1.0"
@@ -20964,7 +20945,7 @@
 				},
 				"timers-browserify": {
 					"version": "2.0.10",
-					"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
+					"resolved": false,
 					"integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
 					"requires": {
 						"setimmediate": "^1.0.4"
@@ -20972,12 +20953,12 @@
 				},
 				"tty-browserify": {
 					"version": "0.0.1",
-					"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw=="
 				},
 				"url": {
 					"version": "0.11.0",
-					"resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+					"resolved": false,
 					"integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
 					"requires": {
 						"punycode": "1.3.2",
@@ -20986,14 +20967,14 @@
 					"dependencies": {
 						"punycode": {
 							"version": "1.3.2",
-							"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+							"resolved": false,
 							"integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
 						}
 					}
 				},
 				"util": {
 					"version": "0.11.1",
-					"resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+					"resolved": false,
 					"integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
 					"requires": {
 						"inherits": "2.0.3"
@@ -21001,24 +20982,24 @@
 					"dependencies": {
 						"inherits": {
 							"version": "2.0.3",
-							"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+							"resolved": false,
 							"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
 						}
 					}
 				},
 				"util-deprecate": {
 					"version": "1.0.2",
-					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+					"resolved": false,
 					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
 				},
 				"vm-browserify": {
 					"version": "1.1.0",
-					"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz",
+					"resolved": false,
 					"integrity": "sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw=="
 				},
 				"xtend": {
 					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
 				}
 			}
diff --git a/package.json b/package.json
index 86296c06c16d..44a87bc90d54 100644
--- a/package.json
+++ b/package.json
@@ -128,12 +128,12 @@
 		"@nivo/heatmap": "^0.61.0",
 		"@nivo/line": "^0.61.1",
 		"@nivo/pie": "^0.61.1",
-		"@rocket.chat/apps-engine": "^1.13.0-beta.2857",
-		"@rocket.chat/fuselage": "^0.6.0",
-		"@rocket.chat/fuselage-hooks": "^0.6.0",
-		"@rocket.chat/fuselage-ui-kit": "^0.6.0",
-		"@rocket.chat/icons": "^0.3.0",
-		"@rocket.chat/ui-kit": "^0.3.0",
+		"@rocket.chat/apps-engine": "^1.13.0-beta.2931",
+		"@rocket.chat/fuselage": "^0.6.1",
+		"@rocket.chat/fuselage-hooks": "^0.6.1",
+		"@rocket.chat/fuselage-ui-kit": "^0.6.1",
+		"@rocket.chat/icons": "^0.6.1",
+		"@rocket.chat/ui-kit": "^0.6.1",
 		"@slack/client": "^4.8.0",
 		"adm-zip": "RocketChat/adm-zip",
 		"archiver": "^3.0.0",
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 379d32dd9698..ef37f627eed1 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1140,6 +1140,8 @@
   "Desktop_Notifications_Not_Enabled": "Desktop Notifications are Not Enabled",
   "Details": "Details",
   "Different_Style_For_User_Mentions": "Different style for user mentions",
+  "Direct_message_creation_description" : "You are about to create a chat with multiple users. Add the ones you would like to talk, everyone in te same place, using direct messages.",
+  "Direct_message_you_have_joined": "You have joined a new direct message with",
   "Direct_message_someone": "Direct message someone",
   "Direct_Messages": "Direct Messages",
   "Direct_Reply": "Direct Reply",
diff --git a/private/public/icons.svg b/private/public/icons.svg
index 0d2fbfeae599..aacb59953fa6 100644
--- a/private/public/icons.svg
+++ b/private/public/icons.svg
@@ -374,4 +374,4 @@
 <symbol id="icon-warning" viewBox="0 0 20 20" fill="currentColor">
   <path d="M9.98344445,7.04264254 C10.4190789,7.04264254 10.7723523,7.39520794 10.7723523,7.83027001 L10.7723523,12.3994926 C10.7723523,12.8345547 10.4190789,13.1871201 9.98344445,13.1871201 C9.54780997,13.1871201 9.19453663,12.8345547 9.19453663,12.3994926 L9.19453663,7.83027001 C9.19453663,7.39520794 9.54780997,7.04264254 9.98344445,7.04264254 Z M0.959352356,16.870054 L9.04441459,2.40226256 C9.32933111,1.8924195 9.98368057,1.7021729 10.5098756,1.97341266 C10.6984618,2.07062387 10.853564,2.21970064 10.9555854,2.40226256 L19.0406476,16.870054 C19.3644696,17.4495162 18.9313899,18.15 18.2590107,18.15 L1.74098931,18.15 C1.06861014,18.15 0.635530413,17.4495162 0.959352356,16.870054 Z M9.96597455,13.7448416 C10.4490813,13.7448416 10.8196237,14.1257886 10.8196237,14.6151726 C10.8196237,15.1078483 10.450184,15.4898784 9.96597455,15.4898784 C9.48176512,15.4898784 9.11232535,15.1078483 9.11232535,14.6151726 C9.11232535,14.1257886 9.48286785,13.7448416 9.96597455,13.7448416 Z M2.73547986,16.7123645 L17.2645201,16.7123645 L10,3.71288982 L2.73547986,16.7123645 Z"/>
 </symbol>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/public/public/icons.html b/public/public/icons.html
index c0e9db50ccee..05e004e70778 100644
--- a/public/public/icons.html
+++ b/public/public/icons.html
@@ -179,6 +179,12 @@
 <symbol id="icon-google" viewBox="0 0 20 20" fill="currentColor">
   <path d="M18,10.1866641 C18,14.751996 14.8225871,17.999995 10.1310019,17.999995 C7.97379233,18.0023573 5.9042462,17.1602614 4.37886773,15.6594585 C2.85348926,14.1586555 1.99760413,12.1224521 2.00000504,9.99999752 C2.00000504,5.57422112 5.63275375,2 10.1310019,2 C12.3209504,2 14.1639764,2.79111087 15.583287,4.09333268 L13.369849,6.18666537 C10.4752141,3.43999955 5.09159074,5.50311003 5.09159074,9.99999752 C5.09159074,12.7911078 7.35742853,15.0515515 10.1310019,15.0515515 C13.3508767,15.0515515 14.557878,12.7804411 14.7476012,11.6026637 L10.1310019,11.6026637 L10.1310019,8.85244232 L17.8717109,8.85244232 C17.9476002,9.26221997 18,9.65599763 18,10.187553 L18,10.1866641 Z"/>
 </symbol>
+<symbol id="icon-group" viewBox="0 0 16 16" fill="currentColor">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M4.66669 0.666687C6.0474 0.666687 7.16669 1.78598 7.16669 3.16669C7.16669 4.5474 6.0474 5.66669 4.66669 5.66669C3.28598 5.66669 2.16669 4.5474 2.16669 3.16669C2.16669 1.78597 3.28598 0.666687 4.66669 0.666687ZM5.83336 3.16669C5.83336 2.52235 5.31102 2.00002 4.66669 2.00002C4.02236 2.00002 3.50002 2.52235 3.50002 3.16669C3.50002 3.81102 4.02236 4.33335 4.66669 4.33335C5.31102 4.33335 5.83336 3.81102 5.83336 3.16669Z"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M5.90093 6.27198C7.38054 5.96655 9.00002 7.0074 9.00002 8.6586V10.1111C9.00002 10.7862 8.45281 11.3334 7.7778 11.3334H1.55558C0.880562 11.3334 0.333353 10.7862 0.333353 10.1111V8.6586C0.333353 7.0074 1.95283 5.96655 3.43244 6.27198C3.88712 6.36583 4.3178 6.42504 4.66669 6.42504C5.01558 6.42504 5.44625 6.36583 5.90093 6.27198ZM7.66669 8.6586C7.66669 7.98969 6.96307 7.41417 6.17048 7.57778C5.67613 7.67982 5.14527 7.75837 4.66669 7.75837C4.1881 7.75837 3.65725 7.67982 3.1629 7.57778C2.37031 7.41417 1.66669 7.98969 1.66669 8.6586V10H7.66669V8.6586Z"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M12 3.33335C12 2.22878 11.1046 1.33335 10 1.33335C8.89545 1.33335 8.00002 2.22878 8.00002 3.33335C8.00002 4.43792 8.89545 5.33335 10 5.33335C11.1046 5.33335 12 4.43792 12 3.33335ZM10 2.66669C10.3682 2.66669 10.6667 2.96516 10.6667 3.33335C10.6667 3.70154 10.3682 4.00002 10 4.00002C9.63183 4.00002 9.33335 3.70154 9.33335 3.33335C9.33335 2.96516 9.63183 2.66669 10 2.66669Z"/>
+  <path d="M10.8376 7.22276C11.6565 7.10237 12.3334 7.68142 12.3334 8.33107V8.66669H9.70217C9.72965 9.11069 9.72307 9.56509 9.70856 10H12.4445C13.1195 10 13.6667 9.45281 13.6667 8.7778V8.33107C13.6667 6.69484 12.0864 5.69151 10.6437 5.9036C10.4039 5.93885 10.1852 5.95835 10 5.95835C9.81486 5.95835 9.59617 5.93885 9.35637 5.9036C9.02127 5.85434 8.67876 5.87065 8.35034 5.94523C8.90819 6.22492 9.24568 6.69464 9.44613 7.25916C9.6332 7.27941 9.82019 7.29169 10 7.29169C10.271 7.29169 10.5583 7.26381 10.8376 7.22276Z"/>
+</symbol>
 <symbol id="icon-hand-pointer" viewBox="0 0 20 20" fill="currentColor">
   <path d="M14.2417329,7.77795608 C15.5093053,7.17491936 17,8.11224385 17,9.55243827 L17,12.2376252 C16.9999974,12.3876984 16.9829142,12.537282 16.9490818,12.6834766 L16.0688149,16.4874882 C15.8640008,17.3726073 15.0812798,18 14.181334,18 L8.45952151,18 C7.83900313,18 7.25183819,17.6967378 6.88839688,17.1886932 L3.36773318,12.2658589 C2.74327173,11.3928142 2.93292113,10.1753167 3.79391704,9.53856332 C4.40742498,9.08489233 5.21048892,9.0412048 5.86092997,9.39713504 L5.86092997,3.95833333 C5.86092997,2.87862304 6.73022656,2 7.79932897,2 C8.86842603,2 9.73769716,2.87861762 9.73769716,3.95833333 L9.73769716,6.53666154 C10.4505838,6.35106463 11.214621,6.59062057 11.6995587,7.16957508 C12.5709429,6.67805728 13.6757773,6.94064257 14.2417329,7.77795608 Z M4.49699968,10.5017767 C4.1443559,10.7543267 4.0493934,11.1845078 4.32907285,11.5755621 L7.85010469,16.4983942 C7.99186119,16.6965482 8.21988702,16.8148148 8.45952151,16.8148148 L14.1813648,16.8148148 C14.5329833,16.8148148 14.8351112,16.5707105 14.9162919,16.2198863 L15.7966142,12.4158704 C15.8100939,12.3575472 15.8169342,12.2975819 15.8169342,12.2376543 L15.8169342,9.55246914 C15.8169342,9.09105778 15.4938898,8.7925649 15.0598857,8.76626347 C14.6386429,8.74073539 14.3108164,8.98424317 14.306354,9.38263365 C14.3061394,9.40674968 14.3061394,9.40674968 14.3060216,9.44382653 C14.305333,9.69494305 14.1019281,9.89814815 13.8512531,9.89814815 C13.5999044,9.89814815 13.3961461,9.69403007 13.3961461,9.44223765 L13.3961461,8.88117284 C13.3961461,8.40907017 13.0689999,8.11445155 12.6409098,8.11467205 C12.2128904,8.11489252 11.885572,8.40977866 11.885572,8.88117284 L11.885572,9.44226852 C11.885572,9.69404389 11.6818275,9.89814815 11.4304958,9.89814815 C11.1791641,9.89814815 10.9754195,9.69404389 10.9754195,9.44226852 L10.9754195,8.43364198 C10.9754195,7.96151327 10.6482777,7.66689751 10.2201859,7.66712962 C9.79216869,7.66736168 9.46484551,7.96225904 9.46484551,8.43364198 L9.46484551,9.44222222 C9.46484551,9.69402316 9.26108024,9.89814815 9.00972305,9.89814815 C8.75836585,9.89814815 8.55460058,9.69402316 8.55460058,9.44222222 L8.55460058,3.95833333 C8.55460058,3.48620418 8.22746511,3.19158887 7.79938233,3.19182097 C7.37137414,3.19205304 7.04405736,3.48694996 7.04405736,3.95833333 L7.04405736,11.442948 C7.04405736,11.6259358 6.92611473,11.7879886 6.75220282,11.8439554 C6.57829131,11.899922 6.38820335,11.8370024 6.28181408,11.6882553 L5.54786469,10.6620917 C5.28463659,10.2940918 4.84633607,10.2515955 4.49699968,10.5017767 Z M8.55456977,14.1181481 L8.55456977,12.147284 C8.55456977,11.895483 8.75833504,11.691358 9.00969224,11.691358 C9.26104943,11.691358 9.4648147,11.895483 9.4648147,12.147284 L9.4648147,14.1181481 C9.4648147,14.3699491 9.26104943,14.5740741 9.00969224,14.5740741 C8.75833504,14.5740741 8.55456977,14.3699491 8.55456977,14.1181481 Z M11.430465,11.691358 C11.6818137,11.691358 11.885572,11.8954761 11.885572,12.1472685 L11.885572,14.1181636 C11.885572,14.369956 11.6818137,14.5740741 11.430465,14.5740741 C11.1791163,14.5740741 10.9753579,14.369956 10.9753579,14.1181636 L10.9753579,12.1472685 C10.9753579,11.8954761 11.1791163,11.691358 11.430465,11.691358 Z M13.3961461,12.1472685 C13.3961461,11.8954761 13.5999044,11.691358 13.8512531,11.691358 C14.1026018,11.691358 14.3063602,11.8954761 14.3063602,12.1472685 L14.3063602,14.1181636 C14.3063602,14.369956 14.1026018,14.5740741 13.8512531,14.5740741 C13.5999044,14.5740741 13.3961461,14.369956 13.3961461,14.1181636 L13.3961461,12.1472685 Z"/>
 </symbol>
@@ -395,4 +401,4 @@
 <symbol id="icon-warning" viewBox="0 0 20 20" fill="currentColor">
   <path d="M9.98344445,7.04264254 C10.4190789,7.04264254 10.7723523,7.39520794 10.7723523,7.83027001 L10.7723523,12.3994926 C10.7723523,12.8345547 10.4190789,13.1871201 9.98344445,13.1871201 C9.54780997,13.1871201 9.19453663,12.8345547 9.19453663,12.3994926 L9.19453663,7.83027001 C9.19453663,7.39520794 9.54780997,7.04264254 9.98344445,7.04264254 Z M0.959352356,16.870054 L9.04441459,2.40226256 C9.32933111,1.8924195 9.98368057,1.7021729 10.5098756,1.97341266 C10.6984618,2.07062387 10.853564,2.21970064 10.9555854,2.40226256 L19.0406476,16.870054 C19.3644696,17.4495162 18.9313899,18.15 18.2590107,18.15 L1.74098931,18.15 C1.06861014,18.15 0.635530413,17.4495162 0.959352356,16.870054 Z M9.96597455,13.7448416 C10.4490813,13.7448416 10.8196237,14.1257886 10.8196237,14.6151726 C10.8196237,15.1078483 10.450184,15.4898784 9.96597455,15.4898784 C9.48176512,15.4898784 9.11232535,15.1078483 9.11232535,14.6151726 C9.11232535,14.1257886 9.48286785,13.7448416 9.96597455,13.7448416 Z M2.73547986,16.7123645 L17.2645201,16.7123645 L10,3.71288982 L2.73547986,16.7123645 Z"/>
 </symbol>
-</svg></div></body></html>
\ No newline at end of file
+</svg></div></body></html>
diff --git a/server/methods/createDirectMessage.js b/server/methods/createDirectMessage.js
index 9d1d48f92441..8ecf775c2722 100644
--- a/server/methods/createDirectMessage.js
+++ b/server/methods/createDirectMessage.js
@@ -9,8 +9,8 @@ import { addUser } from '../../app/federation/server/functions/addUser';
 import { createRoom } from '../../app/lib/server';
 
 Meteor.methods({
-	createDirectMessage(username) {
-		check(username, String);
+	createDirectMessage(...usernames) {
+		check(usernames, [String]);
 
 		if (!Meteor.userId()) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', {
@@ -26,7 +26,7 @@ Meteor.methods({
 			});
 		}
 
-		if (settings.get('Message_AllowDirectMessagesToYourself') === false && me.username === username) {
+		if (settings.get('Message_AllowDirectMessagesToYourself') === false && usernames.length === 1 && me.username === usernames[0]) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', {
 				method: 'createDirectMessage',
 			});
@@ -38,29 +38,29 @@ Meteor.methods({
 			});
 		}
 
-		let to = Users.findOneByUsernameIgnoringCase(username);
 
-		// If the username does have an `@`, but does not exist locally, we create it first
-		if (!to && username.indexOf('@') !== -1) {
-			to = addUser(username);
-		}
+		const users = usernames.filter((username) => username !== me.username).map((username) => {
+			let to = Users.findOneByUsernameIgnoringCase(username);
 
-		if (!to) {
-			throw new Meteor.Error('error-invalid-user', 'Invalid user', {
-				method: 'createDirectMessage',
-			});
-		}
+			// If the username does have an `@`, but does not exist locally, we create it first
+			if (!to && username.indexOf('@') !== -1) {
+				to = addUser(username);
+			}
 
-		if (!hasPermission(to._id, 'view-d-room')) {
-			throw new Meteor.Error('error-not-allowed', 'Target user not allowed to receive messages', {
-				method: 'createDirectMessage',
-			});
-		}
+			if (!to) {
+				throw new Meteor.Error('error-invalid-user', 'Invalid user', {
+					method: 'createDirectMessage',
+				});
+			}
+			return to;
+		});
 
-		const { _id: rid } = createRoom('d', undefined, undefined, [me, to]);
+		const { _id: rid, inserted, ...room } = createRoom('d', null, null, [me, ...users], null, { }, { creator: me._id });
 
 		return {
+			t: 'd',
 			rid,
+			...room,
 		};
 	},
 });
diff --git a/server/methods/saveUserProfile.js b/server/methods/saveUserProfile.js
index 9a1487a40a4b..b197a3a038f4 100644
--- a/server/methods/saveUserProfile.js
+++ b/server/methods/saveUserProfile.js
@@ -6,6 +6,23 @@ import { saveCustomFields, passwordPolicy } from '../../app/lib';
 import { Users } from '../../app/models';
 import { settings as rcSettings } from '../../app/settings';
 import { twoFactorRequired } from '../../app/2fa/server/twoFactorRequired';
+import { saveUserIdentity } from '../../app/lib/server/functions/saveUserIdentity';
+
+function checkPassword(user = {}, typedPassword) {
+	if (!(user.services && user.services.password && user.services.password.bcrypt && user.services.password.bcrypt.trim())) {
+		return true;
+	}
+
+	const passCheck = Accounts._checkPassword(user, {
+		digest: typedPassword.toLowerCase(),
+		algorithm: 'sha-256',
+	});
+
+	if (passCheck.error) {
+		return false;
+	}
+	return true;
+}
 
 Meteor.methods({
 	saveUserProfile: twoFactorRequired(function(settings, customFields) {
@@ -26,28 +43,14 @@ Meteor.methods({
 
 		const user = Users.findOneById(this.userId);
 
-		function checkPassword(user = {}, typedPassword) {
-			if (!(user.services && user.services.password && user.services.password.bcrypt && user.services.password.bcrypt.trim())) {
-				return true;
-			}
-
-			const passCheck = Accounts._checkPassword(user, {
-				digest: typedPassword.toLowerCase(),
-				algorithm: 'sha-256',
-			});
-
-			if (passCheck.error) {
-				return false;
+		if (settings.realname || settings.username) {
+			if (!saveUserIdentity(this.userId, {
+				_id: this.userId,
+				name: settings.realname,
+				username: settings.username,
+			})) {
+				throw new Meteor.Error('error-could-not-save-identity', 'Could not save user identity', { method: 'saveUserProfile' });
 			}
-			return true;
-		}
-
-		if (settings.realname || (!settings.realname && !rcSettings.get('Accounts_RequireNameForSignUp'))) {
-			Meteor.call('setRealName', settings.realname);
-		}
-
-		if (settings.username) {
-			Meteor.call('setUsername', settings.username);
 		}
 
 		if (settings.statusText || settings.statusText === '') {
diff --git a/server/publications/room/index.js b/server/publications/room/index.js
index 8b4f3794beac..98fd2ea29caf 100644
--- a/server/publications/room/index.js
+++ b/server/publications/room/index.js
@@ -52,6 +52,10 @@ export const fields = {
 	e2eKeyId: 1,
 	departmentId: 1,
 	servedBy: 1,
+
+	// fields used by DMs
+	usernames: 1,
+	uids: 1,
 };
 
 const roomMap = (record) => {
@@ -91,7 +95,7 @@ Meteor.methods({
 
 		const roomFind = roomTypes.getRoomFind(type);
 
-		const room = roomFind ? roomFind.call(this, name) : Rooms.findByTypeAndName(type, name);
+		const room = roomFind ? roomFind.call(this, name) : Rooms.findByTypeAndNameOrId(type, name);
 
 		if (!room) {
 			throw new Meteor.Error('error-invalid-room', 'Invalid room', { method: 'getRoomByTypeAndName' });
diff --git a/server/startup/migrations/index.js b/server/startup/migrations/index.js
index ecc2aa96f5ee..6ad1177c8965 100644
--- a/server/startup/migrations/index.js
+++ b/server/startup/migrations/index.js
@@ -176,4 +176,5 @@ import './v175';
 import './v176';
 import './v177';
 import './v178';
+import './v179';
 import './xrun';
diff --git a/server/startup/migrations/v179.js b/server/startup/migrations/v179.js
new file mode 100644
index 000000000000..a7e4d81a3b62
--- /dev/null
+++ b/server/startup/migrations/v179.js
@@ -0,0 +1,87 @@
+import { Meteor } from 'meteor/meteor';
+import Future from 'fibers/future';
+
+import { Migrations } from '../../../app/migrations/server';
+import { Rooms } from '../../../app/models/server';
+
+const batchSize = 5000;
+
+const getIds = (_id) => {
+	// DM alone
+	if (_id.length === 17) {
+		return [_id];
+	}
+
+	// DM with rocket.cat
+	if (_id.match(/rocket\.cat/)) {
+		return [
+			'rocket.cat',
+			_id.replace('rocket.cat', ''),
+		];
+	}
+
+	const total = _id.length;
+
+	// regular DMs
+	const id1 = _id.substr(0, Math.ceil(total / 2));
+	const id2 = _id.substr(Math.ceil(total / 2));
+
+	// buggy (?) DM alone but with duplicated _id
+	// if (id1 === id2) {
+	// 	return [id1];
+	// }
+
+	return [id1, id2];
+};
+
+async function migrateDMs(models, total, current) {
+	const { roomCollection } = models;
+
+	console.log(`DM rooms schema migration ${ current }/${ total }`);
+
+	const items = await roomCollection.find({ t: 'd', uids: { $exists: false } }, { fields: { _id: 1 } }).limit(batchSize).toArray();
+
+	const actions = items.map((room) => roomCollection.updateOne({ _id: room._id }, {
+		$set: {
+			uids: getIds(room._id),
+		},
+	}));
+
+	const batch = Promise.all(actions);
+	if (actions.length === batchSize) {
+		await batch;
+		return migrateDMs(models, total, current + batchSize);
+	}
+
+	return batch;
+}
+
+Migrations.add({
+	version: 179,
+	up() {
+		const fut = new Future();
+
+		const roomCollection = Rooms.model.rawCollection();
+
+		Meteor.setTimeout(async () => {
+			const rooms = roomCollection.find({ t: 'd' });
+			const total = await rooms.count();
+			await rooms.close();
+
+			if (total < batchSize * 2) {
+				await migrateDMs({ roomCollection }, total, 0);
+				return fut.return();
+			}
+
+			console.log('Changing schema of Direct Message rooms, this may take a long time ...');
+
+			await migrateDMs({ roomCollection }, total, 0);
+
+			console.log('Changing schema of Direct Message rooms finished.');
+
+			fut.return();
+		}, 200);
+
+		fut.wait();
+	},
+});

From 29f03966ec3746f8a76e516ceacbe2eac252a8d2 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 26 Mar 2020 00:42:37 -0300
Subject: [PATCH 076/223] =?UTF-8?q?Fix:=202FA=20DDP=20method=20not=20getti?=
 =?UTF-8?q?ng=20code=20on=20API=20call=20that=20doesn=E2=80=99t=20requires?=
 =?UTF-8?q?=202FA=20(#16998)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/2fa/server/code/index.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/2fa/server/code/index.ts b/app/2fa/server/code/index.ts
index 233e86dded59..cdc12e6520ab 100644
--- a/app/2fa/server/code/index.ts
+++ b/app/2fa/server/code/index.ts
@@ -120,6 +120,11 @@ function _checkCodeForUser({ user, code, method, options = {}, connection }: ICh
 		user = getUserForCheck(user);
 	}
 
+	if (!code && !method && connection?.httpHeaders?.['x-2fa-code'] && connection.httpHeaders['x-2fa-method']) {
+		code = connection.httpHeaders['x-2fa-code'];
+		method = connection.httpHeaders['x-2fa-method'];
+	}
+
 	if (connection && isAuthorizedForToken(connection, user, options)) {
 		return true;
 	}

From 5355b8275b806f1fed48b1f636a1d779f3eb0383 Mon Sep 17 00:00:00 2001
From: Subham Sahoo <43502196+subham103@users.noreply.github.com>
Date: Thu, 26 Mar 2020 09:40:18 +0530
Subject: [PATCH 077/223] [FIX] Wrong message count statistics in Admin info
 page (#16680)

Co-authored-by: Gabriel Henriques <gabriel.henriques@rocket.chat>
Co-authored-by: Diego Sampaio <chinello@gmail.com>
---
 app/lib/server/functions/deleteMessage.js |  3 +++
 app/models/server/models/Messages.js      | 14 ++++++++++++--
 app/models/server/models/Rooms.js         |  7 +++++--
 app/statistics/server/lib/statistics.js   |  2 +-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/lib/server/functions/deleteMessage.js b/app/lib/server/functions/deleteMessage.js
index 4e80b52fb114..aeae4c11caa4 100644
--- a/app/lib/server/functions/deleteMessage.js
+++ b/app/lib/server/functions/deleteMessage.js
@@ -49,6 +49,9 @@ export const deleteMessage = function(message, user) {
 		}
 	}
 
+	// decrease message count
+	Rooms.decreaseMessageCountById(message.rid, 1);
+
 	if (showDeletedStatus) {
 		Messages.setAsDeletedByIdAndUser(message._id, user);
 	} else {
diff --git a/app/models/server/models/Messages.js b/app/models/server/models/Messages.js
index 5ba20bf50ff2..d9e686002da6 100644
--- a/app/models/server/models/Messages.js
+++ b/app/models/server/models/Messages.js
@@ -915,7 +915,12 @@ export class Messages extends Base {
 		}
 
 		if (!limit) {
-			return this.remove(query);
+			const count = this.remove(query);
+
+			// decrease message count
+			Rooms.decreaseMessageCountById(rid, count);
+
+			return count;
 		}
 
 		const messagesToDelete = this.find(query, {
@@ -925,11 +930,16 @@ export class Messages extends Base {
 			limit,
 		}).map(({ _id }) => _id);
 
-		return this.remove({
+		const count = this.remove({
 			_id: {
 				$in: messagesToDelete,
 			},
 		});
+
+		// decrease message count
+		Rooms.decreaseMessageCountById(rid, count);
+
+		return count;
 	}
 
 	removeByUserId(userId) {
diff --git a/app/models/server/models/Rooms.js b/app/models/server/models/Rooms.js
index a9034630737f..57cec3cac3eb 100644
--- a/app/models/server/models/Rooms.js
+++ b/app/models/server/models/Rooms.js
@@ -615,8 +615,7 @@ export class Rooms extends Base {
 		return this.update(query, update);
 	}
 
-	incMsgCountById(_id, inc) {
-		if (inc == null) { inc = 1; }
+	incMsgCountById(_id, inc = 1) {
 		const query = { _id };
 
 		const update = {
@@ -648,6 +647,10 @@ export class Rooms extends Base {
 		return this.update(query, update);
 	}
 
+	decreaseMessageCountById(_id, count = 1) {
+		return this.incMsgCountById(_id, -count);
+	}
+
 	incUsersCountById(_id, inc = 1) {
 		const query = { _id };
 
diff --git a/app/statistics/server/lib/statistics.js b/app/statistics/server/lib/statistics.js
index 251cf2d146ef..c7b79f75948e 100644
--- a/app/statistics/server/lib/statistics.js
+++ b/app/statistics/server/lib/statistics.js
@@ -87,11 +87,11 @@ export const statistics = {
 		statistics.livechatEnabled = settings.get('Livechat_enabled');
 
 		// Message statistics
-		statistics.totalMessages = Messages.find().count();
 		statistics.totalChannelMessages = _.reduce(Rooms.findByType('c', { fields: { msgs: 1 } }).fetch(), function _countChannelMessages(num, room) { return num + room.msgs; }, 0);
 		statistics.totalPrivateGroupMessages = _.reduce(Rooms.findByType('p', { fields: { msgs: 1 } }).fetch(), function _countPrivateGroupMessages(num, room) { return num + room.msgs; }, 0);
 		statistics.totalDirectMessages = _.reduce(Rooms.findByType('d', { fields: { msgs: 1 } }).fetch(), function _countDirectMessages(num, room) { return num + room.msgs; }, 0);
 		statistics.totalLivechatMessages = _.reduce(Rooms.findByType('l', { fields: { msgs: 1 } }).fetch(), function _countLivechatMessages(num, room) { return num + room.msgs; }, 0);
+		statistics.totalMessages = statistics.totalChannelMessages + statistics.totalPrivateGroupMessages + statistics.totalDirectMessages + statistics.totalLivechatMessages;
 
 		// Federation statistics
 		const federationOverviewData = federationGetStatistics();

From 2d4e5ca4a6874d8af3598ef2841bee96e95b9ded Mon Sep 17 00:00:00 2001
From: Subham Sahoo <43502196+subham103@users.noreply.github.com>
Date: Thu, 26 Mar 2020 09:48:46 +0530
Subject: [PATCH 078/223] [NEW] Sort channel directory listing by latest
 message (#16604)

Co-authored-by: Diego Sampaio <chinello@gmail.com>
---
 app/ui/client/views/app/directory.html | 4 ++--
 server/methods/browseChannels.js       | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/ui/client/views/app/directory.html b/app/ui/client/views/app/directory.html
index f2990d38bf8d..a9c729f6b159 100644
--- a/app/ui/client/views/app/directory.html
+++ b/app/ui/client/views/app/directory.html
@@ -45,8 +45,8 @@
 								<div class="table-fake-th"><span>{{_ "Users"}}</span> {{> icon icon=(sortIcon 'usersCount')}}</div>
 							</th>
 							{{#if showLastMessage}}
-							<th class="table-column-date">
-								<div class="table-fake-th">{{_ "Last_Message"}}</div>
+							<th class="table-column-date js-sort {{#if searchSortBy 'lastMessage'}}is-sorting{{/if}}" data-sort="lastMessage">
+								<div class="table-fake-th"><span>{{_ "Last_Message"}}</span> {{> icon icon=(sortIcon 'lastMessage')}}</div>
 							</th>
 							{{/if}}
 							<th class="js-sort table-column-date {{#if searchSortBy 'createdAt'}}is-sorting{{/if}}" data-sort="createdAt">
diff --git a/server/methods/browseChannels.js b/server/methods/browseChannels.js
index 0bb2e41362de..a0b61baad54c 100644
--- a/server/methods/browseChannels.js
+++ b/server/methods/browseChannels.js
@@ -15,6 +15,10 @@ const sortChannels = function(field, direction) {
 			return {
 				ts: direction === 'asc' ? 1 : -1,
 			};
+		case 'lastMessage':
+			return {
+				'lastMessage.ts': direction === 'asc' ? 1 : -1,
+			};
 		default:
 			return {
 				[field]: direction === 'asc' ? 1 : -1,
@@ -51,7 +55,7 @@ Meteor.methods({
 			return;
 		}
 
-		if (!['name', 'createdAt', 'usersCount', ...type === 'channels' ? ['usernames'] : [], ...type === 'users' ? ['username', 'email'] : []].includes(sortBy)) {
+		if (!['name', 'createdAt', 'usersCount', ...type === 'channels' ? ['usernames', 'lastMessage'] : [], ...type === 'users' ? ['username', 'email'] : []].includes(sortBy)) {
 			return;
 		}
 

From 0cf6dbd2b6e66fb3bc2b81ee6b1763bcf0306167 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Thu, 26 Mar 2020 02:13:16 -0300
Subject: [PATCH 079/223] Group DM improvements

---
 .../client/views/app/CreateDirectMessage.js   |  3 +++
 server/startup/migrations/v179.js             | 19 ++++++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/ui/client/views/app/CreateDirectMessage.js b/app/ui/client/views/app/CreateDirectMessage.js
index 667a4e63d49a..3370559e1024 100755
--- a/app/ui/client/views/app/CreateDirectMessage.js
+++ b/app/ui/client/views/app/CreateDirectMessage.js
@@ -1,6 +1,7 @@
 import { Tracker } from 'meteor/tracker';
 import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
+import { ReactiveVar } from 'meteor/reactive-var';
 
 import { roomTypes } from '../../../../utils/client';
 import { call } from '../../../../ui-utils/client';
@@ -83,6 +84,8 @@ Template.CreateDirectMessage.onRendered(function() {
 });
 
 Template.CreateDirectMessage.onCreated(function() {
+	this.selectedUsers = new ReactiveVar([]);
+
 	this.onSelectUser = ({ item: user }) => {
 		if (user.username === Meteor.user().username) {
 			return;
diff --git a/server/startup/migrations/v179.js b/server/startup/migrations/v179.js
index a7e4d81a3b62..cf275527edd5 100644
--- a/server/startup/migrations/v179.js
+++ b/server/startup/migrations/v179.js
@@ -41,13 +41,22 @@ async function migrateDMs(models, total, current) {
 
 	const items = await roomCollection.find({ t: 'd', uids: { $exists: false } }, { fields: { _id: 1 } }).limit(batchSize).toArray();
 
-	const actions = items.map((room) => roomCollection.updateOne({ _id: room._id }, {
-		$set: {
-			uids: getIds(room._id),
+	const actions = items.map((room) => ({
+		updateOne: {
+			filter: { _id: room._id },
+			update: {
+				$set: {
+					uids: getIds(room._id),
+				},
+			},
 		},
 	}));
 
-	const batch = Promise.all(actions);
+	if (actions.length === 0) {
+		return;
+	}
+
+	const batch = await roomCollection.bulkWrite(actions, { ordered: false });
 	if (actions.length === batchSize) {
 		await batch;
 		return migrateDMs(models, total, current + batchSize);
@@ -68,7 +77,7 @@ Migrations.add({
 			const total = await rooms.count();
 			await rooms.close();
 
-			if (total < batchSize * 2) {
+			if (total < batchSize * 10) {
 				await migrateDMs({ roomCollection }, total, 0);
 				return fut.return();
 			}

From 328f0ecb50c8be6abd6cfafc25d4bf179253597b Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Thu, 26 Mar 2020 16:09:26 -0300
Subject: [PATCH 080/223] Regression: Fix issue with opening rooms (#17028)

---
 app/lib/server/functions/createDirectRoom.js               | 4 ++--
 app/models/server/models/Rooms.js                          | 2 +-
 app/ui-cached-collection/client/models/CachedCollection.js | 2 +-
 app/ui-utils/client/lib/RoomManager.js                     | 6 +++++-
 packages/rocketchat-i18n/i18n/en.i18n.json                 | 2 +-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/lib/server/functions/createDirectRoom.js b/app/lib/server/functions/createDirectRoom.js
index ae1ee8b20c4c..c8b5cd5cf081 100644
--- a/app/lib/server/functions/createDirectRoom.js
+++ b/app/lib/server/functions/createDirectRoom.js
@@ -35,8 +35,8 @@ export const createDirectRoom = function(members, roomExtraData = {}, options =
 
 	// Deprecated: using users' _id to compose the room _id is deprecated
 	const room = uids.length <= 2
-		? Rooms.findById(uids.join(''), { fields: { _id: 1 } })
-		: Rooms.findDirectRoomContainingAllUserIDs(uids, { fields: { _id: 1 } });
+		? Rooms.findOneById(uids.join(''), { fields: { _id: 1 } })
+		: Rooms.findOneDirectRoomContainingAllUserIDs(uids, { fields: { _id: 1 } });
 
 	const isNewRoom = !room;
 
diff --git a/app/models/server/models/Rooms.js b/app/models/server/models/Rooms.js
index 57cec3cac3eb..50b2568d735c 100644
--- a/app/models/server/models/Rooms.js
+++ b/app/models/server/models/Rooms.js
@@ -476,7 +476,7 @@ export class Rooms extends Base {
 		return this.findOne(query, options);
 	}
 
-	findDirectRoomContainingAllUserIDs(uid, options) {
+	findOneDirectRoomContainingAllUserIDs(uid, options) {
 		const query = {
 			t: 'd',
 			uids: { $size: uid.length, $all: uid },
diff --git a/app/ui-cached-collection/client/models/CachedCollection.js b/app/ui-cached-collection/client/models/CachedCollection.js
index ea305ba81c00..f6c21c91049a 100644
--- a/app/ui-cached-collection/client/models/CachedCollection.js
+++ b/app/ui-cached-collection/client/models/CachedCollection.js
@@ -131,7 +131,7 @@ export class CachedCollection extends EventEmitter {
 		userRelated = true,
 		listenChangesForLoggedUsersOnly = false,
 		useSync = true,
-		version = 8,
+		version = 9,
 		maxCacheTime = 60 * 60 * 24 * 30,
 		onSyncData = (/* action, record */) => {},
 	}) {
diff --git a/app/ui-utils/client/lib/RoomManager.js b/app/ui-utils/client/lib/RoomManager.js
index da748a3e7326..0a9460c01b28 100644
--- a/app/ui-utils/client/lib/RoomManager.js
+++ b/app/ui-utils/client/lib/RoomManager.js
@@ -141,7 +141,11 @@ export const RoomManager = new function() {
 				openedRooms[typeName].ready = false;
 				openedRooms[typeName].active = false;
 				if (openedRooms[typeName].template != null) {
-					Blaze.remove(openedRooms[typeName].template);
+					try {
+						Blaze.remove(openedRooms[typeName].template);
+					} catch (e) {
+						console.error('Error removing template from DOM', e);
+					}
 				}
 				delete openedRooms[typeName].dom;
 				delete openedRooms[typeName].template;
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index ef37f627eed1..5c8e260d2f98 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1140,7 +1140,7 @@
   "Desktop_Notifications_Not_Enabled": "Desktop Notifications are Not Enabled",
   "Details": "Details",
   "Different_Style_For_User_Mentions": "Different style for user mentions",
-  "Direct_message_creation_description" : "You are about to create a chat with multiple users. Add the ones you would like to talk, everyone in te same place, using direct messages.",
+  "Direct_message_creation_description" : "You are about to create a chat with multiple users. Add the ones you would like to talk, everyone in the same place, using direct messages.",
   "Direct_message_you_have_joined": "You have joined a new direct message with",
   "Direct_message_someone": "Direct message someone",
   "Direct_Messages": "Direct Messages",

From 4fadecefd179c6d2b32475eec2fcc1f91d7042ab Mon Sep 17 00:00:00 2001
From: Douglas Gubert <d-gubert@users.noreply.github.com>
Date: Thu, 26 Mar 2020 17:34:31 -0300
Subject: [PATCH 081/223] Regression: Small fixes for Game Center (#17018)

Co-authored-by: Diego Sampaio <chinello@gmail.com>
---
 app/apps/client/gameCenter/gameCenter.js      |  7 +++---
 app/apps/client/gameCenter/gameContainer.html |  2 +-
 app/apps/client/gameCenter/invitePlayers.js   | 22 ++++++++++++++-----
 app/apps/client/gameCenter/tabBar.js          |  8 ++-----
 app/livestream/client/tabBar.js               |  8 +++++--
 app/ui-utils/client/lib/TabBar.js             | 17 ++++++++++++++
 packages/rocketchat-i18n/i18n/en.i18n.json    |  7 +++---
 packages/rocketchat-i18n/i18n/pt-BR.i18n.json |  2 +-
 packages/rocketchat-i18n/i18n/zh.i18n.json    |  2 +-
 9 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/app/apps/client/gameCenter/gameCenter.js b/app/apps/client/gameCenter/gameCenter.js
index 91e092b4f97a..c7eef85de989 100644
--- a/app/apps/client/gameCenter/gameCenter.js
+++ b/app/apps/client/gameCenter/gameCenter.js
@@ -1,16 +1,15 @@
-import toastr from 'toastr';
 import { Template } from 'meteor/templating';
 import { ReactiveVar } from 'meteor/reactive-var';
 
 import { modal } from '../../../ui-utils/client';
-import { APIClient, t } from '../../../utils/client';
+import { APIClient, t, handleError } from '../../../utils/client';
 
 const getExternalComponents = async (instance) => {
 	try {
 		const { externalComponents } = await APIClient.get('apps/externalComponents');
 		instance.games.set(externalComponents);
 	} catch (e) {
-		toastr.error((e.xhr.responseJSON && e.xhr.responseJSON.error) || e.message);
+		handleError(e);
 	}
 
 	instance.isLoading.set(false);
@@ -98,7 +97,7 @@ Template.GameCenter.events({
 	'click .js-invite'(event) {
 		event.stopPropagation();
 		modal.open({
-			title: t('Invite You Friends to Join'),
+			title: t('Apps_Game_Center_Invite_Friends'),
 			content: 'InvitePlayers',
 			data: this,
 			confirmOnEnter: false,
diff --git a/app/apps/client/gameCenter/gameContainer.html b/app/apps/client/gameCenter/gameContainer.html
index 6bbb136df0ed..7955cc95577d 100644
--- a/app/apps/client/gameCenter/gameContainer.html
+++ b/app/apps/client/gameCenter/gameContainer.html
@@ -5,7 +5,7 @@
 			{{#if showBackButton}}
 			<button
 				class="rc-button rc-button--nude contextual-bar__header-back-btn js-back"
-				title="{{_ 'Back_to_Game_Center'}}"
+				title="{{_ 'Apps_Game_Center_Back'}}"
 			>
 				<i class="icon-angle-left"></i>
 			</button>
diff --git a/app/apps/client/gameCenter/invitePlayers.js b/app/apps/client/gameCenter/invitePlayers.js
index 31616bbf3862..1f0b6f07455e 100644
--- a/app/apps/client/gameCenter/invitePlayers.js
+++ b/app/apps/client/gameCenter/invitePlayers.js
@@ -4,6 +4,8 @@ import { Template } from 'meteor/templating';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Blaze } from 'meteor/blaze';
 import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
+import { Tracker } from 'meteor/tracker';
+import { Session } from 'meteor/session';
 
 import { AutoComplete } from '../../../meteor-autocomplete/client';
 import { roomTypes } from '../../../utils/client';
@@ -79,15 +81,23 @@ Template.InvitePlayers.events({
 
 			roomTypes.openRouteLink(result.t, result);
 
-			// setTimeout ensures the message is only sent after the
+			// This ensures the message is only sent after the
 			// user has been redirected to the new room, preventing a
 			// weird bug that made the message appear as unsent until
 			// the screen gets refreshed
-			setTimeout(() => call('sendMessage', {
-				_id: Random.id(),
-				rid: result.rid,
-				msg: TAPi18n.__('Game_Center_Play_Game_Together', { name }),
-			}), 100);
+			Tracker.autorun((c) => {
+				if (Session.get('openedRoom') !== result.rid) {
+					return;
+				}
+
+				call('sendMessage', {
+					_id: Random.id(),
+					rid: result.rid,
+					msg: TAPi18n.__('Apps_Game_Center_Play_Game_Together', { name }),
+				});
+
+				c.stop();
+			});
 
 			modal.close();
 		} catch (err) {
diff --git a/app/apps/client/gameCenter/tabBar.js b/app/apps/client/gameCenter/tabBar.js
index 0d5aff24c957..fe5883119c97 100644
--- a/app/apps/client/gameCenter/tabBar.js
+++ b/app/apps/client/gameCenter/tabBar.js
@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 
 import { APIClient } from '../../../utils/client';
-import { TabBar, TABBAR_DEFAULT_VISIBLE_ICON_COUNT } from '../../../ui-utils/client';
+import { TabBar } from '../../../ui-utils/client';
 import { settings } from '../../../settings/client';
 
 import './gameCenter.html';
@@ -10,23 +10,19 @@ import './gameCenter.html';
 Meteor.startup(function() {
 	Tracker.autorun(async function() {
 		if (!settings.get('Apps_Game_Center_enabled')) {
-			TabBar.size = TABBAR_DEFAULT_VISIBLE_ICON_COUNT;
 			return TabBar.removeButton('gameCenter');
 		}
 
 		const { externalComponents } = await APIClient.get('apps/externalComponents');
 
 		if (!externalComponents.length) {
-			TabBar.size = TABBAR_DEFAULT_VISIBLE_ICON_COUNT;
 			return TabBar.removeButton('gameCenter');
 		}
 
-		TabBar.size = TABBAR_DEFAULT_VISIBLE_ICON_COUNT + 1;
-
 		TabBar.addButton({
 			groups: ['channel', 'group', 'direct'],
 			id: 'gameCenter',
-			i18nTitle: 'Game_Center',
+			i18nTitle: 'Apps_Game_Center',
 			icon: 'game',
 			template: 'GameCenter',
 			order: -1,
diff --git a/app/livestream/client/tabBar.js b/app/livestream/client/tabBar.js
index 1ebd068b2719..a1041cac5256 100644
--- a/app/livestream/client/tabBar.js
+++ b/app/livestream/client/tabBar.js
@@ -10,8 +10,12 @@ Meteor.startup(function() {
 	Tracker.autorun(function() {
 		TabBar.removeButton('livestream');
 		if (settings.get('Livestream_enabled')) {
-			const live = Rooms.findOne({ _id: Session.get('openedRoom'), 'streamingOptions.type': 'livestream', 'streamingOptions.id': { $exists: 1 } }, { fields: { streamingOptions: 1 } });
-			TabBar.size = live ? 5 : 4;
+			const live = Rooms.findOne({
+				_id: Session.get('openedRoom'),
+				'streamingOptions.type': 'livestream',
+				'streamingOptions.id': { $exists: 1 },
+			}, { fields: { streamingOptions: 1 } });
+
 			return TabBar.addButton({
 				groups: ['channel', 'group'],
 				id: 'livestream',
diff --git a/app/ui-utils/client/lib/TabBar.js b/app/ui-utils/client/lib/TabBar.js
index b9ec9039e3d7..15568d7be4e9 100644
--- a/app/ui-utils/client/lib/TabBar.js
+++ b/app/ui-utils/client/lib/TabBar.js
@@ -1,5 +1,6 @@
 import _ from 'underscore';
 import { ReactiveVar } from 'meteor/reactive-var';
+import { Tracker } from 'meteor/tracker';
 
 export const TABBAR_DEFAULT_VISIBLE_ICON_COUNT = 4;
 
@@ -38,12 +39,28 @@ export const TabBar = new class TabBar {
 			btns[config.id].groups = _.union(btns[config.id].groups || [], this.extraGroups[config.id]);
 		}
 
+		// When you add a button with an order value of -1
+		// we assume you want to force the visualization of your button
+		// so we increase the number of buttons that are shown so you
+		// don't end up hiding any of the default ones
+		if (config.order === -1) {
+			Tracker.nonreactive(() => this.size++);
+		}
+
 		this.buttons.set(btns);
 	}
 
 	removeButton(id) {
 		const btns = this.buttons.curValue;
+
+		// Here we decrease the shown count as your
+		// button is no longer present
+		if (btns[id] && btns[id].order === -1) {
+			Tracker.nonreactive(() => this.size--);
+		}
+
 		delete btns[id];
+
 		this.buttons.set(btns);
 	}
 
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 5c8e260d2f98..dd9a3327143c 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -392,7 +392,11 @@
   "Apps_Framework_Development_Mode": "Enable development mode",
   "Apps_Framework_Development_Mode_Description": "Development mode allows the installation of Apps that are not from the Rocket.Chat's Marketplace.",
   "Apps_Framework_enabled": "Enable the App Framework",
+  "Apps_Game_Center": "Game Center",
+  "Apps_Game_Center_Back": "Back to Game Center",
   "Apps_Game_Center_enabled": "Enable the Game Center",
+  "Apps_Game_Center_Play_Game_Together": "@here Let's play __name__ together!",
+  "Apps_Game_Center_Invite_Friends": "Invite your friends to join",
   "Apps_Marketplace_Deactivate_App_Prompt": "Do you really want to disable this app?",
   "Apps_Marketplace_Modify_App_Subscription": "Modify Subscription",
   "Apps_Marketplace_Uninstall_App_Prompt": "Do you really want to uninstall this app?",
@@ -495,7 +499,6 @@
   "Back": "Back",
   "Back_to_applications": "Back to applications",
   "Back_to_chat": "Back to chat",
-  "Back_to_Game_Center": "Back to Game Center",
   "Back_to_imports": "Back to imports",
   "Back_to_integration_detail": "Back to the integration detail",
   "Back_to_integrations": "Back to integrations",
@@ -1612,8 +1615,6 @@
   "From_Email": "From Email",
   "From_email_warning": "<b>Warning</b>: The field <b>From</b> is subject to your mail server settings.",
   "Full_Screen": "Full Screen",
-  "Game_Center": "Game Center",
-  "Game_Center_Play_Game_Together": "@here Let's play __name__ together!",
   "Gaming": "Gaming",
   "General": "General",
   "Get_link": "Get Link",
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index 1b7210b17d34..e26ed0ea5829 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -370,6 +370,7 @@
   "Apps_Engine_Version": "Versão da Apps Engine",
   "Apps_Framework_Development_Mode": "Habilitar modo de desenvolvimento",
   "Apps_Framework_enabled": "Ativar o App Framework",
+  "Apps_Game_Center": "Game Center",
   "Apps_Game_Center_enabled": "Habilitar Game Center",
   "Apps_Settings": "Configurações da aplicação",
   "Apps_WhatIsIt": "Apps: o que são eles?",
@@ -1476,7 +1477,6 @@
   "From_Email": "Email De",
   "From_email_warning": "<b>Aviso</b>: O campo <b>De</b> está sujeito às configurações do seu servidor de emails.",
   "Full_Screen": "Tela cheia",
-  "Game_Center": "Game Center",
   "Gaming": "Jogos",
   "General": "Geral",
   "Get_link": "Obter Link",
diff --git a/packages/rocketchat-i18n/i18n/zh.i18n.json b/packages/rocketchat-i18n/i18n/zh.i18n.json
index 735d4d3d1517..273c4640ecdd 100644
--- a/packages/rocketchat-i18n/i18n/zh.i18n.json
+++ b/packages/rocketchat-i18n/i18n/zh.i18n.json
@@ -374,6 +374,7 @@
   "Apps_Framework_Development_Mode": "启用开发模式",
   "Apps_Framework_Development_Mode_Description": "开发模式允许您安装那些不在 Rocket.Chat 市场中的应用。",
   "Apps_Framework_enabled": "启用应用框架",
+  "Apps_Game_Center": "游戏中心",
   "Apps_Game_Center_enabled": "启用游戏中心",
   "Apps_Marketplace_Deactivate_App_Prompt": "是否确定要禁用此应用程序？",
   "Apps_Marketplace_Modify_App_Subscription": "修改订阅",
@@ -1551,7 +1552,6 @@
   "From_Email": "从电子邮件",
   "From_email_warning": "<b>警告</b>：<b>From</b> 字段来自于邮件服务器的设置。",
   "Full_Screen": "全屏",
-  "Game_Center": "游戏中心",
   "Gaming": "游戏",
   "General": "通用",
   "Get_link": "获取链接",

From 951a06e5aec08d78ffc22bec7e3ab6dd354305ac Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Thu, 26 Mar 2020 03:07:31 -0300
Subject: [PATCH 082/223] Bump version to 3.1.0-rc.0

---
 .docker/Dockerfile.rhel   |   2 +-
 .github/history.json      |   2 +-
 HISTORY.md                | 169 ++++++++++++++++++++++++++++++++++++++
 app/utils/rocketchat.info |   2 +-
 package.json              |   2 +-
 5 files changed, 173 insertions(+), 4 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 3c765d8ffeff..619924060341 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.1.0-develop
+ENV RC_VERSION 3.1.0-rc.0
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index 8352e9effef3..dd48d2729376 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -40069,4 +40069,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/HISTORY.md b/HISTORY.md
index e5eea1c8a5c0..79c3b30f71b4 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,173 @@
 
+# 3.1.0 (Under Release Candidate Process)
+
+## 3.1.0-rc.0
+`2020-03-26  ·  20 🎉  ·  16 🚀  ·  44 🐛  ·  29 🔍  ·  34 👩‍💻👨‍💻`
+
+### 🎉 New features
+
+- Sort channel directory listing by latest message ([#16604](https://github.com/RocketChat/Rocket.Chat/pull/16604) by [@subham103](https://github.com/subham103))
+- Direct message between multiple users ([#16761](https://github.com/RocketChat/Rocket.Chat/pull/16761))
+- [ENTERPRISE] Engagement Dashboard ([#16960](https://github.com/RocketChat/Rocket.Chat/pull/16960))
+- Synchronize saml roles to local user (#16152) ([#16158](https://github.com/RocketChat/Rocket.Chat/pull/16158) by [@col-panic](https://github.com/col-panic))
+- Route to get updated roles after a date ([#16610](https://github.com/RocketChat/Rocket.Chat/pull/16610) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+- Enterprise Edition ([#16944](https://github.com/RocketChat/Rocket.Chat/pull/16944))
+- Settings to enable E2E encryption for Private and Direct Rooms by default ([#16928](https://github.com/RocketChat/Rocket.Chat/pull/16928))
+- Experimental Game Center (externalComponents implementation) ([#15123](https://github.com/RocketChat/Rocket.Chat/pull/15123))
+- Add default chat closing tags in Omnichannel departments ([#16859](https://github.com/RocketChat/Rocket.Chat/pull/16859))
+- Allow to set default department and location sharing on SMS / WhatsApp integration ([#16557](https://github.com/RocketChat/Rocket.Chat/pull/16557))
+- Two Factor authentication via email ([#15949](https://github.com/RocketChat/Rocket.Chat/pull/15949))
+- Add new Omnichannel department forwarding callback ([#16779](https://github.com/RocketChat/Rocket.Chat/pull/16779))
+- Translation via MS translate ([#16363](https://github.com/RocketChat/Rocket.Chat/pull/16363) by [@mrsimpson](https://github.com/mrsimpson))
+- API `users.deactivateIdle` for mass-disabling of idle users ([#16849](https://github.com/RocketChat/Rocket.Chat/pull/16849))
+- API to logout from other locations ([#16193](https://github.com/RocketChat/Rocket.Chat/pull/16193) by [@jschirrmacher](https://github.com/jschirrmacher))
+- SAML config to allow clock drift ([#16751](https://github.com/RocketChat/Rocket.Chat/pull/16751) by [@localguru](https://github.com/localguru))
+- Update Meteor to 1.9.2 and Node to 12.16.1 ([#16718](https://github.com/RocketChat/Rocket.Chat/pull/16718))
+- Add methods to include room types on dashboard ([#16576](https://github.com/RocketChat/Rocket.Chat/pull/16576))
+- Save default filters in the Omnichannel Current Chats list ([#16653](https://github.com/RocketChat/Rocket.Chat/pull/16653))
+- Open the Visitor Info panel automatically when the agent enters an Omnichannel room ([#16496](https://github.com/RocketChat/Rocket.Chat/pull/16496))
+
+### 🚀 Improvements
+
+- Ability to change offline message button link on emails notifications ([#16784](https://github.com/RocketChat/Rocket.Chat/pull/16784))
+- Update ancestral departments when an Omnichannel room is forwarded to another department ([#16958](https://github.com/RocketChat/Rocket.Chat/pull/16958))
+- Allow login of non LDAP users when LDAP is enabled ([#16949](https://github.com/RocketChat/Rocket.Chat/pull/16949))
+- Omnichannel aggregations performance improvements ([#16755](https://github.com/RocketChat/Rocket.Chat/pull/16755))
+- Replace the Department select component by an Autocomplete input in Omnichannel UI ([#16669](https://github.com/RocketChat/Rocket.Chat/pull/16669))
+- User gets feedback when a message has been starred or unstarred ([#13860](https://github.com/RocketChat/Rocket.Chat/pull/13860) by [@fliptrail](https://github.com/fliptrail))
+- Added border to page header. ([#16792](https://github.com/RocketChat/Rocket.Chat/pull/16792))
+- Context menu autofocus ([#16915](https://github.com/RocketChat/Rocket.Chat/pull/16915))
+- Add option to require authentication on user's shield endpoint ([#16845](https://github.com/RocketChat/Rocket.Chat/pull/16845))
+- Apps-engine E2E tests ([#16781](https://github.com/RocketChat/Rocket.Chat/pull/16781))
+- Rename client-side term "Livechat" to "Omnichannel" ([#16752](https://github.com/RocketChat/Rocket.Chat/pull/16752))
+- Accept open formarts of text, spreadsheet, presentation for upload by default ([#16502](https://github.com/RocketChat/Rocket.Chat/pull/16502))
+- Add message_pruned and file_pruned for singular file or message deleted ([#16322](https://github.com/RocketChat/Rocket.Chat/pull/16322) by [@ritwizsinha](https://github.com/ritwizsinha))
+- Added autofocus to Directory ([#16217](https://github.com/RocketChat/Rocket.Chat/pull/16217) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+- Added timer in video message recorder ([#16221](https://github.com/RocketChat/Rocket.Chat/pull/16221) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+- Removed the 'reply in thread' from thread replies ([#16630](https://github.com/RocketChat/Rocket.Chat/pull/16630) by [@ritwizsinha](https://github.com/ritwizsinha))
+
+### 🐛 Bug fixes
+
+- Wrong message count statistics in Admin info page ([#16680](https://github.com/RocketChat/Rocket.Chat/pull/16680) by [@subham103](https://github.com/subham103))
+- CAS ignores username attribute map ([#16942](https://github.com/RocketChat/Rocket.Chat/pull/16942) by [@pmayer](https://github.com/pmayer))
+- Adding margin to click to load text ([#16210](https://github.com/RocketChat/Rocket.Chat/pull/16210) by [@ritwizsinha](https://github.com/ritwizsinha))
+- Explicitly set text of confirmation button ([#16138](https://github.com/RocketChat/Rocket.Chat/pull/16138) by [@jschirrmacher](https://github.com/jschirrmacher))
+- Display user status along with icon ([#16875](https://github.com/RocketChat/Rocket.Chat/pull/16875) by [@Nikhil713](https://github.com/Nikhil713))
+- users.setStatus and user from params ([#16128](https://github.com/RocketChat/Rocket.Chat/pull/16128) by [@rm-yakovenko](https://github.com/rm-yakovenko))
+- Text formatted to remain within button even on screen resize  ([#14136](https://github.com/RocketChat/Rocket.Chat/pull/14136) by [@Rodriq](https://github.com/Rodriq))
+- Messages doesn't send to Slack via SlackBridge after renaming channel ([#16565](https://github.com/RocketChat/Rocket.Chat/pull/16565) by [@antkaz](https://github.com/antkaz))
+- Remove Reply in DM from Omnichannel rooms ([#16957](https://github.com/RocketChat/Rocket.Chat/pull/16957) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+- Login with LinkedIn not mapping name and picture correctly ([#16955](https://github.com/RocketChat/Rocket.Chat/pull/16955))
+- Make the AppLivechatBridge.createMessage works properly as a promise ([#16941](https://github.com/RocketChat/Rocket.Chat/pull/16941))
+- Omnichannel Inquiry names not being updated when the guest name changes ([#16782](https://github.com/RocketChat/Rocket.Chat/pull/16782))
+- Real-time data rendering on Omnichannel room info panel  ([#16783](https://github.com/RocketChat/Rocket.Chat/pull/16783))
+- Show error message if password and confirm password not equal  ([#16247](https://github.com/RocketChat/Rocket.Chat/pull/16247) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+- Message quote button inside threads ([#16925](https://github.com/RocketChat/Rocket.Chat/pull/16925))
+- admin can sort users by email in directory view ([#15796](https://github.com/RocketChat/Rocket.Chat/pull/15796) by [@sneakson](https://github.com/sneakson))
+- Pinned messages wouldn't collapse ([#16188](https://github.com/RocketChat/Rocket.Chat/pull/16188))
+- Correct thread messages display in context bar. ([#16835](https://github.com/RocketChat/Rocket.Chat/pull/16835) by [@ritwizsinha](https://github.com/ritwizsinha))
+- Public channel cannot be accessed via URL when 'Allow Anonymous Read' is active ([#16914](https://github.com/RocketChat/Rocket.Chat/pull/16914) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+- Custom OAuth Bug ([#16811](https://github.com/RocketChat/Rocket.Chat/pull/16811) by [@PrajvalRaval](https://github.com/PrajvalRaval))
+- Facebook integration missing visitor data after registerGuest ([#16810](https://github.com/RocketChat/Rocket.Chat/pull/16810) by [@antkaz](https://github.com/antkaz))
+- Invite links counting users already joined ([#16591](https://github.com/RocketChat/Rocket.Chat/pull/16591) by [@ritwizsinha](https://github.com/ritwizsinha))
+- No settings to be displayed if search not found ([#16255](https://github.com/RocketChat/Rocket.Chat/pull/16255) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+- Removed some hardcoded texts ([#16304](https://github.com/RocketChat/Rocket.Chat/pull/16304) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+- Cannot unfollow message from thread's panel ([#16560](https://github.com/RocketChat/Rocket.Chat/pull/16560) by [@subham103](https://github.com/subham103))
+- Fallback content-type as application/octet-stream for FileSystem uploads ([#16776](https://github.com/RocketChat/Rocket.Chat/pull/16776) by [@georgmu](https://github.com/georgmu))
+- Remove spaces from i18n placeholders to show Personal access token ([#16724](https://github.com/RocketChat/Rocket.Chat/pull/16724) by [@harakiwi1](https://github.com/harakiwi1))
+- Slash command preview: Wrong item being selected, Horizontal scroll ([#16750](https://github.com/RocketChat/Rocket.Chat/pull/16750))
+- Cannot pin on direct messages ([#16759](https://github.com/RocketChat/Rocket.Chat/pull/16759) by [@ritwizsinha](https://github.com/ritwizsinha))
+- Get all channels from Slack via REST API ([#16767](https://github.com/RocketChat/Rocket.Chat/pull/16767) by [@antkaz](https://github.com/antkaz))
+- Flextab information is not working when clicking on visitor or agent username in Omnichannel messages ([#16797](https://github.com/RocketChat/Rocket.Chat/pull/16797) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+- Slackbridge-import command doesn't work ([#16645](https://github.com/RocketChat/Rocket.Chat/pull/16645) by [@antkaz](https://github.com/antkaz))
+- Cannot edit Profile when Full Name is empty and not required ([#16744](https://github.com/RocketChat/Rocket.Chat/pull/16744))
+- Color setting editing issues ([#16706](https://github.com/RocketChat/Rocket.Chat/pull/16706))
+- Console error on login ([#16704](https://github.com/RocketChat/Rocket.Chat/pull/16704))
+- Delete messages while searching bug ([#16568](https://github.com/RocketChat/Rocket.Chat/pull/16568) by [@karimelghazouly](https://github.com/karimelghazouly))
+- Correctly aligned input element of custom user status component ([#16151](https://github.com/RocketChat/Rocket.Chat/pull/16151) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+- "Jump to message" is rendered twice when message is starred. ([#16170](https://github.com/RocketChat/Rocket.Chat/pull/16170) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+- If InternalHubot_Username is undefined then rocket.cat should be default bot ([#16371](https://github.com/RocketChat/Rocket.Chat/pull/16371) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+- Bug making us to reload the page after cancel was clicked on editing ([#16315](https://github.com/RocketChat/Rocket.Chat/pull/16315) by [@ritwizsinha](https://github.com/ritwizsinha))
+- File uploads out of threads are not visible in regular message view ([#16416](https://github.com/RocketChat/Rocket.Chat/pull/16416) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+- Added an option to pin/unpin a thread message ([#16457](https://github.com/RocketChat/Rocket.Chat/pull/16457) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+- Changed Opt_In message, removed translations ([#16631](https://github.com/RocketChat/Rocket.Chat/pull/16631))
+- Additional scroll when contextual bar is open ([#16667](https://github.com/RocketChat/Rocket.Chat/pull/16667))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+- Fix: 2FA DDP method not getting code on API call that doesn’t requires 2FA ([#16998](https://github.com/RocketChat/Rocket.Chat/pull/16998))
+- Fix StreamCast info ([#16995](https://github.com/RocketChat/Rocket.Chat/pull/16995))
+- Fix: StreamCast was not working correctly ([#16983](https://github.com/RocketChat/Rocket.Chat/pull/16983))
+- Change license version requested ([#16956](https://github.com/RocketChat/Rocket.Chat/pull/16956))
+- Fix: Padding required in the Facebook Messenger option in Livechat ([#16202](https://github.com/RocketChat/Rocket.Chat/pull/16202) by [@ritwizsinha](https://github.com/ritwizsinha))
+- Add some missing ES translations ([#16120](https://github.com/RocketChat/Rocket.Chat/pull/16120) by [@ivanape](https://github.com/ivanape))
+- Redirected to home when a room has been deleted instead of getting broken link(blank page) of deleted room ([#16227](https://github.com/RocketChat/Rocket.Chat/pull/16227) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+- Fixed translate variable in UnarchiveRoom Modal ([#16310](https://github.com/RocketChat/Rocket.Chat/pull/16310) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+- Update cypress to version 4.0.2 ([#16685](https://github.com/RocketChat/Rocket.Chat/pull/16685))
+- Update presence package ([#16786](https://github.com/RocketChat/Rocket.Chat/pull/16786))
+- Add an index to the name field for omnichannel department ([#16953](https://github.com/RocketChat/Rocket.Chat/pull/16953))
+- Add lint to `.less` files ([#16893](https://github.com/RocketChat/Rocket.Chat/pull/16893))
+- Upgrade Livechat Widget version to 1.4.0 ([#16950](https://github.com/RocketChat/Rocket.Chat/pull/16950))
+- Bump acorn from 6.0.7 to 6.4.1 ([#16876](https://github.com/RocketChat/Rocket.Chat/pull/16876) by [@dependabot[bot]](https://github.com/dependabot[bot]))
+- Fixed Line break incorrectly being called apostrophe in code ([#16918](https://github.com/RocketChat/Rocket.Chat/pull/16918) by [@aKn1ghtOut](https://github.com/aKn1ghtOut))
+- Improve room types usage ([#16753](https://github.com/RocketChat/Rocket.Chat/pull/16753))
+- Add Enterprise Edition license ([#16801](https://github.com/RocketChat/Rocket.Chat/pull/16801))
+- LingoHub based on develop ([#16837](https://github.com/RocketChat/Rocket.Chat/pull/16837))
+- Regression: Fix omnichannel icon missing on sidebar ([#16775](https://github.com/RocketChat/Rocket.Chat/pull/16775))
+- Removing Trailing Space ([#16470](https://github.com/RocketChat/Rocket.Chat/pull/16470) by [@aryamanpuri](https://github.com/aryamanpuri))
+- [Apps] Lazy load categories and marketplaceVersion in admin - apps page ([#16258](https://github.com/RocketChat/Rocket.Chat/pull/16258))
+- Fix Docker preview image ([#16736](https://github.com/RocketChat/Rocket.Chat/pull/16736))
+- [CHORE] Changed remaining SelectInput's to Select ([#16719](https://github.com/RocketChat/Rocket.Chat/pull/16719))
+- [CHORE] Update snap install instructions ([#16720](https://github.com/RocketChat/Rocket.Chat/pull/16720))
+- Regression: Show upload errors ([#16681](https://github.com/RocketChat/Rocket.Chat/pull/16681))
+- [CHORE] Look for Storybook stories on `app/` too ([#16595](https://github.com/RocketChat/Rocket.Chat/pull/16595))
+- LingoHub based on develop ([#16640](https://github.com/RocketChat/Rocket.Chat/pull/16640))
+- fix: add option to mount media on snap ([#13591](https://github.com/RocketChat/Rocket.Chat/pull/13591) by [@knrt10](https://github.com/knrt10))
+- Merge master into develop & Set version to 3.1.0-develop ([#16609](https://github.com/RocketChat/Rocket.Chat/pull/16609))
+
+</details>
+
+### 👩‍💻👨‍💻 Contributors 😍
+
+- [@Nikhil713](https://github.com/Nikhil713)
+- [@PrajvalRaval](https://github.com/PrajvalRaval)
+- [@Rodriq](https://github.com/Rodriq)
+- [@aKn1ghtOut](https://github.com/aKn1ghtOut)
+- [@antkaz](https://github.com/antkaz)
+- [@aryamanpuri](https://github.com/aryamanpuri)
+- [@ashwaniYDV](https://github.com/ashwaniYDV)
+- [@col-panic](https://github.com/col-panic)
+- [@dependabot[bot]](https://github.com/dependabot[bot])
+- [@fliptrail](https://github.com/fliptrail)
+- [@georgmu](https://github.com/georgmu)
+- [@harakiwi1](https://github.com/harakiwi1)
+- [@ivanape](https://github.com/ivanape)
+- [@jschirrmacher](https://github.com/jschirrmacher)
+- [@karimelghazouly](https://github.com/karimelghazouly)
+- [@knrt10](https://github.com/knrt10)
+- [@localguru](https://github.com/localguru)
+- [@mrsimpson](https://github.com/mrsimpson)
+- [@pmayer](https://github.com/pmayer)
+- [@ritwizsinha](https://github.com/ritwizsinha)
+- [@rm-yakovenko](https://github.com/rm-yakovenko)
+- [@sneakson](https://github.com/sneakson)
+- [@subham103](https://github.com/subham103)
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+- [@d-gubert](https://github.com/d-gubert)
+- [@gabriellsh](https://github.com/gabriellsh)
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@ggazzo](https://github.com/ggazzo)
+- [@lolimay](https://github.com/lolimay)
+- [@marceloschmidt](https://github.com/marceloschmidt)
+- [@renatobecker](https://github.com/renatobecker)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+- [@tassoevan](https://github.com/tassoevan)
+
 # 3.0.7
 `2020-03-25  ·  1 🔍  ·  1 👩‍💻👨‍💻`
 
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index 72a729708147..89e93e701d59 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.1.0-develop"
+	"version": "3.1.0-rc.0"
 }
diff --git a/package.json b/package.json
index 44a87bc90d54..f24426c8b27c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.1.0-develop",
+	"version": "3.1.0-rc.0",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

From 8dbb0d2621599480a889ff831c79e5234d2aa025 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Thu, 26 Mar 2020 19:04:52 -0300
Subject: [PATCH 083/223] Bump version to 3.1.0-rc.1

---
 .docker/Dockerfile.rhel   |    2 +-
 .github/history.json      | 1258 +++++++++++++-
 HISTORY.md                | 3317 ++++++++++++++++++++++++++++++++++++-
 app/utils/rocketchat.info |    2 +-
 package.json              |    2 +-
 5 files changed, 4551 insertions(+), 30 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 619924060341..db7f8b82184b 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.1.0-rc.0
+ENV RC_VERSION 3.1.0-rc.1
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index dd48d2729376..f436ce550743 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -40067,6 +40067,1262 @@
           ]
         }
       ]
+    },
+    "3.1.0-rc.0": {
+      "node_version": "12.16.1",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "16604",
+          "title": "[NEW] Sort channel directory listing by latest message",
+          "userLogin": "subham103",
+          "contributors": [
+            "subham103",
+            "sampaiodiego",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16680",
+          "title": "[FIX] Wrong message count statistics in Admin info page",
+          "userLogin": "subham103",
+          "contributors": [
+            "subham103",
+            "gabriellsh",
+            "sampaiodiego",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16998",
+          "title": "Fix: 2FA DDP method not getting code on API call that doesn’t requires 2FA",
+          "userLogin": "rodrigok",
+          "milestone": "3.1.0",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "16761",
+          "title": "[NEW] Direct message between multiple users",
+          "userLogin": "ggazzo",
+          "milestone": "3.1.0",
+          "contributors": [
+            "ggazzo",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "17017",
+          "title": "Regression: Remove deprecated Omnichannel setting used to fetch the queue data through subscription ",
+          "userLogin": "renatobecker",
+          "milestone": "3.1.0",
+          "contributors": [
+            "renatobecker"
+          ]
+        },
+        {
+          "pr": "16999",
+          "title": "Regression: Replace the Omnichannel queue model observe with Stream",
+          "userLogin": "renatobecker",
+          "milestone": "3.1.0",
+          "contributors": [
+            "renatobecker"
+          ]
+        },
+        {
+          "pr": "16960",
+          "title": "[NEW] [ENTERPRISE] Engagement Dashboard",
+          "userLogin": "tassoevan",
+          "contributors": [
+            "tassoevan",
+            "MarcosSpessatto"
+          ]
+        },
+        {
+          "pr": "16995",
+          "title": "Fix StreamCast info",
+          "userLogin": "sampaiodiego",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "16784",
+          "title": "[IMPROVE] Ability to change offline message button link on emails notifications",
+          "userLogin": "MarcosSpessatto",
+          "milestone": "3.1.0",
+          "contributors": [
+            "MarcosSpessatto",
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "16989",
+          "title": "[FIX] Race conditions on/before login",
+          "userLogin": "sampaiodiego",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "16983",
+          "title": "Fix: StreamCast was not working correctly",
+          "userLogin": "rodrigok",
+          "milestone": "3.1.0",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "16942",
+          "title": "[FIX] CAS ignores username attribute map",
+          "userLogin": "pmayer",
+          "milestone": "3.1.0",
+          "contributors": [
+            "pmayer",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16958",
+          "title": "[FIX] Ancestral departments were not updated when an Omnichannel room is forwarded to another department",
+          "userLogin": "renatobecker",
+          "milestone": "3.1.0",
+          "contributors": [
+            "renatobecker",
+            "web-flow",
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "16956",
+          "title": "Change license version requested",
+          "userLogin": "geekgonecrazy",
+          "contributors": [
+            "geekgonecrazy",
+            "rodrigok",
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "16158",
+          "title": "[NEW] Synchronize saml roles to local user (#16152)",
+          "userLogin": "col-panic",
+          "contributors": [
+            "col-panic",
+            "rodrigok",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16202",
+          "title": "Fix: Padding required in the Facebook Messenger option in Livechat",
+          "userLogin": "ritwizsinha",
+          "contributors": [
+            "ritwizsinha",
+            "rodrigok",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16120",
+          "title": "Add some missing ES translations",
+          "userLogin": "ivanape",
+          "contributors": [
+            "ivanape",
+            "gabriellsh",
+            "web-flow",
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "16210",
+          "title": "Fix: Adding margin to click to load text",
+          "userLogin": "ritwizsinha",
+          "contributors": [
+            "ritwizsinha",
+            "web-flow",
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "16138",
+          "title": "[FIX] Explicitly set text of confirmation button",
+          "userLogin": "jschirrmacher",
+          "contributors": [
+            "jschirrmacher",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16227",
+          "title": "Redirected to home when a room has been deleted instead of getting broken link(blank page) of deleted room",
+          "userLogin": "ashwaniYDV",
+          "contributors": [
+            "ashwaniYDV",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16310",
+          "title": "Fixed translate variable in UnarchiveRoom Modal",
+          "userLogin": "ashwaniYDV",
+          "contributors": [
+            "ashwaniYDV"
+          ]
+        },
+        {
+          "pr": "16875",
+          "title": "[FIX] Display user status along with icon",
+          "userLogin": "Nikhil713",
+          "contributors": [
+            "Nikhil713",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16128",
+          "title": "[FIX] `users.setStatus` API was ignoring the user from params when trying to set status of other users",
+          "userLogin": "rm-yakovenko",
+          "milestone": "3.1.0",
+          "contributors": [
+            "rm-yakovenko",
+            "MarcosSpessatto",
+            "rodrigok",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16685",
+          "title": "Update cypress to version 4.0.2",
+          "userLogin": "rodrigok",
+          "milestone": "3.1.0",
+          "contributors": [
+            "rodrigok",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "14136",
+          "title": "[FIX] Text formatted to remain within button even on screen resize ",
+          "userLogin": "Rodriq",
+          "milestone": "3.1.0",
+          "contributors": [
+            "Rodriq",
+            "web-flow",
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "16565",
+          "title": "[FIX] Messages doesn't send to Slack via SlackBridge after renaming channel",
+          "userLogin": "antkaz",
+          "milestone": "3.1.0",
+          "contributors": [
+            "antkaz"
+          ]
+        },
+        {
+          "pr": "16610",
+          "title": "[NEW] Route to get updated roles after a date",
+          "userLogin": "ashwaniYDV",
+          "milestone": "3.1.0",
+          "contributors": [
+            "ashwaniYDV",
+            "MarcosSpessatto"
+          ]
+        },
+        {
+          "pr": "16957",
+          "title": "[FIX] Remove Reply in DM from Omnichannel rooms",
+          "userLogin": "ashwaniYDV",
+          "milestone": "3.1.0",
+          "contributors": [
+            "ashwaniYDV",
+            "renatobecker",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16786",
+          "title": "Update presence package",
+          "userLogin": "sampaiodiego",
+          "milestone": "3.1.0",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "16944",
+          "title": "[NEW] Enterprise Edition",
+          "userLogin": "sampaiodiego",
+          "milestone": "3.1.0",
+          "contributors": [
+            "sampaiodiego",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16953",
+          "title": "Add an index to the name field for omnichannel department",
+          "userLogin": "renatobecker",
+          "milestone": "3.1.0",
+          "contributors": [
+            "renatobecker"
+          ]
+        },
+        {
+          "pr": "16955",
+          "title": "[FIX] Login with LinkedIn not mapping name and picture correctly",
+          "userLogin": "marceloschmidt",
+          "contributors": [
+            "marceloschmidt",
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "16949",
+          "title": "[IMPROVE] Allow login of non LDAP users when LDAP is enabled",
+          "userLogin": "rodrigok",
+          "milestone": "3.1.0",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "16893",
+          "title": "Add lint to `.less` files",
+          "userLogin": "sampaiodiego",
+          "milestone": "3.1.0",
+          "contributors": [
+            "sampaiodiego",
+            "rodrigok",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16950",
+          "title": "Upgrade Livechat Widget version to 1.4.0",
+          "userLogin": "renatobecker",
+          "milestone": "3.1.0",
+          "contributors": [
+            "renatobecker"
+          ]
+        },
+        {
+          "pr": "16876",
+          "title": "Bump acorn from 6.0.7 to 6.4.1",
+          "userLogin": "dependabot[bot]",
+          "contributors": [
+            "dependabot[bot]",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16928",
+          "title": "[NEW] Settings to enable E2E encryption for Private and Direct Rooms by default",
+          "userLogin": "rodrigok",
+          "milestone": "3.1.0",
+          "contributors": [
+            "rodrigok",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16941",
+          "title": "Fix: Make the AppLivechatBridge.createMessage works properly as a promise",
+          "userLogin": "renatobecker",
+          "milestone": "3.1.0",
+          "contributors": [
+            "renatobecker"
+          ]
+        },
+        {
+          "pr": "15123",
+          "title": "[NEW] Experimental Game Center (externalComponents implementation)",
+          "userLogin": "d-gubert",
+          "contributors": [
+            "lolimay",
+            "web-flow",
+            "d-gubert"
+          ]
+        },
+        {
+          "pr": "16755",
+          "title": "[IMPROVE] Omnichannel aggregations performance improvements",
+          "userLogin": "MarcosSpessatto",
+          "milestone": "3.1.0",
+          "contributors": [
+            "MarcosSpessatto",
+            "renatobecker",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16669",
+          "title": "[IMPROVE] Replace the Department select component by an Autocomplete input in Omnichannel UI",
+          "userLogin": "renatobecker",
+          "milestone": "3.1.0",
+          "contributors": [
+            "renatobecker",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16859",
+          "title": "[NEW] Add default chat closing tags in Omnichannel departments",
+          "userLogin": "renatobecker",
+          "milestone": "3.1.0",
+          "contributors": [
+            "renatobecker",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16557",
+          "title": "[NEW] Allow to set default department and location sharing on SMS / WhatsApp integration",
+          "userLogin": "renatobecker",
+          "milestone": "3.1.0",
+          "contributors": [
+            "renatobecker",
+            "web-flow",
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "15949",
+          "title": "[NEW] Two Factor authentication via email",
+          "userLogin": "rodrigok",
+          "milestone": "3.1.0",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "16779",
+          "title": "Add new Omnichannel department forwarding callback",
+          "userLogin": "renatobecker",
+          "milestone": "3.1.0",
+          "contributors": [
+            "renatobecker",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16782",
+          "title": "[FIX] Omnichannel Inquiry names not being updated when the guest name changes",
+          "userLogin": "renatobecker",
+          "milestone": "3.1.0",
+          "contributors": [
+            "renatobecker",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16787",
+          "title": "[FIX]  Keeps the agent in the room after accepting a new Omnichannel request",
+          "userLogin": "renatobecker",
+          "milestone": "3.1.0",
+          "contributors": [
+            "renatobecker",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16783",
+          "title": "[FIX] Real-time data rendering on Omnichannel room info panel ",
+          "userLogin": "renatobecker",
+          "milestone": "3.1.0",
+          "contributors": [
+            "renatobecker",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16247",
+          "title": "[FIX] Show error message if password and confirm password not equal ",
+          "userLogin": "ashwaniYDV",
+          "milestone": "3.1.0",
+          "contributors": [
+            "ashwaniYDV"
+          ]
+        },
+        {
+          "pr": "16925",
+          "title": "[FIX]  When trying to quote messages inside threads the quote would be sent to room instead to the thread",
+          "userLogin": "gabriellsh",
+          "contributors": [
+            "gabriellsh"
+          ]
+        },
+        {
+          "pr": "13860",
+          "title": "[IMPROVE] User gets feedback when a message has been starred or unstarred",
+          "userLogin": "fliptrail",
+          "milestone": "3.1.0",
+          "contributors": [
+            "fliptrail"
+          ]
+        },
+        {
+          "pr": "15796",
+          "title": "[FIX] Admins can't sort users by email in directory view",
+          "userLogin": "sneakson",
+          "milestone": "3.1.0",
+          "contributors": [
+            "sneakson"
+          ]
+        },
+        {
+          "pr": "16188",
+          "title": "[FIX] Pinned messages wouldn't collapse",
+          "userLogin": "gabriellsh",
+          "milestone": "3.1.0",
+          "contributors": [
+            "gabriellsh"
+          ]
+        },
+        {
+          "pr": "16792",
+          "title": "Added border to page header",
+          "userLogin": "gabriellsh",
+          "contributors": [
+            "gabriellsh",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16835",
+          "title": "[FIX] Wrong thread messages display in contextual bar",
+          "userLogin": "ritwizsinha",
+          "milestone": "3.1.0",
+          "contributors": [
+            "ritwizsinha"
+          ]
+        },
+        {
+          "pr": "16914",
+          "title": "[FIX] Public channel cannot be accessed via URL when 'Allow Anonymous Read' is active",
+          "userLogin": "ashwaniYDV",
+          "contributors": [
+            "ashwaniYDV"
+          ]
+        },
+        {
+          "pr": "16918",
+          "title": "Fixed Line break incorrectly being called apostrophe in code",
+          "userLogin": "aKn1ghtOut",
+          "contributors": [
+            "aKn1ghtOut"
+          ]
+        },
+        {
+          "pr": "16915",
+          "title": "[IMPROVE] Contextual bar autofocus",
+          "userLogin": "gabriellsh",
+          "contributors": [
+            "gabriellsh"
+          ]
+        },
+        {
+          "pr": "16753",
+          "title": "Improve room types usage",
+          "userLogin": "ggazzo",
+          "milestone": "3.1.0",
+          "contributors": [
+            "ggazzo",
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "16363",
+          "title": "[NEW] Translation via MS translate",
+          "userLogin": "mrsimpson",
+          "description": "Adds Microsoft's translation service (https://translator.microsoft.com/) as a provider for translation of messages.\r\nIn addition to implementing the interface (similar to google and DeepL), a small change has been done in order to display the translation provider on the UI.",
+          "milestone": "3.1.0",
+          "contributors": [
+            "mrsimpson",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16849",
+          "title": "[NEW] API `users.deactivateIdle` for mass-disabling of idle users",
+          "userLogin": "rodrigok",
+          "milestone": "3.1.0",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "16193",
+          "title": "[NEW] API `users.logoutOtherClient` to logout from other locations",
+          "userLogin": "jschirrmacher",
+          "milestone": "3.1.0",
+          "contributors": [
+            "jschirrmacher",
+            "rodrigok",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16845",
+          "title": "[IMPROVE] Add option to require authentication on user's shield endpoint",
+          "userLogin": "MarcosSpessatto",
+          "milestone": "3.1.0",
+          "contributors": [
+            "MarcosSpessatto",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16811",
+          "title": "[FIX] Custom OAuth Bug",
+          "userLogin": "PrajvalRaval",
+          "contributors": [
+            "PrajvalRaval"
+          ]
+        },
+        {
+          "pr": "16838",
+          "title": "[FIX] Integrations page pagination",
+          "userLogin": "sampaiodiego",
+          "milestone": "3.1.0",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "16810",
+          "title": "[FIX] Facebook integration missing visitor data after registerGuest",
+          "userLogin": "antkaz",
+          "milestone": "3.1.0",
+          "contributors": [
+            "antkaz",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16591",
+          "title": "[FIX] Invite links counting users already joined",
+          "userLogin": "ritwizsinha",
+          "contributors": [
+            "ritwizsinha",
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "16255",
+          "title": "[IMPROVE] Displays `Nothing found` on admin sidebar when search returns nothing",
+          "userLogin": "ashwaniYDV",
+          "contributors": [
+            "ashwaniYDV"
+          ]
+        },
+        {
+          "pr": "16304",
+          "title": "Fix: Removed some hardcoded texts",
+          "userLogin": "ashwaniYDV",
+          "contributors": [
+            "ashwaniYDV"
+          ]
+        },
+        {
+          "pr": "16560",
+          "title": "[FIX] Cannot unfollow message from thread's panel",
+          "userLogin": "subham103",
+          "contributors": [
+            "subham103"
+          ]
+        },
+        {
+          "pr": "16801",
+          "title": "Add Enterprise Edition license",
+          "userLogin": "sampaiodiego",
+          "contributors": [
+            "sampaiodiego",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16776",
+          "title": "[IMPROVE] Fallback content-type as application/octet-stream for FileSystem uploads",
+          "userLogin": "georgmu",
+          "contributors": [
+            "georgmu"
+          ]
+        },
+        {
+          "pr": "16781",
+          "title": "Improve: Apps-engine E2E tests",
+          "userLogin": "MarcosSpessatto",
+          "milestone": "3.1.0",
+          "contributors": [
+            "MarcosSpessatto",
+            "d-gubert"
+          ]
+        },
+        {
+          "pr": "16724",
+          "title": "[FIX] Remove spaces from i18n placeholders to show Personal access token",
+          "userLogin": "harakiwi1",
+          "contributors": [
+            "harakiwi1",
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "16751",
+          "title": "[NEW] SAML config to allow clock drift",
+          "userLogin": "localguru",
+          "contributors": [
+            "localguru",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16750",
+          "title": "[FIX] Slash command preview: Wrong item being selected, Horizontal scroll",
+          "userLogin": "gabriellsh",
+          "milestone": "3.1.0",
+          "contributors": [
+            "gabriellsh"
+          ]
+        },
+        {
+          "pr": "16759",
+          "title": "[FIX] Cannot pin on direct messages",
+          "userLogin": "ritwizsinha",
+          "contributors": [
+            "ritwizsinha"
+          ]
+        },
+        {
+          "pr": "16767",
+          "title": "[FIX] SlackBridge: Get all channels from Slack via REST API",
+          "userLogin": "antkaz",
+          "contributors": [
+            "antkaz"
+          ]
+        },
+        {
+          "pr": "16837",
+          "title": "LingoHub based on develop",
+          "userLogin": "engelgabriel",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "16797",
+          "title": "[FIX]  Flextab information is not working when clicking on visitor or agent username in Omnichannel messages",
+          "userLogin": "ashwaniYDV",
+          "milestone": "3.1.0",
+          "contributors": [
+            "ashwaniYDV"
+          ]
+        },
+        {
+          "pr": "16718",
+          "title": "[NEW] Update Meteor to 1.9.2 and Node to 12.16.1",
+          "userLogin": "ggazzo",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "16645",
+          "title": "[FIX] Slackbridge-import command doesn't work",
+          "userLogin": "antkaz",
+          "contributors": [
+            "antkaz"
+          ]
+        },
+        {
+          "pr": "16775",
+          "title": "Regression: Fix omnichannel icon missing on sidebar",
+          "userLogin": "renatobecker",
+          "milestone": "3.1.0",
+          "contributors": [
+            "renatobecker"
+          ]
+        },
+        {
+          "pr": "16752",
+          "title": "[IMPROVE] Rename client-side term \"Livechat\" to \"Omnichannel\"",
+          "userLogin": "renatobecker",
+          "milestone": "3.1.0",
+          "contributors": [
+            "renatobecker",
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "16757",
+          "title": "[FIX] Language country has been ignored on translation load",
+          "userLogin": "rodrigok",
+          "description": "Languages including country variations like `pt-BR` were ignoring the country party because the user's preference has been saved in lowercase `pt-br` causing the language to not match the available languages. Now we enforce the uppercase of the country part when loading the language.",
+          "milestone": "3.0.3",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "16744",
+          "title": "[FIX] Cannot edit Profile when Full Name is empty and not required",
+          "userLogin": "gabriellsh",
+          "milestone": "3.1.0",
+          "contributors": [
+            "gabriellsh"
+          ]
+        },
+        {
+          "pr": "16502",
+          "title": "[IMPROVE] Accept open formarts of text, spreadsheet, presentation for upload by default",
+          "userLogin": "rodrigok",
+          "milestone": "4.0.0",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "16470",
+          "title": "Removing Trailing Space",
+          "userLogin": "aryamanpuri",
+          "contributors": [
+            "aryamanpuri",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16258",
+          "title": "[Apps] Lazy load categories and marketplaceVersion in admin - apps page",
+          "userLogin": "lolimay",
+          "contributors": [
+            "lolimay",
+            "d-gubert"
+          ]
+        },
+        {
+          "pr": "16736",
+          "title": "Fix Docker preview image",
+          "userLogin": "sampaiodiego",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "16726",
+          "title": "[FIX] Manual Register use correct state for determining registered",
+          "userLogin": "geekgonecrazy",
+          "milestone": "3.0.3",
+          "contributors": [
+            "geekgonecrazy",
+            "web-flow",
+            "d-gubert"
+          ]
+        },
+        {
+          "pr": "16723",
+          "title": "[FIX] Rocket.Chat takes too long to set the username when it fails to send enrollment email",
+          "userLogin": "pierre-lehnen-rc",
+          "milestone": "3.0.3",
+          "contributors": [
+            "pierre-lehnen-rc"
+          ]
+        },
+        {
+          "pr": "16719",
+          "title": "[CHORE] Changed remaining SelectInput's to Select",
+          "userLogin": "gabriellsh",
+          "contributors": [
+            "gabriellsh"
+          ]
+        },
+        {
+          "pr": "16720",
+          "title": "[CHORE] Update snap install instructions",
+          "userLogin": "tassoevan",
+          "milestone": "3.1.0",
+          "contributors": [
+            "tassoevan",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16699",
+          "title": "[FIX] TypeError when trying to load avatar of an invalid room.",
+          "userLogin": "pierre-lehnen-rc",
+          "contributors": [
+            "pierre-lehnen-rc"
+          ]
+        },
+        {
+          "pr": "16706",
+          "title": "[FIX] Color setting editing issues",
+          "userLogin": "tassoevan",
+          "contributors": [
+            "tassoevan",
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "16704",
+          "title": "Fix: Console error on login",
+          "userLogin": "gabriellsh",
+          "contributors": [
+            "gabriellsh"
+          ]
+        },
+        {
+          "pr": "16576",
+          "title": "Add methods to include room types on dashboard",
+          "userLogin": "MarcosSpessatto",
+          "milestone": "3.1.0",
+          "contributors": [
+            "MarcosSpessatto"
+          ]
+        },
+        {
+          "pr": "16682",
+          "title": "[FIX] ie11 support",
+          "userLogin": "gabriellsh",
+          "milestone": "3.0.2",
+          "contributors": [
+            "gabriellsh"
+          ]
+        },
+        {
+          "pr": "16681",
+          "title": "Regression: Show upload errors",
+          "userLogin": "sampaiodiego",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "16568",
+          "title": "[FIX] Deleting messages while searching causes the whole room chat to disappear",
+          "userLogin": "karimelghazouly",
+          "contributors": [
+            "karimelghazouly"
+          ]
+        },
+        {
+          "pr": "16617",
+          "title": "[IMPROVE] Send files over REST API",
+          "userLogin": "ggazzo",
+          "milestone": "3.1.0",
+          "contributors": [
+            "ggazzo",
+            "web-flow",
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "16322",
+          "title": "[FIX] Prune message saying `files deleted` and `messages deleted` even when singular message or file in prune",
+          "userLogin": "ritwizsinha",
+          "milestone": "3.0.0",
+          "contributors": [
+            "ritwizsinha"
+          ]
+        },
+        {
+          "pr": "16151",
+          "title": "Fix: Correctly aligned input element of custom user status component",
+          "userLogin": "ashwaniYDV",
+          "contributors": [
+            "ashwaniYDV"
+          ]
+        },
+        {
+          "pr": "16170",
+          "title": "[FIX] \"Jump to message\" is rendered twice when message is starred.",
+          "userLogin": "ashwaniYDV",
+          "contributors": [
+            "ashwaniYDV"
+          ]
+        },
+        {
+          "pr": "16217",
+          "title": "[IMPROVE] Added autofocus to Directory",
+          "userLogin": "ashwaniYDV",
+          "milestone": "3.0.0",
+          "contributors": [
+            "ashwaniYDV"
+          ]
+        },
+        {
+          "pr": "16221",
+          "title": "[IMPROVE] Added timer in video message recorder",
+          "userLogin": "ashwaniYDV",
+          "milestone": "3.0.0",
+          "contributors": [
+            "ashwaniYDV"
+          ]
+        },
+        {
+          "pr": "16371",
+          "title": "[IMPROVE] Use `rocket.cat` as default bot If `InternalHubot_Username` is undefined",
+          "userLogin": "ashwaniYDV",
+          "contributors": [
+            "ashwaniYDV"
+          ]
+        },
+        {
+          "pr": "16315",
+          "title": "[FIX] Pressing Cancel while 'deleting by edit' message blocks sending messages",
+          "userLogin": "ritwizsinha",
+          "milestone": "3.0.0",
+          "contributors": [
+            "ritwizsinha"
+          ]
+        },
+        {
+          "pr": "16416",
+          "title": "[FIX] File uploads out of threads are not visible in regular message view",
+          "userLogin": "ashwaniYDV",
+          "milestone": "3.0.0",
+          "contributors": [
+            "ashwaniYDV",
+            "gabriellsh"
+          ]
+        },
+        {
+          "pr": "16457",
+          "title": "[FIX] There is no option to pin a thread message by admin",
+          "userLogin": "ashwaniYDV",
+          "contributors": [
+            "ashwaniYDV"
+          ]
+        },
+        {
+          "pr": "16595",
+          "title": "[CHORE] Look for Storybook stories on `app/` too",
+          "userLogin": "tassoevan",
+          "milestone": "3.1.0",
+          "contributors": [
+            "tassoevan"
+          ]
+        },
+        {
+          "pr": "16630",
+          "title": "[IMPROVE] Removed the 'reply in thread' from thread replies",
+          "userLogin": "ritwizsinha",
+          "contributors": [
+            "ritwizsinha"
+          ]
+        },
+        {
+          "pr": "16631",
+          "title": "Changed Opt_In message, removed translations",
+          "userLogin": "gabriellsh",
+          "milestone": "3.1.0",
+          "contributors": [
+            "gabriellsh"
+          ]
+        },
+        {
+          "pr": "16671",
+          "title": "[FIX] LDAP sync admin action was not syncing existent users",
+          "userLogin": "rodrigok",
+          "milestone": "3.0.3",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "16618",
+          "title": "[FIX] Check agent status when starting a new conversation with an agent assigned",
+          "userLogin": "renatobecker",
+          "milestone": "3.0.3",
+          "contributors": [
+            "renatobecker"
+          ]
+        },
+        {
+          "pr": "16667",
+          "title": "[FIX] Additional scroll when contextual bar is open",
+          "userLogin": "gabriellsh",
+          "milestone": "3.1.0",
+          "contributors": [
+            "gabriellsh"
+          ]
+        },
+        {
+          "pr": "16668",
+          "title": "[FIX] Clear unread red line when the ESC key is pressed ",
+          "userLogin": "ggazzo",
+          "milestone": "3.0.2",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "16495",
+          "title": "[FIX] users.info endpoint not handling the error if the user does not exist",
+          "userLogin": "MarcosSpessatto",
+          "milestone": "3.0.2",
+          "contributors": [
+            "MarcosSpessatto",
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "16653",
+          "title": "[NEW] Save default filters in the Omnichannel Current Chats list",
+          "userLogin": "renatobecker",
+          "milestone": "3.1.0",
+          "contributors": [
+            "renatobecker"
+          ]
+        },
+        {
+          "pr": "16629",
+          "title": "[FIX] Admin height if the blue banner is opened",
+          "userLogin": "ggazzo",
+          "milestone": "3.0.1",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "16639",
+          "title": "[FIX] Data converters overriding fields added by apps",
+          "userLogin": "d-gubert",
+          "milestone": "3.0.1",
+          "contributors": [
+            "ggazzo",
+            "d-gubert",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16626",
+          "title": "[FIX] Block user option inside admin view",
+          "userLogin": "ggazzo",
+          "milestone": "3.0.1",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "16640",
+          "title": "LingoHub based on develop",
+          "userLogin": "engelgabriel",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "16637",
+          "title": "[FIX] Regression: New 'app' role with no permissions when updating to 3.0.0",
+          "userLogin": "d-gubert",
+          "milestone": "3.0.1",
+          "contributors": [
+            "d-gubert"
+          ]
+        },
+        {
+          "pr": "13591",
+          "title": "fix: add option to mount media on snap",
+          "userLogin": "knrt10",
+          "contributors": [
+            "knrt10"
+          ]
+        },
+        {
+          "pr": "16496",
+          "title": "[NEW] Open the Visitor Info panel automatically when the agent enters an Omnichannel room",
+          "userLogin": "renatobecker",
+          "milestone": "4.0.0",
+          "contributors": [
+            "renatobecker"
+          ]
+        },
+        {
+          "pr": "16603",
+          "title": "[FIX] Omnichannel Inquiry queues when removing chats",
+          "userLogin": "renatobecker",
+          "milestone": "3.0.2",
+          "contributors": [
+            "renatobecker"
+          ]
+        },
+        {
+          "pr": "16623",
+          "title": "[FIX] livechat/rooms endpoint not working with big amount of livechats",
+          "userLogin": "MarcosSpessatto",
+          "milestone": "3.0.1",
+          "contributors": [
+            "MarcosSpessatto",
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "16625",
+          "title": "[FIX] Regression: Jitsi on external window infinite loop",
+          "userLogin": "ggazzo",
+          "milestone": "3.0.1",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "16624",
+          "title": "[FIX] UiKit not updating new actionIds received as responses from actions",
+          "userLogin": "ggazzo",
+          "milestone": "3.0.1",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "16609",
+          "title": "Merge master into develop & Set version to 3.1.0-develop",
+          "userLogin": "sampaiodiego",
+          "contributors": [
+            "sampaiodiego",
+            "web-flow"
+          ]
+        }
+      ]
+    },
+    "3.1.0-rc.1": {
+      "node_version": "12.16.1",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "17018",
+          "title": "Regression: Small fixes for Game Center",
+          "userLogin": "d-gubert",
+          "contributors": [
+            "d-gubert",
+            "web-flow",
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "17028",
+          "title": "Regression: Fix issue with opening rooms",
+          "userLogin": "sampaiodiego",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        }
+      ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/HISTORY.md b/HISTORY.md
index 79c3b30f71b4..f6fb51cc4c84 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,129 +1,258 @@
 
 # 3.1.0 (Under Release Candidate Process)
 
+## 3.1.0-rc.1
+`2020-03-26  ·  2 🔍  ·  2 👩‍💻👨‍💻`
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Regression: Small fixes for Game Center ([#17018](https://github.com/RocketChat/Rocket.Chat/pull/17018))
+
+- Regression: Fix issue with opening rooms ([#17028](https://github.com/RocketChat/Rocket.Chat/pull/17028))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@d-gubert](https://github.com/d-gubert)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 ## 3.1.0-rc.0
-`2020-03-26  ·  20 🎉  ·  16 🚀  ·  44 🐛  ·  29 🔍  ·  34 👩‍💻👨‍💻`
+`2020-03-26  ·  18 🎉  ·  15 🚀  ·  37 🐛  ·  39 🔍  ·  34 👩‍💻👨‍💻`
 
 ### 🎉 New features
 
+
 - Sort channel directory listing by latest message ([#16604](https://github.com/RocketChat/Rocket.Chat/pull/16604) by [@subham103](https://github.com/subham103))
+
 - Direct message between multiple users ([#16761](https://github.com/RocketChat/Rocket.Chat/pull/16761))
+
 - [ENTERPRISE] Engagement Dashboard ([#16960](https://github.com/RocketChat/Rocket.Chat/pull/16960))
+
 - Synchronize saml roles to local user (#16152) ([#16158](https://github.com/RocketChat/Rocket.Chat/pull/16158) by [@col-panic](https://github.com/col-panic))
+
 - Route to get updated roles after a date ([#16610](https://github.com/RocketChat/Rocket.Chat/pull/16610) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
 - Enterprise Edition ([#16944](https://github.com/RocketChat/Rocket.Chat/pull/16944))
+
 - Settings to enable E2E encryption for Private and Direct Rooms by default ([#16928](https://github.com/RocketChat/Rocket.Chat/pull/16928))
+
 - Experimental Game Center (externalComponents implementation) ([#15123](https://github.com/RocketChat/Rocket.Chat/pull/15123))
+
 - Add default chat closing tags in Omnichannel departments ([#16859](https://github.com/RocketChat/Rocket.Chat/pull/16859))
+
 - Allow to set default department and location sharing on SMS / WhatsApp integration ([#16557](https://github.com/RocketChat/Rocket.Chat/pull/16557))
+
 - Two Factor authentication via email ([#15949](https://github.com/RocketChat/Rocket.Chat/pull/15949))
-- Add new Omnichannel department forwarding callback ([#16779](https://github.com/RocketChat/Rocket.Chat/pull/16779))
+
 - Translation via MS translate ([#16363](https://github.com/RocketChat/Rocket.Chat/pull/16363) by [@mrsimpson](https://github.com/mrsimpson))
+  Adds Microsoft's translation service (https://translator.microsoft.com/) as a provider for translation of messages.
+  In addition to implementing the interface (similar to google and DeepL), a small change has been done in order to display the translation provider on the UI.
+
 - API `users.deactivateIdle` for mass-disabling of idle users ([#16849](https://github.com/RocketChat/Rocket.Chat/pull/16849))
-- API to logout from other locations ([#16193](https://github.com/RocketChat/Rocket.Chat/pull/16193) by [@jschirrmacher](https://github.com/jschirrmacher))
+
+- API `users.logoutOtherClient` to logout from other locations ([#16193](https://github.com/RocketChat/Rocket.Chat/pull/16193) by [@jschirrmacher](https://github.com/jschirrmacher))
+
 - SAML config to allow clock drift ([#16751](https://github.com/RocketChat/Rocket.Chat/pull/16751) by [@localguru](https://github.com/localguru))
+
 - Update Meteor to 1.9.2 and Node to 12.16.1 ([#16718](https://github.com/RocketChat/Rocket.Chat/pull/16718))
-- Add methods to include room types on dashboard ([#16576](https://github.com/RocketChat/Rocket.Chat/pull/16576))
+
 - Save default filters in the Omnichannel Current Chats list ([#16653](https://github.com/RocketChat/Rocket.Chat/pull/16653))
+
 - Open the Visitor Info panel automatically when the agent enters an Omnichannel room ([#16496](https://github.com/RocketChat/Rocket.Chat/pull/16496))
 
 ### 🚀 Improvements
 
+
 - Ability to change offline message button link on emails notifications ([#16784](https://github.com/RocketChat/Rocket.Chat/pull/16784))
-- Update ancestral departments when an Omnichannel room is forwarded to another department ([#16958](https://github.com/RocketChat/Rocket.Chat/pull/16958))
+
 - Allow login of non LDAP users when LDAP is enabled ([#16949](https://github.com/RocketChat/Rocket.Chat/pull/16949))
+
 - Omnichannel aggregations performance improvements ([#16755](https://github.com/RocketChat/Rocket.Chat/pull/16755))
+
 - Replace the Department select component by an Autocomplete input in Omnichannel UI ([#16669](https://github.com/RocketChat/Rocket.Chat/pull/16669))
+
 - User gets feedback when a message has been starred or unstarred ([#13860](https://github.com/RocketChat/Rocket.Chat/pull/13860) by [@fliptrail](https://github.com/fliptrail))
-- Added border to page header. ([#16792](https://github.com/RocketChat/Rocket.Chat/pull/16792))
-- Context menu autofocus ([#16915](https://github.com/RocketChat/Rocket.Chat/pull/16915))
+
+- Contextual bar autofocus ([#16915](https://github.com/RocketChat/Rocket.Chat/pull/16915))
+
 - Add option to require authentication on user's shield endpoint ([#16845](https://github.com/RocketChat/Rocket.Chat/pull/16845))
-- Apps-engine E2E tests ([#16781](https://github.com/RocketChat/Rocket.Chat/pull/16781))
+
+- Displays `Nothing found` on admin sidebar when search returns nothing ([#16255](https://github.com/RocketChat/Rocket.Chat/pull/16255) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
+- Fallback content-type as application/octet-stream for FileSystem uploads ([#16776](https://github.com/RocketChat/Rocket.Chat/pull/16776) by [@georgmu](https://github.com/georgmu))
+
 - Rename client-side term "Livechat" to "Omnichannel" ([#16752](https://github.com/RocketChat/Rocket.Chat/pull/16752))
+
 - Accept open formarts of text, spreadsheet, presentation for upload by default ([#16502](https://github.com/RocketChat/Rocket.Chat/pull/16502))
-- Add message_pruned and file_pruned for singular file or message deleted ([#16322](https://github.com/RocketChat/Rocket.Chat/pull/16322) by [@ritwizsinha](https://github.com/ritwizsinha))
+
 - Added autofocus to Directory ([#16217](https://github.com/RocketChat/Rocket.Chat/pull/16217) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
 - Added timer in video message recorder ([#16221](https://github.com/RocketChat/Rocket.Chat/pull/16221) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
+- Use `rocket.cat` as default bot If `InternalHubot_Username` is undefined ([#16371](https://github.com/RocketChat/Rocket.Chat/pull/16371) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
 - Removed the 'reply in thread' from thread replies ([#16630](https://github.com/RocketChat/Rocket.Chat/pull/16630) by [@ritwizsinha](https://github.com/ritwizsinha))
 
 ### 🐛 Bug fixes
 
+
 - Wrong message count statistics in Admin info page ([#16680](https://github.com/RocketChat/Rocket.Chat/pull/16680) by [@subham103](https://github.com/subham103))
+
 - CAS ignores username attribute map ([#16942](https://github.com/RocketChat/Rocket.Chat/pull/16942) by [@pmayer](https://github.com/pmayer))
-- Adding margin to click to load text ([#16210](https://github.com/RocketChat/Rocket.Chat/pull/16210) by [@ritwizsinha](https://github.com/ritwizsinha))
+
+- Ancestral departments were not updated when an Omnichannel room is forwarded to another department ([#16958](https://github.com/RocketChat/Rocket.Chat/pull/16958))
+
 - Explicitly set text of confirmation button ([#16138](https://github.com/RocketChat/Rocket.Chat/pull/16138) by [@jschirrmacher](https://github.com/jschirrmacher))
+
 - Display user status along with icon ([#16875](https://github.com/RocketChat/Rocket.Chat/pull/16875) by [@Nikhil713](https://github.com/Nikhil713))
-- users.setStatus and user from params ([#16128](https://github.com/RocketChat/Rocket.Chat/pull/16128) by [@rm-yakovenko](https://github.com/rm-yakovenko))
+
+- `users.setStatus` API was ignoring the user from params when trying to set status of other users ([#16128](https://github.com/RocketChat/Rocket.Chat/pull/16128) by [@rm-yakovenko](https://github.com/rm-yakovenko))
+
 - Text formatted to remain within button even on screen resize  ([#14136](https://github.com/RocketChat/Rocket.Chat/pull/14136) by [@Rodriq](https://github.com/Rodriq))
+
 - Messages doesn't send to Slack via SlackBridge after renaming channel ([#16565](https://github.com/RocketChat/Rocket.Chat/pull/16565) by [@antkaz](https://github.com/antkaz))
+
 - Remove Reply in DM from Omnichannel rooms ([#16957](https://github.com/RocketChat/Rocket.Chat/pull/16957) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
 - Login with LinkedIn not mapping name and picture correctly ([#16955](https://github.com/RocketChat/Rocket.Chat/pull/16955))
-- Make the AppLivechatBridge.createMessage works properly as a promise ([#16941](https://github.com/RocketChat/Rocket.Chat/pull/16941))
+
 - Omnichannel Inquiry names not being updated when the guest name changes ([#16782](https://github.com/RocketChat/Rocket.Chat/pull/16782))
+
 - Real-time data rendering on Omnichannel room info panel  ([#16783](https://github.com/RocketChat/Rocket.Chat/pull/16783))
+
 - Show error message if password and confirm password not equal  ([#16247](https://github.com/RocketChat/Rocket.Chat/pull/16247) by [@ashwaniYDV](https://github.com/ashwaniYDV))
-- Message quote button inside threads ([#16925](https://github.com/RocketChat/Rocket.Chat/pull/16925))
-- admin can sort users by email in directory view ([#15796](https://github.com/RocketChat/Rocket.Chat/pull/15796) by [@sneakson](https://github.com/sneakson))
+
+- When trying to quote messages inside threads the quote would be sent to room instead to the thread ([#16925](https://github.com/RocketChat/Rocket.Chat/pull/16925))
+
+- Admins can't sort users by email in directory view ([#15796](https://github.com/RocketChat/Rocket.Chat/pull/15796) by [@sneakson](https://github.com/sneakson))
+
 - Pinned messages wouldn't collapse ([#16188](https://github.com/RocketChat/Rocket.Chat/pull/16188))
-- Correct thread messages display in context bar. ([#16835](https://github.com/RocketChat/Rocket.Chat/pull/16835) by [@ritwizsinha](https://github.com/ritwizsinha))
+
+- Wrong thread messages display in contextual bar ([#16835](https://github.com/RocketChat/Rocket.Chat/pull/16835) by [@ritwizsinha](https://github.com/ritwizsinha))
+
 - Public channel cannot be accessed via URL when 'Allow Anonymous Read' is active ([#16914](https://github.com/RocketChat/Rocket.Chat/pull/16914) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
 - Custom OAuth Bug ([#16811](https://github.com/RocketChat/Rocket.Chat/pull/16811) by [@PrajvalRaval](https://github.com/PrajvalRaval))
+
 - Facebook integration missing visitor data after registerGuest ([#16810](https://github.com/RocketChat/Rocket.Chat/pull/16810) by [@antkaz](https://github.com/antkaz))
+
 - Invite links counting users already joined ([#16591](https://github.com/RocketChat/Rocket.Chat/pull/16591) by [@ritwizsinha](https://github.com/ritwizsinha))
-- No settings to be displayed if search not found ([#16255](https://github.com/RocketChat/Rocket.Chat/pull/16255) by [@ashwaniYDV](https://github.com/ashwaniYDV))
-- Removed some hardcoded texts ([#16304](https://github.com/RocketChat/Rocket.Chat/pull/16304) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
 - Cannot unfollow message from thread's panel ([#16560](https://github.com/RocketChat/Rocket.Chat/pull/16560) by [@subham103](https://github.com/subham103))
-- Fallback content-type as application/octet-stream for FileSystem uploads ([#16776](https://github.com/RocketChat/Rocket.Chat/pull/16776) by [@georgmu](https://github.com/georgmu))
+
 - Remove spaces from i18n placeholders to show Personal access token ([#16724](https://github.com/RocketChat/Rocket.Chat/pull/16724) by [@harakiwi1](https://github.com/harakiwi1))
+
 - Slash command preview: Wrong item being selected, Horizontal scroll ([#16750](https://github.com/RocketChat/Rocket.Chat/pull/16750))
+
 - Cannot pin on direct messages ([#16759](https://github.com/RocketChat/Rocket.Chat/pull/16759) by [@ritwizsinha](https://github.com/ritwizsinha))
-- Get all channels from Slack via REST API ([#16767](https://github.com/RocketChat/Rocket.Chat/pull/16767) by [@antkaz](https://github.com/antkaz))
+
+- SlackBridge: Get all channels from Slack via REST API ([#16767](https://github.com/RocketChat/Rocket.Chat/pull/16767) by [@antkaz](https://github.com/antkaz))
+
 - Flextab information is not working when clicking on visitor or agent username in Omnichannel messages ([#16797](https://github.com/RocketChat/Rocket.Chat/pull/16797) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
 - Slackbridge-import command doesn't work ([#16645](https://github.com/RocketChat/Rocket.Chat/pull/16645) by [@antkaz](https://github.com/antkaz))
+
 - Cannot edit Profile when Full Name is empty and not required ([#16744](https://github.com/RocketChat/Rocket.Chat/pull/16744))
+
 - Color setting editing issues ([#16706](https://github.com/RocketChat/Rocket.Chat/pull/16706))
-- Console error on login ([#16704](https://github.com/RocketChat/Rocket.Chat/pull/16704))
-- Delete messages while searching bug ([#16568](https://github.com/RocketChat/Rocket.Chat/pull/16568) by [@karimelghazouly](https://github.com/karimelghazouly))
-- Correctly aligned input element of custom user status component ([#16151](https://github.com/RocketChat/Rocket.Chat/pull/16151) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
+- Deleting messages while searching causes the whole room chat to disappear ([#16568](https://github.com/RocketChat/Rocket.Chat/pull/16568) by [@karimelghazouly](https://github.com/karimelghazouly))
+
+- Prune message saying `files deleted` and `messages deleted` even when singular message or file in prune ([#16322](https://github.com/RocketChat/Rocket.Chat/pull/16322) by [@ritwizsinha](https://github.com/ritwizsinha))
+
 - "Jump to message" is rendered twice when message is starred. ([#16170](https://github.com/RocketChat/Rocket.Chat/pull/16170) by [@ashwaniYDV](https://github.com/ashwaniYDV))
-- If InternalHubot_Username is undefined then rocket.cat should be default bot ([#16371](https://github.com/RocketChat/Rocket.Chat/pull/16371) by [@ashwaniYDV](https://github.com/ashwaniYDV))
-- Bug making us to reload the page after cancel was clicked on editing ([#16315](https://github.com/RocketChat/Rocket.Chat/pull/16315) by [@ritwizsinha](https://github.com/ritwizsinha))
+
+- Pressing Cancel while 'deleting by edit' message blocks sending messages ([#16315](https://github.com/RocketChat/Rocket.Chat/pull/16315) by [@ritwizsinha](https://github.com/ritwizsinha))
+
 - File uploads out of threads are not visible in regular message view ([#16416](https://github.com/RocketChat/Rocket.Chat/pull/16416) by [@ashwaniYDV](https://github.com/ashwaniYDV))
-- Added an option to pin/unpin a thread message ([#16457](https://github.com/RocketChat/Rocket.Chat/pull/16457) by [@ashwaniYDV](https://github.com/ashwaniYDV))
-- Changed Opt_In message, removed translations ([#16631](https://github.com/RocketChat/Rocket.Chat/pull/16631))
+
+- There is no option to pin a thread message by admin ([#16457](https://github.com/RocketChat/Rocket.Chat/pull/16457) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
 - Additional scroll when contextual bar is open ([#16667](https://github.com/RocketChat/Rocket.Chat/pull/16667))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Fix: 2FA DDP method not getting code on API call that doesn’t requires 2FA ([#16998](https://github.com/RocketChat/Rocket.Chat/pull/16998))
+
 - Fix StreamCast info ([#16995](https://github.com/RocketChat/Rocket.Chat/pull/16995))
+
 - Fix: StreamCast was not working correctly ([#16983](https://github.com/RocketChat/Rocket.Chat/pull/16983))
+
 - Change license version requested ([#16956](https://github.com/RocketChat/Rocket.Chat/pull/16956))
+
 - Fix: Padding required in the Facebook Messenger option in Livechat ([#16202](https://github.com/RocketChat/Rocket.Chat/pull/16202) by [@ritwizsinha](https://github.com/ritwizsinha))
+
 - Add some missing ES translations ([#16120](https://github.com/RocketChat/Rocket.Chat/pull/16120) by [@ivanape](https://github.com/ivanape))
+
+- Fix: Adding margin to click to load text ([#16210](https://github.com/RocketChat/Rocket.Chat/pull/16210) by [@ritwizsinha](https://github.com/ritwizsinha))
+
 - Redirected to home when a room has been deleted instead of getting broken link(blank page) of deleted room ([#16227](https://github.com/RocketChat/Rocket.Chat/pull/16227) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
 - Fixed translate variable in UnarchiveRoom Modal ([#16310](https://github.com/RocketChat/Rocket.Chat/pull/16310) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
 - Update cypress to version 4.0.2 ([#16685](https://github.com/RocketChat/Rocket.Chat/pull/16685))
+
 - Update presence package ([#16786](https://github.com/RocketChat/Rocket.Chat/pull/16786))
+
 - Add an index to the name field for omnichannel department ([#16953](https://github.com/RocketChat/Rocket.Chat/pull/16953))
+
 - Add lint to `.less` files ([#16893](https://github.com/RocketChat/Rocket.Chat/pull/16893))
+
 - Upgrade Livechat Widget version to 1.4.0 ([#16950](https://github.com/RocketChat/Rocket.Chat/pull/16950))
+
 - Bump acorn from 6.0.7 to 6.4.1 ([#16876](https://github.com/RocketChat/Rocket.Chat/pull/16876) by [@dependabot[bot]](https://github.com/dependabot[bot]))
+
+- Fix: Make the AppLivechatBridge.createMessage works properly as a promise ([#16941](https://github.com/RocketChat/Rocket.Chat/pull/16941))
+
+- Add new Omnichannel department forwarding callback ([#16779](https://github.com/RocketChat/Rocket.Chat/pull/16779))
+
+- Added border to page header ([#16792](https://github.com/RocketChat/Rocket.Chat/pull/16792))
+
 - Fixed Line break incorrectly being called apostrophe in code ([#16918](https://github.com/RocketChat/Rocket.Chat/pull/16918) by [@aKn1ghtOut](https://github.com/aKn1ghtOut))
+
 - Improve room types usage ([#16753](https://github.com/RocketChat/Rocket.Chat/pull/16753))
+
+- Fix: Removed some hardcoded texts ([#16304](https://github.com/RocketChat/Rocket.Chat/pull/16304) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
 - Add Enterprise Edition license ([#16801](https://github.com/RocketChat/Rocket.Chat/pull/16801))
+
+- Improve: Apps-engine E2E tests ([#16781](https://github.com/RocketChat/Rocket.Chat/pull/16781))
+
 - LingoHub based on develop ([#16837](https://github.com/RocketChat/Rocket.Chat/pull/16837))
+
 - Regression: Fix omnichannel icon missing on sidebar ([#16775](https://github.com/RocketChat/Rocket.Chat/pull/16775))
+
 - Removing Trailing Space ([#16470](https://github.com/RocketChat/Rocket.Chat/pull/16470) by [@aryamanpuri](https://github.com/aryamanpuri))
+
 - [Apps] Lazy load categories and marketplaceVersion in admin - apps page ([#16258](https://github.com/RocketChat/Rocket.Chat/pull/16258))
+
 - Fix Docker preview image ([#16736](https://github.com/RocketChat/Rocket.Chat/pull/16736))
+
 - [CHORE] Changed remaining SelectInput's to Select ([#16719](https://github.com/RocketChat/Rocket.Chat/pull/16719))
+
 - [CHORE] Update snap install instructions ([#16720](https://github.com/RocketChat/Rocket.Chat/pull/16720))
+
+- Fix: Console error on login ([#16704](https://github.com/RocketChat/Rocket.Chat/pull/16704))
+
+- Add methods to include room types on dashboard ([#16576](https://github.com/RocketChat/Rocket.Chat/pull/16576))
+
 - Regression: Show upload errors ([#16681](https://github.com/RocketChat/Rocket.Chat/pull/16681))
+
+- Fix: Correctly aligned input element of custom user status component ([#16151](https://github.com/RocketChat/Rocket.Chat/pull/16151) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
 - [CHORE] Look for Storybook stories on `app/` too ([#16595](https://github.com/RocketChat/Rocket.Chat/pull/16595))
+
+- Changed Opt_In message, removed translations ([#16631](https://github.com/RocketChat/Rocket.Chat/pull/16631))
+
 - LingoHub based on develop ([#16640](https://github.com/RocketChat/Rocket.Chat/pull/16640))
+
 - fix: add option to mount media on snap ([#13591](https://github.com/RocketChat/Rocket.Chat/pull/13591) by [@knrt10](https://github.com/knrt10))
+
 - Merge master into develop & Set version to 3.1.0-develop ([#16609](https://github.com/RocketChat/Rocket.Chat/pull/16609))
 
 </details>
@@ -179,6 +308,7 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Regression: Remove deprecated Omnichannel setting used to fetch the queue data through subscription  ([#17017](https://github.com/RocketChat/Rocket.Chat/pull/17017))
 
 </details>
@@ -197,11 +327,13 @@
 
 ### 🐛 Bug fixes
 
+
 - Keeps the agent in the room after accepting a new Omnichannel request ([#16787](https://github.com/RocketChat/Rocket.Chat/pull/16787))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Regression: Replace the Omnichannel queue model observe with Stream ([#16999](https://github.com/RocketChat/Rocket.Chat/pull/16999))
 
 </details>
@@ -220,6 +352,7 @@
 
 ### 🐛 Bug fixes
 
+
 - Race conditions on/before login ([#16989](https://github.com/RocketChat/Rocket.Chat/pull/16989))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -236,11 +369,14 @@
 
 ### 🚀 Improvements
 
+
 - Send files over REST API ([#16617](https://github.com/RocketChat/Rocket.Chat/pull/16617))
 
 ### 🐛 Bug fixes
 
+
 - Integrations page pagination ([#16838](https://github.com/RocketChat/Rocket.Chat/pull/16838))
+
 - TypeError when trying to load avatar of an invalid room. ([#16699](https://github.com/RocketChat/Rocket.Chat/pull/16699))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -259,10 +395,15 @@
 
 ### 🐛 Bug fixes
 
+
 - Language country has been ignored on translation load ([#16757](https://github.com/RocketChat/Rocket.Chat/pull/16757))
+
 - Manual Register use correct state for determining registered ([#16726](https://github.com/RocketChat/Rocket.Chat/pull/16726))
+
 - Rocket.Chat takes too long to set the username when it fails to send enrollment email ([#16723](https://github.com/RocketChat/Rocket.Chat/pull/16723))
+
 - LDAP sync admin action was not syncing existent users ([#16671](https://github.com/RocketChat/Rocket.Chat/pull/16671))
+
 - Check agent status when starting a new conversation with an agent assigned ([#16618](https://github.com/RocketChat/Rocket.Chat/pull/16618))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -283,8 +424,11 @@
 
 ### 🐛 Bug fixes
 
+
 - ie11 support ([#16682](https://github.com/RocketChat/Rocket.Chat/pull/16682))
+
 - Omnichannel Inquiry queues when removing chats ([#16603](https://github.com/RocketChat/Rocket.Chat/pull/16603))
+
 - Clear unread red line when the ESC key is pressed  ([#16668](https://github.com/RocketChat/Rocket.Chat/pull/16668))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -303,12 +447,19 @@
 
 ### 🐛 Bug fixes
 
+
 - UiKit not updating new actionIds received as responses from actions ([#16624](https://github.com/RocketChat/Rocket.Chat/pull/16624))
+
 - Regression: Jitsi on external window infinite loop ([#16625](https://github.com/RocketChat/Rocket.Chat/pull/16625))
+
 - livechat/rooms endpoint not working with big amount of livechats ([#16623](https://github.com/RocketChat/Rocket.Chat/pull/16623))
+
 - Regression: New 'app' role with no permissions when updating to 3.0.0 ([#16637](https://github.com/RocketChat/Rocket.Chat/pull/16637))
+
 - Block user option inside admin view ([#16626](https://github.com/RocketChat/Rocket.Chat/pull/16626))
+
 - Data converters overriding fields added by apps ([#16639](https://github.com/RocketChat/Rocket.Chat/pull/16639))
+
 - Admin height if the blue banner is opened ([#16629](https://github.com/RocketChat/Rocket.Chat/pull/16629))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -328,121 +479,224 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Filter System messages per room ([#16369](https://github.com/RocketChat/Rocket.Chat/pull/16369))
+
 - Remove deprecated publications ([#16351](https://github.com/RocketChat/Rocket.Chat/pull/16351))
+
 - Hide system messages ([#16243](https://github.com/RocketChat/Rocket.Chat/pull/16243))
+
 - Upgrade to Meteor 1.9 and NodeJS 12 ([#16252](https://github.com/RocketChat/Rocket.Chat/pull/16252))
+
 - Removed room counter from sidebar ([#16036](https://github.com/RocketChat/Rocket.Chat/pull/16036))
+
 - Change apps/icon endpoint to return app's icon and use it to show on Ui Kit modal ([#16522](https://github.com/RocketChat/Rocket.Chat/pull/16522))
+
 - TLS v1.0 and TLS v1.1 were disabled by due to NodeJS update to v12. You can still enable them by using flags like `--tls-min-v1.0` and `--tls-min-v1.1`
 
 ### 🎉 New features
 
+
 - Button to download admin server info ([#16059](https://github.com/RocketChat/Rocket.Chat/pull/16059))
+
 - UiKit - Interactive UI elements for Rocket.Chat Apps ([#16048](https://github.com/RocketChat/Rocket.Chat/pull/16048))
+
 - Sort the Omnichannel Chat list according to the user preferences ([#16437](https://github.com/RocketChat/Rocket.Chat/pull/16437))
+
 - Setting to only send plain text emails ([#16065](https://github.com/RocketChat/Rocket.Chat/pull/16065))
+
 - Check the Omnichannel service status per Department ([#16425](https://github.com/RocketChat/Rocket.Chat/pull/16425))
+
 - Create a user for the Apps during installation ([#15896](https://github.com/RocketChat/Rocket.Chat/pull/15896) by [@Cool-fire](https://github.com/Cool-fire))
+
 - Add GUI for customFields in Omnichannel conversations ([#15840](https://github.com/RocketChat/Rocket.Chat/pull/15840) by [@antkaz](https://github.com/antkaz))
+
 - update on mongo, node and caddy on snap ([#16167](https://github.com/RocketChat/Rocket.Chat/pull/16167))
+
 - Enforce plain text emails converting from HTML when no text version supplied ([#16063](https://github.com/RocketChat/Rocket.Chat/pull/16063))
+
 - Setting Top navbar in embedded mode  ([#16064](https://github.com/RocketChat/Rocket.Chat/pull/16064))
 
 ### 🚀 Improvements
 
+
 - Request user presence on demand ([#16348](https://github.com/RocketChat/Rocket.Chat/pull/16348))
+
 - Major overhaul on data importers ([#16279](https://github.com/RocketChat/Rocket.Chat/pull/16279))
+
 - Changes App user's status when the app was enabled/disabled ([#16392](https://github.com/RocketChat/Rocket.Chat/pull/16392))
+
 - Log as info level when Method Rate Limiters are reached ([#16446](https://github.com/RocketChat/Rocket.Chat/pull/16446))
+
 - Show more information related to the Omnichannel room closing data ([#16414](https://github.com/RocketChat/Rocket.Chat/pull/16414))
+
 - Update katex version ([#16393](https://github.com/RocketChat/Rocket.Chat/pull/16393))
+
 - Prevent "App user" from being deleted by the admin ([#16373](https://github.com/RocketChat/Rocket.Chat/pull/16373))
+
 - Improve function to check if setting has changed ([#16181](https://github.com/RocketChat/Rocket.Chat/pull/16181))
+
 - Status Text form validation ([#16121](https://github.com/RocketChat/Rocket.Chat/pull/16121))
+
 - Set the color of the cancel button on modals to #bdbebf for enhanced  visibiity ([#15913](https://github.com/RocketChat/Rocket.Chat/pull/15913) by [@ritwizsinha](https://github.com/ritwizsinha))
+
 - Remove NRR ([#16071](https://github.com/RocketChat/Rocket.Chat/pull/16071))
 
 ### 🐛 Bug fixes
 
+
 - Result of get avatar from url can be null ([#16123](https://github.com/RocketChat/Rocket.Chat/pull/16123))
+
 - Rooms not being marked as read sometimes ([#16397](https://github.com/RocketChat/Rocket.Chat/pull/16397))
+
 - Container heights ([#16388](https://github.com/RocketChat/Rocket.Chat/pull/16388))
+
 - Mail Msg Cancel button not closing the flexbar ([#16263](https://github.com/RocketChat/Rocket.Chat/pull/16263) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
 - Highlight freezing the UI ([#16378](https://github.com/RocketChat/Rocket.Chat/pull/16378))
+
 - Adding 'lang' tag ([#16375](https://github.com/RocketChat/Rocket.Chat/pull/16375))
+
 - Role tags missing - Description field explanation ([#16356](https://github.com/RocketChat/Rocket.Chat/pull/16356))
+
 - The "click to load" text is hard-coded and not translated. ([#16142](https://github.com/RocketChat/Rocket.Chat/pull/16142) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
 - FileUpload.getBuffer was not working through the Apps-Engine ([#16234](https://github.com/RocketChat/Rocket.Chat/pull/16234))
+
 - Integrations admin page ([#16183](https://github.com/RocketChat/Rocket.Chat/pull/16183))
+
 - Readme Help wanted section ([#16197](https://github.com/RocketChat/Rocket.Chat/pull/16197))
+
 - auto translate cache ([#15768](https://github.com/RocketChat/Rocket.Chat/pull/15768) by [@vickyokrm](https://github.com/vickyokrm))
+
 - Save password without confirmation ([#16060](https://github.com/RocketChat/Rocket.Chat/pull/16060) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
 - Break message-attachment text to the next line ([#16039](https://github.com/RocketChat/Rocket.Chat/pull/16039) by [@ritwizsinha](https://github.com/ritwizsinha))
+
 - SafePorts: Ports 80, 8080 & 443 linked to respective protocols (#16108) ([#16108](https://github.com/RocketChat/Rocket.Chat/pull/16108))
+
 - Drag and drop disabled when file upload is disabled ([#16049](https://github.com/RocketChat/Rocket.Chat/pull/16049))
+
 - Video message sent to wrong room ([#16113](https://github.com/RocketChat/Rocket.Chat/pull/16113))
+
 - "User not found" for direct messages ([#16047](https://github.com/RocketChat/Rocket.Chat/pull/16047))
+
 - Embedded style when using 'go' command ([#16051](https://github.com/RocketChat/Rocket.Chat/pull/16051))
+
 - Thread message icon overlapping text ([#16083](https://github.com/RocketChat/Rocket.Chat/pull/16083))
+
 - Login change language button ([#16085](https://github.com/RocketChat/Rocket.Chat/pull/16085))
+
 - api-bypass-rate-limiter permission was not working ([#16080](https://github.com/RocketChat/Rocket.Chat/pull/16080))
+
 - Missing edited icon in newly created messages ([#16484](https://github.com/RocketChat/Rocket.Chat/pull/16484))
+
 - Read Message after receive a message and the room is opened ([#16473](https://github.com/RocketChat/Rocket.Chat/pull/16473))
+
 - Send message with pending messages ([#16474](https://github.com/RocketChat/Rocket.Chat/pull/16474))
+
 - Do not stop on DM imports if one of users was not found ([#16547](https://github.com/RocketChat/Rocket.Chat/pull/16547))
+
 - Introduce AppLivechatBridge.isOnlineAsync method ([#16467](https://github.com/RocketChat/Rocket.Chat/pull/16467))
+
 - When copying invite links, multiple toastr messages ([#16578](https://github.com/RocketChat/Rocket.Chat/pull/16578))
+
 - Livechat Widget version 1.3.1 ([#16580](https://github.com/RocketChat/Rocket.Chat/pull/16580))
+
 - Error when successfully joining room by invite link ([#16571](https://github.com/RocketChat/Rocket.Chat/pull/16571))
+
 - Invite links proxy URLs not working when using CDN ([#16581](https://github.com/RocketChat/Rocket.Chat/pull/16581))
+
 - Bug on starting Jitsi video calls , multiple messages ([#16601](https://github.com/RocketChat/Rocket.Chat/pull/16601))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Revert importer streamed uploads ([#16465](https://github.com/RocketChat/Rocket.Chat/pull/16465))
+
 - Regression: Fix app user status change for non-existing user ([#16458](https://github.com/RocketChat/Rocket.Chat/pull/16458))
+
 - Regression: Fix sending a message not scrolling to bottom ([#16451](https://github.com/RocketChat/Rocket.Chat/pull/16451))
+
 - LingoHub based on develop ([#16450](https://github.com/RocketChat/Rocket.Chat/pull/16450))
+
 - Regression: Fix sequential messages grouping ([#16386](https://github.com/RocketChat/Rocket.Chat/pull/16386))
+
 - Use GitHub Actions to store builds ([#16443](https://github.com/RocketChat/Rocket.Chat/pull/16443))
+
 - Regression: recent opened rooms being marked as read ([#16442](https://github.com/RocketChat/Rocket.Chat/pull/16442))
+
 - Regression: Fix status bar margins ([#16438](https://github.com/RocketChat/Rocket.Chat/pull/16438))
+
 - Update apps engine to 1.12.0-beta.2496 ([#16398](https://github.com/RocketChat/Rocket.Chat/pull/16398))
+
 - Regression: App deletion wasn’t returning the correct information ([#16360](https://github.com/RocketChat/Rocket.Chat/pull/16360))
+
 - Lint: Resolve complexity warnings ([#16114](https://github.com/RocketChat/Rocket.Chat/pull/16114))
+
 - Fix Preview Docker image build ([#16379](https://github.com/RocketChat/Rocket.Chat/pull/16379))
+
 - Fix assets download on CI ([#16352](https://github.com/RocketChat/Rocket.Chat/pull/16352))
+
 - Send build artifacts to S3 ([#16237](https://github.com/RocketChat/Rocket.Chat/pull/16237))
+
 - Add missing translations ([#16150](https://github.com/RocketChat/Rocket.Chat/pull/16150) by [@ritwizsinha](https://github.com/ritwizsinha))
+
 - Disable PR Docker image build ([#16141](https://github.com/RocketChat/Rocket.Chat/pull/16141))
+
 - Add Cloud Info to translation dictionary ([#16122](https://github.com/RocketChat/Rocket.Chat/pull/16122) by [@aviral243](https://github.com/aviral243))
+
 - Merge master into develop & Set version to 2.5.0-develop ([#16107](https://github.com/RocketChat/Rocket.Chat/pull/16107))
+
 - Fix tests ([#16469](https://github.com/RocketChat/Rocket.Chat/pull/16469))
+
 - Regression: prevent submit modal ([#16488](https://github.com/RocketChat/Rocket.Chat/pull/16488))
+
 - Regression: allow private channels to hide system messages ([#16483](https://github.com/RocketChat/Rocket.Chat/pull/16483))
+
 - Regression: Fix uikit modal closing on click ([#16475](https://github.com/RocketChat/Rocket.Chat/pull/16475))
+
 - Regression: Fix undefined presence after reconnect ([#16477](https://github.com/RocketChat/Rocket.Chat/pull/16477))
+
 - Remove users.info being called without need ([#16504](https://github.com/RocketChat/Rocket.Chat/pull/16504))
+
 - Add Ui Kit container ([#16503](https://github.com/RocketChat/Rocket.Chat/pull/16503))
+
 - Catch zip errors on import file load ([#16494](https://github.com/RocketChat/Rocket.Chat/pull/16494))
+
 - Fix: License missing from manual register handler ([#16505](https://github.com/RocketChat/Rocket.Chat/pull/16505))
+
 - Exclude federated and app users from active user count ([#16489](https://github.com/RocketChat/Rocket.Chat/pull/16489))
+
 - Regression: Update Uikit ([#16515](https://github.com/RocketChat/Rocket.Chat/pull/16515))
+
 - Regression: UIKit - Send container info on block actions triggered on a message ([#16514](https://github.com/RocketChat/Rocket.Chat/pull/16514))
+
 - Use base64 for import files upload to prevent file corruption ([#16516](https://github.com/RocketChat/Rocket.Chat/pull/16516))
+
 - Regression: Send app info along with interaction payload to the UI ([#16511](https://github.com/RocketChat/Rocket.Chat/pull/16511))
+
 - Regression: Ui Kit messaging issues (#16513) ([#16513](https://github.com/RocketChat/Rocket.Chat/pull/16513))
+
 - Regression: update package-lock ([#16528](https://github.com/RocketChat/Rocket.Chat/pull/16528))
+
 - Regression: UIkit input states ([#16552](https://github.com/RocketChat/Rocket.Chat/pull/16552))
+
 - Regression: UIKit missing select states: error/disabled ([#16540](https://github.com/RocketChat/Rocket.Chat/pull/16540))
+
 - Regression: fix read unread messages ([#16562](https://github.com/RocketChat/Rocket.Chat/pull/16562))
+
 - Regression: UIKit update modal actions ([#16570](https://github.com/RocketChat/Rocket.Chat/pull/16570))
+
 - Update Apps-Engine version ([#16584](https://github.com/RocketChat/Rocket.Chat/pull/16584))
+
 - Add breaking notice regarding TLS ([#16575](https://github.com/RocketChat/Rocket.Chat/pull/16575))
+
 - Regression: Modal onSubmit ([#16556](https://github.com/RocketChat/Rocket.Chat/pull/16556))
+
 - Regression: send file modal not working via keyboard ([#16607](https://github.com/RocketChat/Rocket.Chat/pull/16607))
+
 - Fix github actions accessing the github registry ([#16521](https://github.com/RocketChat/Rocket.Chat/pull/16521) by [@mrsimpson](https://github.com/mrsimpson))
 
 </details>
@@ -484,6 +738,7 @@
 
 ### 🐛 Bug fixes
 
+
 - users.info endpoint not handling the error if the user does not exist ([#16495](https://github.com/RocketChat/Rocket.Chat/pull/16495))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -501,11 +756,13 @@
 
 ### 🐛 Bug fixes
 
+
 - `stdout` streamer infinite loop ([#16452](https://github.com/RocketChat/Rocket.Chat/pull/16452))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 2.4.9 ([#16544](https://github.com/RocketChat/Rocket.Chat/pull/16544))
 
 </details>
@@ -525,7 +782,9 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 2.4.8 ([#16506](https://github.com/RocketChat/Rocket.Chat/pull/16506))
+
 - Update presence package to 2.6.1 ([#16486](https://github.com/RocketChat/Rocket.Chat/pull/16486))
 
 </details>
@@ -544,11 +803,13 @@
 
 ### 🐛 Bug fixes
 
+
 - Option to make a channel default ([#16433](https://github.com/RocketChat/Rocket.Chat/pull/16433))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 2.4.7 ([#16444](https://github.com/RocketChat/Rocket.Chat/pull/16444))
 
 </details>
@@ -569,8 +830,11 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 2.4.6 ([#16402](https://github.com/RocketChat/Rocket.Chat/pull/16402))
+
 - Revert message properties validation ([#16395](https://github.com/RocketChat/Rocket.Chat/pull/16395))
+
 - Fix index creation for apps_logs collection ([#16401](https://github.com/RocketChat/Rocket.Chat/pull/16401))
 
 </details>
@@ -592,6 +856,7 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 2.4.5 ([#16380](https://github.com/RocketChat/Rocket.Chat/pull/16380))
 
 </details>
@@ -610,12 +875,15 @@
 
 ### 🐛 Bug fixes
 
+
 - App removal was moving logs to the trash collection ([#16362](https://github.com/RocketChat/Rocket.Chat/pull/16362))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 2.4.4 ([#16377](https://github.com/RocketChat/Rocket.Chat/pull/16377))
+
 - Regression: Rate limiter was not working due to Meteor internal changes ([#16361](https://github.com/RocketChat/Rocket.Chat/pull/16361))
 
 </details>
@@ -635,12 +903,15 @@
 
 ### 🐛 Bug fixes
 
+
 - Unknown error when sending message if 'Set a User Name to Alias in Message' setting is enabled ([#16347](https://github.com/RocketChat/Rocket.Chat/pull/16347))
+
 - Invite links usage by channel owners/moderators ([#16176](https://github.com/RocketChat/Rocket.Chat/pull/16176))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 2.4.3 ([#16358](https://github.com/RocketChat/Rocket.Chat/pull/16358))
 
 </details>
@@ -660,14 +931,19 @@
 
 ### 🐛 Bug fixes
 
+
 - Setup Wizard inputs and Admin Settings ([#16147](https://github.com/RocketChat/Rocket.Chat/pull/16147))
+
 - Slack CSV User Importer ([#16253](https://github.com/RocketChat/Rocket.Chat/pull/16253))
+
 - Integrations list without pagination and outgoing integration creation ([#16233](https://github.com/RocketChat/Rocket.Chat/pull/16233))
+
 - User stuck after reset password ([#16184](https://github.com/RocketChat/Rocket.Chat/pull/16184))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 2.4.2 ([#16274](https://github.com/RocketChat/Rocket.Chat/pull/16274))
 
 </details>
@@ -689,12 +965,15 @@
 
 ### 🐛 Bug fixes
 
+
 - Enable apps change properties of the sender on the message as before ([#16189](https://github.com/RocketChat/Rocket.Chat/pull/16189))
+
 - JS errors on Administration page ([#16139](https://github.com/RocketChat/Rocket.Chat/pull/16139))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 2.4.1 ([#16195](https://github.com/RocketChat/Rocket.Chat/pull/16195))
 
 </details>
@@ -716,87 +995,159 @@
 
 ### 🎉 New features
 
+
 - Invite links: share a link to invite users ([#15933](https://github.com/RocketChat/Rocket.Chat/pull/15933))
+
 - Logout other clients when changing password ([#15927](https://github.com/RocketChat/Rocket.Chat/pull/15927))
+
 - Do not print emails in console on production mode ([#15928](https://github.com/RocketChat/Rocket.Chat/pull/15928))
+
 - Apps-Engine event for when a livechat room is closed ([#15837](https://github.com/RocketChat/Rocket.Chat/pull/15837))
 
 ### 🚀 Improvements
 
+
 - Replace livechat:inquiry publication by REST and Streamer ([#15977](https://github.com/RocketChat/Rocket.Chat/pull/15977))
+
 - Sorting on livechat analytics queries were wrong ([#16021](https://github.com/RocketChat/Rocket.Chat/pull/16021))
+
 - Replace fullUserData publication by REST ([#15650](https://github.com/RocketChat/Rocket.Chat/pull/15650))
+
 - Replace integrations and integrationHistory publications by REST ([#15885](https://github.com/RocketChat/Rocket.Chat/pull/15885))
+
 - Notify logged agents when their departments change ([#16033](https://github.com/RocketChat/Rocket.Chat/pull/16033))
+
 - Replace fullEmojiData publication by REST ([#15901](https://github.com/RocketChat/Rocket.Chat/pull/15901))
+
 - Replace adminRooms publication by REST ([#15948](https://github.com/RocketChat/Rocket.Chat/pull/15948))
+
 - Replace webdavAccounts publication by REST ([#15926](https://github.com/RocketChat/Rocket.Chat/pull/15926))
+
 - Replace oauth publications by REST ([#15878](https://github.com/RocketChat/Rocket.Chat/pull/15878))
+
 - Replace userAutocomplete publication by REST ([#15956](https://github.com/RocketChat/Rocket.Chat/pull/15956))
+
 - Replace discussionsOfARoom publication by REST ([#15908](https://github.com/RocketChat/Rocket.Chat/pull/15908))
+
 - Move 'Reply in Thread' button from menu to message actions ([#15685](https://github.com/RocketChat/Rocket.Chat/pull/15685) by [@antkaz](https://github.com/antkaz))
+
 - Replace customSounds publication by REST ([#15907](https://github.com/RocketChat/Rocket.Chat/pull/15907))
+
 - Replace stdout publication by REST ([#16004](https://github.com/RocketChat/Rocket.Chat/pull/16004))
+
 - Replace fullUserStatusData publication by REST ([#15942](https://github.com/RocketChat/Rocket.Chat/pull/15942))
+
 - Replace userData subscriptions by REST ([#15916](https://github.com/RocketChat/Rocket.Chat/pull/15916))
+
 - Replace roles publication by REST ([#15910](https://github.com/RocketChat/Rocket.Chat/pull/15910))
+
 - Livechat realtime dashboard ([#15792](https://github.com/RocketChat/Rocket.Chat/pull/15792))
+
 - Replace livechat:rooms publication by REST ([#15968](https://github.com/RocketChat/Rocket.Chat/pull/15968))
+
 - Replace livechat:officeHour publication to REST ([#15503](https://github.com/RocketChat/Rocket.Chat/pull/15503))
+
 - Replace forgotten livechat:departmentAgents subscriptions ([#15970](https://github.com/RocketChat/Rocket.Chat/pull/15970))
+
 - Replace livechat:managers publication by REST ([#15944](https://github.com/RocketChat/Rocket.Chat/pull/15944))
+
 - Replace livechat:visitorHistory publication by REST ([#15943](https://github.com/RocketChat/Rocket.Chat/pull/15943))
+
 - Replace livechat:queue subscription ([#15612](https://github.com/RocketChat/Rocket.Chat/pull/15612))
+
 - Add deprecate warning in some unused publications ([#15935](https://github.com/RocketChat/Rocket.Chat/pull/15935))
+
 - Replace livechat:customFields to REST ([#15496](https://github.com/RocketChat/Rocket.Chat/pull/15496))
+
 - Validate user identity on send message process ([#15887](https://github.com/RocketChat/Rocket.Chat/pull/15887))
+
 - Update ui for Roles field ([#15888](https://github.com/RocketChat/Rocket.Chat/pull/15888) by [@antkaz](https://github.com/antkaz))
 
 ### 🐛 Bug fixes
 
+
 - Importer: Variable name appearing instead of it's value ([#16010](https://github.com/RocketChat/Rocket.Chat/pull/16010) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
 - Add time format for latest message on the sidebar ([#15930](https://github.com/RocketChat/Rocket.Chat/pull/15930) by [@ritwizsinha](https://github.com/ritwizsinha))
+
 - Admin Setting descriptions and Storybook ([#15994](https://github.com/RocketChat/Rocket.Chat/pull/15994))
+
 - width of upload-progress-text ([#16023](https://github.com/RocketChat/Rocket.Chat/pull/16023))
+
 - Message list scrolling to bottom on reactions ([#16018](https://github.com/RocketChat/Rocket.Chat/pull/16018))
+
 - SAML logout error ([#15978](https://github.com/RocketChat/Rocket.Chat/pull/15978))
+
 - Added Join button to Read Only rooms. ([#16016](https://github.com/RocketChat/Rocket.Chat/pull/16016))
+
 - z-index of new message button ([#16013](https://github.com/RocketChat/Rocket.Chat/pull/16013))
+
 - new message popup ([#16017](https://github.com/RocketChat/Rocket.Chat/pull/16017))
+
 - Changed renderMessage priority, fixed Katex on/off setting ([#16012](https://github.com/RocketChat/Rocket.Chat/pull/16012))
+
 - Empty security section when 2fa is disabled ([#16009](https://github.com/RocketChat/Rocket.Chat/pull/16009))
+
 - Dropzone being stuck when dragging to thread ([#16006](https://github.com/RocketChat/Rocket.Chat/pull/16006))
+
 - Fix sort livechat rooms ([#16001](https://github.com/RocketChat/Rocket.Chat/pull/16001))
+
 - Guest's name field missing when forwarding livechat rooms ([#15991](https://github.com/RocketChat/Rocket.Chat/pull/15991))
+
 - Error of bind environment on user data export ([#15985](https://github.com/RocketChat/Rocket.Chat/pull/15985))
+
 - Incorrect translation key on Livechat Appearance template ([#15975](https://github.com/RocketChat/Rocket.Chat/pull/15975) by [@ritwizsinha](https://github.com/ritwizsinha))
+
 - Livechat build without NodeJS installed ([#15903](https://github.com/RocketChat/Rocket.Chat/pull/15903) by [@localguru](https://github.com/localguru))
+
 - Server crash on sync with no response ([#15919](https://github.com/RocketChat/Rocket.Chat/pull/15919))
+
 - Don't throw an error when a message is prevented from apps engine ([#15850](https://github.com/RocketChat/Rocket.Chat/pull/15850) by [@wreiske](https://github.com/wreiske))
+
 - Thread Replies in Search ([#15841](https://github.com/RocketChat/Rocket.Chat/pull/15841))
+
 - Registration form was hidden when login form was disabled ([#16062](https://github.com/RocketChat/Rocket.Chat/pull/16062))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Update NodeJS to 8.17.0 ([#16043](https://github.com/RocketChat/Rocket.Chat/pull/16043))
+
 - Fix typo in Italian translation ([#15998](https://github.com/RocketChat/Rocket.Chat/pull/15998) by [@iannuzzelli](https://github.com/iannuzzelli))
+
 - Update Meteor to 1.8.3 ([#16037](https://github.com/RocketChat/Rocket.Chat/pull/16037))
+
 - Some performance improvements ([#15886](https://github.com/RocketChat/Rocket.Chat/pull/15886))
+
 - Fixed Grammatical Mistakes. ([#15570](https://github.com/RocketChat/Rocket.Chat/pull/15570) by [@breaking-let](https://github.com/breaking-let))
+
 - Upgrade limax to 2.0.0 ([#16020](https://github.com/RocketChat/Rocket.Chat/pull/16020))
+
 - Remove unnecessary cron starts ([#15989](https://github.com/RocketChat/Rocket.Chat/pull/15989))
+
 - Enable typescript lint ([#15979](https://github.com/RocketChat/Rocket.Chat/pull/15979))
+
 - LingoHub based on develop ([#15988](https://github.com/RocketChat/Rocket.Chat/pull/15988))
+
 - Fix 'How it all started' link on README ([#15962](https://github.com/RocketChat/Rocket.Chat/pull/15962) by [@zdumitru](https://github.com/zdumitru))
+
 - Check package-lock consistency with package.json on CI ([#15961](https://github.com/RocketChat/Rocket.Chat/pull/15961))
+
 - Meteor update to 1.8.2 ([#15873](https://github.com/RocketChat/Rocket.Chat/pull/15873))
+
 - GitHub CI ([#15918](https://github.com/RocketChat/Rocket.Chat/pull/15918))
+
 - Change migration number 169 <-> 170 ([#15940](https://github.com/RocketChat/Rocket.Chat/pull/15940))
+
 - LingoHub based on develop ([#15939](https://github.com/RocketChat/Rocket.Chat/pull/15939))
+
 - [CHORE] Replace findOne with findOneById methods (Omnichannel) ([#15894](https://github.com/RocketChat/Rocket.Chat/pull/15894))
+
 - Merge master into develop & Set version to 3.0.0-develop ([#15872](https://github.com/RocketChat/Rocket.Chat/pull/15872))
+
 - Regression: Update components ([#16053](https://github.com/RocketChat/Rocket.Chat/pull/16053))
+
 - Regression: Missing button to copy Invite links ([#16084](https://github.com/RocketChat/Rocket.Chat/pull/16084))
 
 </details>
@@ -838,6 +1189,7 @@
 
 ### 🐛 Bug fixes
 
+
 - Add missing password field back to administration area ([#16171](https://github.com/RocketChat/Rocket.Chat/pull/16171))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -855,7 +1207,9 @@
 
 ### 🐛 Bug fixes
 
+
 - Invalid Redirect URI on Custom OAuth ([#15957](https://github.com/RocketChat/Rocket.Chat/pull/15957))
+
 - Livechat Widget version 1.3.0 ([#15966](https://github.com/RocketChat/Rocket.Chat/pull/15966))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -873,11 +1227,17 @@
 
 ### 🐛 Bug fixes
 
+
 - Default value of the Livechat WebhookUrl setting ([#15898](https://github.com/RocketChat/Rocket.Chat/pull/15898))
+
 - Admin menu not showing after renamed integration permissions ([#15937](https://github.com/RocketChat/Rocket.Chat/pull/15937) by [@n-se](https://github.com/n-se))
+
 - Administration UI issues ([#15934](https://github.com/RocketChat/Rocket.Chat/pull/15934))
+
 - Livechat permissions being overwrite on server restart ([#15915](https://github.com/RocketChat/Rocket.Chat/pull/15915))
+
 - Livechat triggers not firing ([#15897](https://github.com/RocketChat/Rocket.Chat/pull/15897))
+
 - Auto load image user preference ([#15895](https://github.com/RocketChat/Rocket.Chat/pull/15895))
 
 ### 👩‍💻👨‍💻 Contributors 😍
@@ -900,90 +1260,165 @@
 
 ### 🎉 New features
 
+
 - Add forms to view and edit Livechat agents info ([#15703](https://github.com/RocketChat/Rocket.Chat/pull/15703))
+
 - Workspace Manual Registration ([#15442](https://github.com/RocketChat/Rocket.Chat/pull/15442))
+
 - Option on livechat departments to ensure a chat has tags before closing ([#15752](https://github.com/RocketChat/Rocket.Chat/pull/15752))
+
 - Setting to dismiss desktop notification only after interaction ([#14807](https://github.com/RocketChat/Rocket.Chat/pull/14807) by [@mpdbl](https://github.com/mpdbl))
+
 - Option for admins to set a random password to a user ([#15818](https://github.com/RocketChat/Rocket.Chat/pull/15818))
+
 - SAML login without popup windows ([#15836](https://github.com/RocketChat/Rocket.Chat/pull/15836))
+
 - Add ability to users reset their own E2E key ([#15777](https://github.com/RocketChat/Rocket.Chat/pull/15777))
+
 - Notify users when their email address change ([#15828](https://github.com/RocketChat/Rocket.Chat/pull/15828))
+
 - Add a new stream to emit and listen room data events ([#15770](https://github.com/RocketChat/Rocket.Chat/pull/15770))
+
 - Livechat analytics ([#15230](https://github.com/RocketChat/Rocket.Chat/pull/15230))
+
 - Allow Regexes on SAML user field mapping ([#15743](https://github.com/RocketChat/Rocket.Chat/pull/15743))
+
 - Livechat analytics functions ([#15666](https://github.com/RocketChat/Rocket.Chat/pull/15666))
+
 - add delete-own-message permission ([#15512](https://github.com/RocketChat/Rocket.Chat/pull/15512))
 
 ### 🚀 Improvements
 
+
 - Make push notification batchsize and interval configurable ([#15804](https://github.com/RocketChat/Rocket.Chat/pull/15804) by [@Exordian](https://github.com/Exordian))
+
 - Add more fields to iframe integration event `unread-changed-by-subscription` ([#15786](https://github.com/RocketChat/Rocket.Chat/pull/15786))
+
 - Allow dragging of images and text from browsers ([#15691](https://github.com/RocketChat/Rocket.Chat/pull/15691))
+
 - Unfollow own threads ([#15740](https://github.com/RocketChat/Rocket.Chat/pull/15740))
+
 - Administration UI - React and Fuselage components ([#15452](https://github.com/RocketChat/Rocket.Chat/pull/15452))
+
 - Replace livechat:pagesvisited publication by REST ([#15629](https://github.com/RocketChat/Rocket.Chat/pull/15629))
+
 - Replace livechat:externalMessages publication by REST ([#15643](https://github.com/RocketChat/Rocket.Chat/pull/15643))
+
 - dynamic import  livechat views ([#15775](https://github.com/RocketChat/Rocket.Chat/pull/15775))
+
 - Replace livechat:visitorInfo publication by REST ([#15639](https://github.com/RocketChat/Rocket.Chat/pull/15639))
+
 - Lazyload Chart.js ([#15764](https://github.com/RocketChat/Rocket.Chat/pull/15764))
+
 - Lazyload qrcode lib ([#15741](https://github.com/RocketChat/Rocket.Chat/pull/15741))
+
 - Replace personalAccessTokens publication by REST ([#15644](https://github.com/RocketChat/Rocket.Chat/pull/15644))
+
 - Replace livechat:departmentAgents subscription to REST ([#15529](https://github.com/RocketChat/Rocket.Chat/pull/15529))
+
 - remove computations inside messageAttachment ([#15716](https://github.com/RocketChat/Rocket.Chat/pull/15716))
+
 - Replace snippetedMessage publication by REST ([#15679](https://github.com/RocketChat/Rocket.Chat/pull/15679))
+
 - Replace snipptedMessages publication by REST ([#15678](https://github.com/RocketChat/Rocket.Chat/pull/15678))
+
 - Remove "EmojiCustom" unused subscription ([#15658](https://github.com/RocketChat/Rocket.Chat/pull/15658))
 
 ### 🐛 Bug fixes
 
+
 - Missing Privacy Policy Agree on register ([#15832](https://github.com/RocketChat/Rocket.Chat/pull/15832))
+
 - Push: fix notification priority for google (FCM) ([#15803](https://github.com/RocketChat/Rocket.Chat/pull/15803) by [@Exordian](https://github.com/Exordian))
+
 - Not valid relative URLs on message attachments ([#15651](https://github.com/RocketChat/Rocket.Chat/pull/15651))
+
 - REST endpoint `chat.syncMessages` returning an error with deleted messages ([#15824](https://github.com/RocketChat/Rocket.Chat/pull/15824))
+
 - Channel notification audio preferences ([#15771](https://github.com/RocketChat/Rocket.Chat/pull/15771))
+
 - Pasting images on reply as thread ([#15811](https://github.com/RocketChat/Rocket.Chat/pull/15811))
+
 - Prevent agent last message undefined ([#15809](https://github.com/RocketChat/Rocket.Chat/pull/15809))
+
 - Livechat transfer history messages ([#15780](https://github.com/RocketChat/Rocket.Chat/pull/15780))
+
 - Add button to reset.css ([#15773](https://github.com/RocketChat/Rocket.Chat/pull/15773))
+
 - Mentions before blockquote ([#15774](https://github.com/RocketChat/Rocket.Chat/pull/15774))
+
 - Sidebar font color was not respecting theming ([#15745](https://github.com/RocketChat/Rocket.Chat/pull/15745))
+
 - Add livechat agents into departments ([#15732](https://github.com/RocketChat/Rocket.Chat/pull/15732))
+
 - Changed cmsPage Style ([#15632](https://github.com/RocketChat/Rocket.Chat/pull/15632))
+
 - Forward Livechat UI and the related permissions  ([#15718](https://github.com/RocketChat/Rocket.Chat/pull/15718))
+
 - line-height to show entire letters ([#15581](https://github.com/RocketChat/Rocket.Chat/pull/15581) by [@nstseek](https://github.com/nstseek))
+
 - Apply server side filters on Livechat lists ([#15717](https://github.com/RocketChat/Rocket.Chat/pull/15717))
+
 - Error when exporting user data ([#15654](https://github.com/RocketChat/Rocket.Chat/pull/15654))
+
 - Livechat webhook broken when sending an image ([#15699](https://github.com/RocketChat/Rocket.Chat/pull/15699) by [@tatosjb](https://github.com/tatosjb))
+
 - Sending messages to livechat rooms without a subscription ([#15707](https://github.com/RocketChat/Rocket.Chat/pull/15707))
+
 - Duplicate label 'Hide Avatars' in accounts ([#15694](https://github.com/RocketChat/Rocket.Chat/pull/15694) by [@rajvaibhavdubey](https://github.com/rajvaibhavdubey))
+
 - Block Show_Setup_Wizard Option ([#15623](https://github.com/RocketChat/Rocket.Chat/pull/15623))
+
 - Use Media Devices API to guess if a microphone is not available ([#15636](https://github.com/RocketChat/Rocket.Chat/pull/15636))
+
 - Ignore file uploads from message box if text/plain content is being pasted ([#15631](https://github.com/RocketChat/Rocket.Chat/pull/15631))
+
 - typo on PT-BR translation ([#15645](https://github.com/RocketChat/Rocket.Chat/pull/15645))
+
 - Null value at Notifications Preferences tab ([#15638](https://github.com/RocketChat/Rocket.Chat/pull/15638))
+
 - Edit in thread ([#15640](https://github.com/RocketChat/Rocket.Chat/pull/15640))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 2.2.0 ([#15681](https://github.com/RocketChat/Rocket.Chat/pull/15681) by [@Montel](https://github.com/Montel) & [@antkaz](https://github.com/antkaz) & [@hmagarotto](https://github.com/hmagarotto) & [@nstseek](https://github.com/nstseek) & [@oguhpereira](https://github.com/oguhpereira) & [@rodrigokamada](https://github.com/rodrigokamada) & [@yusukeh0710](https://github.com/yusukeh0710))
+
 - LingoHub based on develop ([#15822](https://github.com/RocketChat/Rocket.Chat/pull/15822))
+
 - [REGRESSION] Add livechat room type to the room's file list ([#15795](https://github.com/RocketChat/Rocket.Chat/pull/15795))
+
 - Fix notification migration ([#15783](https://github.com/RocketChat/Rocket.Chat/pull/15783))
+
 - Regression: fix admin instances info page ([#15772](https://github.com/RocketChat/Rocket.Chat/pull/15772))
+
 - LingoHub based on develop ([#15763](https://github.com/RocketChat/Rocket.Chat/pull/15763))
+
 - Regression: messageAttachments inside messageAttachments not receiving settings ([#15733](https://github.com/RocketChat/Rocket.Chat/pull/15733))
+
 - Improve LDAP Login Fallback setting description in portuguese ([#15655](https://github.com/RocketChat/Rocket.Chat/pull/15655))
+
 - Update moment-timezone ([#15729](https://github.com/RocketChat/Rocket.Chat/pull/15729))
+
 - LingoHub based on develop ([#15728](https://github.com/RocketChat/Rocket.Chat/pull/15728))
+
 - Regression: Fix hide avatars in side bar preference ([#15709](https://github.com/RocketChat/Rocket.Chat/pull/15709))
+
 - Remove yarn.lock ([#15689](https://github.com/RocketChat/Rocket.Chat/pull/15689))
+
 - LingoHub based on develop ([#15688](https://github.com/RocketChat/Rocket.Chat/pull/15688))
+
 - Merge master into develop & Set version to 2.3.0-develop ([#15683](https://github.com/RocketChat/Rocket.Chat/pull/15683))
+
 - Release 2.2.0 ([#15681](https://github.com/RocketChat/Rocket.Chat/pull/15681) by [@Montel](https://github.com/Montel) & [@antkaz](https://github.com/antkaz) & [@hmagarotto](https://github.com/hmagarotto) & [@nstseek](https://github.com/nstseek) & [@oguhpereira](https://github.com/oguhpereira) & [@rodrigokamada](https://github.com/rodrigokamada) & [@yusukeh0710](https://github.com/yusukeh0710))
+
 - Fix Livechat duplicated templates error ([#15869](https://github.com/RocketChat/Rocket.Chat/pull/15869))
+
 - Improvements to random password field on user edit/creation ([#15870](https://github.com/RocketChat/Rocket.Chat/pull/15870))
+
 - Remove unused permission to reset users' E2E key ([#15860](https://github.com/RocketChat/Rocket.Chat/pull/15860))
+
 - [CHORE] Add lingohub to readme ([#15849](https://github.com/RocketChat/Rocket.Chat/pull/15849))
 
 </details>
@@ -1037,94 +1472,173 @@
 
 ### 🎉 New features
 
+
 - Accept GIFs and SVGs for Avatars converting them to PNG and keep transparency of PNGs ([#11385](https://github.com/RocketChat/Rocket.Chat/pull/11385))
+
 - Thread support to apps slashcommands and slashcommand previews ([#15574](https://github.com/RocketChat/Rocket.Chat/pull/15574))
+
 - Remove all closed Livechat chats ([#13991](https://github.com/RocketChat/Rocket.Chat/pull/13991) by [@knrt10](https://github.com/knrt10))
+
 - Separate integration roles ([#13902](https://github.com/RocketChat/Rocket.Chat/pull/13902))
+
 - Add users.requestDataDownload API endpoint ([#14428](https://github.com/RocketChat/Rocket.Chat/pull/14428) by [@Hudell](https://github.com/Hudell) & [@ubarsaiyan](https://github.com/ubarsaiyan))
+
 - Check if agent can receive new livechat conversations when its status is away/idle ([#15451](https://github.com/RocketChat/Rocket.Chat/pull/15451))
+
 - Import SAML language and auto join SAML channels ([#14203](https://github.com/RocketChat/Rocket.Chat/pull/14203) by [@Hudell](https://github.com/Hudell) & [@unixtam](https://github.com/unixtam))
+
 - Add option to enable X-Frame-options header to avoid loading inside any Iframe ([#14698](https://github.com/RocketChat/Rocket.Chat/pull/14698))
+
 - Assign new Livechat conversations to bot agents first ([#15317](https://github.com/RocketChat/Rocket.Chat/pull/15317))
+
 - Added file type filter to RoomFiles ([#15289](https://github.com/RocketChat/Rocket.Chat/pull/15289) by [@juanpetterson](https://github.com/juanpetterson))
+
 - Add new Livechat appearance setting to set the conversation finished message ([#15577](https://github.com/RocketChat/Rocket.Chat/pull/15577))
+
 - close emoji box using Keyboard Escape key ([#13956](https://github.com/RocketChat/Rocket.Chat/pull/13956) by [@mohamedar97](https://github.com/mohamedar97))
+
 - Update livechat widget version to 1.2.5 ([#15600](https://github.com/RocketChat/Rocket.Chat/pull/15600))
+
 - Import DMs from CSV files ([#15534](https://github.com/RocketChat/Rocket.Chat/pull/15534))
 
 ### 🚀 Improvements
 
+
 - Replace livechat:integration publication by REST ([#15607](https://github.com/RocketChat/Rocket.Chat/pull/15607))
+
 - Replace livechat:appearance pub to REST ([#15510](https://github.com/RocketChat/Rocket.Chat/pull/15510))
+
 - Cache hasPermissions ([#15589](https://github.com/RocketChat/Rocket.Chat/pull/15589))
+
 - Disable edit visitor's phone number in SMS conversations ([#15593](https://github.com/RocketChat/Rocket.Chat/pull/15593))
+
 - Lazyload Katex Package ([#15398](https://github.com/RocketChat/Rocket.Chat/pull/15398))
+
 - Replace `livechat:triggers` publication by REST calls ([#15507](https://github.com/RocketChat/Rocket.Chat/pull/15507))
+
 - Replace roomFilesWithSearchText subscription ([#15550](https://github.com/RocketChat/Rocket.Chat/pull/15550))
+
 - Replace starred messages subscription ([#15548](https://github.com/RocketChat/Rocket.Chat/pull/15548))
+
 - Replace some livechat:rooms subscriptions ([#15532](https://github.com/RocketChat/Rocket.Chat/pull/15532))
+
 - Replace pinned messages subscription ([#15544](https://github.com/RocketChat/Rocket.Chat/pull/15544))
+
 - Replace mentionedMessages publication to REST ([#15540](https://github.com/RocketChat/Rocket.Chat/pull/15540))
+
 - Detach React components from Meteor API ([#15482](https://github.com/RocketChat/Rocket.Chat/pull/15482))
+
 - Replace livechat:agents pub by REST calls ([#15490](https://github.com/RocketChat/Rocket.Chat/pull/15490))
+
 - Replace `livechat:departments` publication by REST Calls ([#15478](https://github.com/RocketChat/Rocket.Chat/pull/15478))
+
 - Secure cookies when using HTTPS connection ([#15500](https://github.com/RocketChat/Rocket.Chat/pull/15500))
+
 - Update Fuselage components on SetupWizard ([#15457](https://github.com/RocketChat/Rocket.Chat/pull/15457))
 
 ### 🐛 Bug fixes
 
+
 - Issues saving audio notifications ([#15428](https://github.com/RocketChat/Rocket.Chat/pull/15428) by [@scrivna](https://github.com/scrivna))
+
 - Fix a typo on Alpha API `e2e.setUserPublicAndPivateKeys` renaming to `e2e.setUserPublicAndPrivateKeys` ([#13334](https://github.com/RocketChat/Rocket.Chat/pull/13334))
+
 - Showing announcement back ([#15615](https://github.com/RocketChat/Rocket.Chat/pull/15615))
+
 - adjustments for tooltips to show room name instead of id ([#14084](https://github.com/RocketChat/Rocket.Chat/pull/14084) by [@mohamedar97](https://github.com/mohamedar97))
+
 - Deny editing visitor's phone number in SMS conversations ([#15602](https://github.com/RocketChat/Rocket.Chat/pull/15602))
+
 - Incorrect display of the button "Invite users" ([#15594](https://github.com/RocketChat/Rocket.Chat/pull/15594))
+
 - Compact view ([#15416](https://github.com/RocketChat/Rocket.Chat/pull/15416))
+
 - leak on stdout listeners ([#15586](https://github.com/RocketChat/Rocket.Chat/pull/15586))
+
 - Self-XSS in validation functionality ([#15564](https://github.com/RocketChat/Rocket.Chat/pull/15564))
+
 - Registration/login page now mobile friendly (#15422) ([#15520](https://github.com/RocketChat/Rocket.Chat/pull/15520) by [@nstseek](https://github.com/nstseek))
+
 - Update apps engine rooms converter to use transformMappedData ([#15546](https://github.com/RocketChat/Rocket.Chat/pull/15546))
+
 - Missing ending slash on publicFilePath of fileUpload ([#15506](https://github.com/RocketChat/Rocket.Chat/pull/15506))
+
 - Japanese translation for run import ([#15515](https://github.com/RocketChat/Rocket.Chat/pull/15515) by [@yusukeh0710](https://github.com/yusukeh0710))
+
 - Add a header for the createAt column in the Directory ([#15556](https://github.com/RocketChat/Rocket.Chat/pull/15556) by [@antkaz](https://github.com/antkaz))
+
 - Method saveUser is not using password policy ([#15445](https://github.com/RocketChat/Rocket.Chat/pull/15445))
+
 - Add permissions for slashCommands ([#15525](https://github.com/RocketChat/Rocket.Chat/pull/15525) by [@antkaz](https://github.com/antkaz))
+
 - Typo in autotranslate method ([#15344](https://github.com/RocketChat/Rocket.Chat/pull/15344) by [@Montel](https://github.com/Montel))
+
 - Adding "Promise.await" in "livechat/message" endpoint ([#15541](https://github.com/RocketChat/Rocket.Chat/pull/15541) by [@rodrigokamada](https://github.com/rodrigokamada))
+
 - Reset password was allowing empty values leading to an impossibility to login ([#15444](https://github.com/RocketChat/Rocket.Chat/pull/15444))
+
 - Emoji are rendered in URL ([#15516](https://github.com/RocketChat/Rocket.Chat/pull/15516) by [@oguhpereira](https://github.com/oguhpereira))
+
 - Promise await for sendMessage in livechat/messages endpoint ([#15460](https://github.com/RocketChat/Rocket.Chat/pull/15460) by [@hmagarotto](https://github.com/hmagarotto))
+
 - Exposing some fields on server logs at debug level ([#15514](https://github.com/RocketChat/Rocket.Chat/pull/15514))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Merge master into develop & Set version to 2.2.0-develop ([#15622](https://github.com/RocketChat/Rocket.Chat/pull/15622))
+
 - [FEATURE] Rest API upload file returns message object ([#13821](https://github.com/RocketChat/Rocket.Chat/pull/13821) by [@knrt10](https://github.com/knrt10))
+
 - New: Add dev dependency david badge to README ([#9058](https://github.com/RocketChat/Rocket.Chat/pull/9058) by [@robbyoconnor](https://github.com/robbyoconnor))
+
 - Regression: add stdout publication back ([#15614](https://github.com/RocketChat/Rocket.Chat/pull/15614))
+
 - Livechat Issues ([#15473](https://github.com/RocketChat/Rocket.Chat/pull/15473))
+
 - Regression: Fix broken message formatting box ([#15599](https://github.com/RocketChat/Rocket.Chat/pull/15599))
+
 - [CHORE] Update latest Livechat widget version to 1.2.4 ([#15596](https://github.com/RocketChat/Rocket.Chat/pull/15596))
+
 - Remove unneeded nginx file ([#15483](https://github.com/RocketChat/Rocket.Chat/pull/15483))
+
 - [REGRESSION] Fix remove department from list ([#15591](https://github.com/RocketChat/Rocket.Chat/pull/15591))
+
 - [CHORE] Update latest Livechat widget version to 1.2.2 ([#15592](https://github.com/RocketChat/Rocket.Chat/pull/15592))
+
 - Revert fix package-lock.json ([#15563](https://github.com/RocketChat/Rocket.Chat/pull/15563))
+
 - Regression: Fix package-lock.json ([#15561](https://github.com/RocketChat/Rocket.Chat/pull/15561))
+
 - [CHORE] Split logger classes to avoid cyclic dependencies ([#15559](https://github.com/RocketChat/Rocket.Chat/pull/15559))
+
 - docs: remove rocket chat launcher link ([#15477](https://github.com/RocketChat/Rocket.Chat/pull/15477) by [@RafaelGSS](https://github.com/RafaelGSS))
+
 - [CHORE] remove 'bulk-create-c' permission ([#15517](https://github.com/RocketChat/Rocket.Chat/pull/15517) by [@antkaz](https://github.com/antkaz))
+
 - Reply HTTP requests with `X-XSS-Protection: 1` header ([#15498](https://github.com/RocketChat/Rocket.Chat/pull/15498))
+
 - Updating license term ([#15476](https://github.com/RocketChat/Rocket.Chat/pull/15476))
+
 - LingoHub based on develop ([#15487](https://github.com/RocketChat/Rocket.Chat/pull/15487))
+
 - Merge master into develop & Set version to 2.2.0-develop ([#15469](https://github.com/RocketChat/Rocket.Chat/pull/15469))
+
 - Regression: hasPermission ignoring subscription roles ([#15652](https://github.com/RocketChat/Rocket.Chat/pull/15652))
+
 - Regression: AppRoomsConverter on Livechat rooms ([#15646](https://github.com/RocketChat/Rocket.Chat/pull/15646))
+
 - Regression: fix unknown role breaking hasPermission ([#15641](https://github.com/RocketChat/Rocket.Chat/pull/15641))
+
 - Regression: Move import to avoid circular dependencies ([#15628](https://github.com/RocketChat/Rocket.Chat/pull/15628))
+
 - Chore: Add Client Setup Information to Issue Template ([#15625](https://github.com/RocketChat/Rocket.Chat/pull/15625))
+
 - Move publication deprecation warnings ([#15676](https://github.com/RocketChat/Rocket.Chat/pull/15676))
+
 - Regression: Remove reference to obsolete template helper ([#15675](https://github.com/RocketChat/Rocket.Chat/pull/15675))
+
 - Merge master into develop ([#15680](https://github.com/RocketChat/Rocket.Chat/pull/15680) by [@knrt10](https://github.com/knrt10))
 
 </details>
@@ -1180,13 +1694,17 @@
 
 ### 🐛 Bug fixes
 
+
 - Read Receipts were not working properly with subscriptions without ls ([#15656](https://github.com/RocketChat/Rocket.Chat/pull/15656))
+
 - Exception when sending email of messages attachments undefined ([#15657](https://github.com/RocketChat/Rocket.Chat/pull/15657))
+
 - Channel Announcements not working ([#14635](https://github.com/RocketChat/Rocket.Chat/pull/14635) by [@knrt10](https://github.com/knrt10))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 2.1.2 ([#15667](https://github.com/RocketChat/Rocket.Chat/pull/15667) by [@knrt10](https://github.com/knrt10))
 
 </details>
@@ -1211,7 +1729,9 @@
 
 ### 🐛 Bug fixes
 
+
 - Read Recepts was not working ([#15603](https://github.com/RocketChat/Rocket.Chat/pull/15603))
+
 - Dynamic import of JS files were not working correctly ([#15598](https://github.com/RocketChat/Rocket.Chat/pull/15598))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -1229,88 +1749,158 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Deprecate old CORS API access for Cordova mobile app ([#15322](https://github.com/RocketChat/Rocket.Chat/pull/15322))
 
 ### 🎉 New features
 
+
 - Apps engine Livechat ([#14626](https://github.com/RocketChat/Rocket.Chat/pull/14626))
+
 - Livechat setting to show/hide Agent Information on the widget ([#15216](https://github.com/RocketChat/Rocket.Chat/pull/15216))
+
 - SAML User Data Mapping ([#15404](https://github.com/RocketChat/Rocket.Chat/pull/15404))
+
 - Add ability to disable email notifications globally ([#9667](https://github.com/RocketChat/Rocket.Chat/pull/9667) by [@ferdifly](https://github.com/ferdifly))
+
 - Validate NotBefore and NotOnOrAfter SAML assertions ([#15226](https://github.com/RocketChat/Rocket.Chat/pull/15226))
+
 - Setting to configure SAML context comparison ([#15229](https://github.com/RocketChat/Rocket.Chat/pull/15229))
+
 - Expand SAML Users Role Settings ([#15277](https://github.com/RocketChat/Rocket.Chat/pull/15277) by [@Hudell](https://github.com/Hudell))
+
 - Guess a user's name from SAML credentials ([#15240](https://github.com/RocketChat/Rocket.Chat/pull/15240) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Setting to remove message contents from email notifications ([#15406](https://github.com/RocketChat/Rocket.Chat/pull/15406))
+
 - Add JWT to uploaded files urls ([#15297](https://github.com/RocketChat/Rocket.Chat/pull/15297))
+
 - Provide site-url to outgoing integrations ([#15238](https://github.com/RocketChat/Rocket.Chat/pull/15238) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Only Load CodeMirror code when it is needed ([#15351](https://github.com/RocketChat/Rocket.Chat/pull/15351))
+
 - Allow file sharing through Twilio(WhatsApp) integration ([#15415](https://github.com/RocketChat/Rocket.Chat/pull/15415))
 
 ### 🚀 Improvements
 
+
 - Change default user's preference for notifications to 'All messages' ([#15420](https://github.com/RocketChat/Rocket.Chat/pull/15420))
+
 - Remove global Blaze helpers ([#15414](https://github.com/RocketChat/Rocket.Chat/pull/15414))
+
 - User data export ([#15294](https://github.com/RocketChat/Rocket.Chat/pull/15294) by [@Hudell](https://github.com/Hudell))
+
 - A11y: Buttons, Images, Popups ([#15405](https://github.com/RocketChat/Rocket.Chat/pull/15405))
+
 - Administration UI ([#15401](https://github.com/RocketChat/Rocket.Chat/pull/15401))
+
 - Make the agents field optional when updating Livechat departments ([#15400](https://github.com/RocketChat/Rocket.Chat/pull/15400))
+
 - Replace LESS autoprefixer plugin ([#15260](https://github.com/RocketChat/Rocket.Chat/pull/15260))
+
 - Add missing indices used by read receipts ([#15316](https://github.com/RocketChat/Rocket.Chat/pull/15316))
+
 - Add possibility of renaming a discussion ([#15122](https://github.com/RocketChat/Rocket.Chat/pull/15122))
+
 - AvatarBlockUnauthenticatedAccess do not call user.find if you dont have to ([#15355](https://github.com/RocketChat/Rocket.Chat/pull/15355))
+
 - improve autolinker flow ([#15340](https://github.com/RocketChat/Rocket.Chat/pull/15340))
+
 - Add CustomSounds.play() helper ([#15256](https://github.com/RocketChat/Rocket.Chat/pull/15256))
 
 ### 🐛 Bug fixes
 
+
 - Delivering real-time messages to users that left a room ([#15389](https://github.com/RocketChat/Rocket.Chat/pull/15389))
+
 - Federation messages notifications ([#15418](https://github.com/RocketChat/Rocket.Chat/pull/15418))
+
 - Property "permission" in slash commands of custom apps (#14739) ([#14741](https://github.com/RocketChat/Rocket.Chat/pull/14741) by [@ifantom](https://github.com/ifantom))
+
 - Notify admin was generating errors when Rocket.Cat user was edited or deleted ([#15387](https://github.com/RocketChat/Rocket.Chat/pull/15387))
+
 - Fix file uploads JWT ([#15412](https://github.com/RocketChat/Rocket.Chat/pull/15412))
+
 - Double send bug on message box ([#15409](https://github.com/RocketChat/Rocket.Chat/pull/15409))
+
 - Prune messages by cron if room not updated ([#15252](https://github.com/RocketChat/Rocket.Chat/pull/15252))
+
 - Subscription record not having the `ls` field ([#14544](https://github.com/RocketChat/Rocket.Chat/pull/14544))
+
 - CAS users can take control of Rocket.Chat accounts ([#15346](https://github.com/RocketChat/Rocket.Chat/pull/15346))
+
 - Add ENV VAR to enable users create token feature ([#15334](https://github.com/RocketChat/Rocket.Chat/pull/15334))
+
 - REST API to return only public custom fields ([#15292](https://github.com/RocketChat/Rocket.Chat/pull/15292))
+
 - REST endpoint `users.setPreferences` to not override all user's preferences ([#15288](https://github.com/RocketChat/Rocket.Chat/pull/15288))
+
 - LDAP usernames get additional '.' if they contain numbers ([#14644](https://github.com/RocketChat/Rocket.Chat/pull/14644) by [@Hudell](https://github.com/Hudell))
+
 - Don't allow email violating whitelist addresses ([#15339](https://github.com/RocketChat/Rocket.Chat/pull/15339))
+
 - Limit exposed fields on some users. endpoints ([#15327](https://github.com/RocketChat/Rocket.Chat/pull/15327))
+
 - Empty custom emojis on emoji picker ([#15392](https://github.com/RocketChat/Rocket.Chat/pull/15392))
+
 - User Profile Time Format ([#15385](https://github.com/RocketChat/Rocket.Chat/pull/15385))
+
 - Grammatical error in Not Found page ([#15382](https://github.com/RocketChat/Rocket.Chat/pull/15382))
+
 - Set the DEFAULT_ECDH_CURVE to auto (#15245) ([#15365](https://github.com/RocketChat/Rocket.Chat/pull/15365) by [@dlundgren](https://github.com/dlundgren))
+
 - Message box not centered ([#15367](https://github.com/RocketChat/Rocket.Chat/pull/15367))
+
 - Duplicate Channels in Search-bar ([#15056](https://github.com/RocketChat/Rocket.Chat/pull/15056))
+
 - Reduce Message cache time to 500ms ([#15295](https://github.com/RocketChat/Rocket.Chat/pull/15295) by [@vickyokrm](https://github.com/vickyokrm))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Regression: Prevent parsing empty custom field setting ([#15413](https://github.com/RocketChat/Rocket.Chat/pull/15413))
+
 - Use version 2 of the DeepL API ([#15364](https://github.com/RocketChat/Rocket.Chat/pull/15364) by [@vickyokrm](https://github.com/vickyokrm))
+
 - Remove GraphQL dependencies left ([#15356](https://github.com/RocketChat/Rocket.Chat/pull/15356))
+
 - [Fix] Missing space between last username & 'and' word in react notification ([#15384](https://github.com/RocketChat/Rocket.Chat/pull/15384) by [@zdumitru](https://github.com/zdumitru))
+
 - Add a missing 'Discussion' translation key ([#14029](https://github.com/RocketChat/Rocket.Chat/pull/14029) by [@ura14h](https://github.com/ura14h))
+
 - Improve Polish translation ([#14060](https://github.com/RocketChat/Rocket.Chat/pull/14060) by [@stepek](https://github.com/stepek))
+
 - Regression: Messagebox height changing when typing ([#15380](https://github.com/RocketChat/Rocket.Chat/pull/15380))
+
 - LingoHub based on develop ([#15377](https://github.com/RocketChat/Rocket.Chat/pull/15377))
+
 - Regression: Fix DDP metrics ([#15368](https://github.com/RocketChat/Rocket.Chat/pull/15368))
+
 - [CHORE] Move pathFor helper to templateHelpers directory ([#15255](https://github.com/RocketChat/Rocket.Chat/pull/15255))
+
 - Fix typo in LDAP User Search setting description ([#15228](https://github.com/RocketChat/Rocket.Chat/pull/15228))
+
 - Remove log ADMIN_PASS environment variable ([#15307](https://github.com/RocketChat/Rocket.Chat/pull/15307))
+
 - Improve text of the search bar description ([#15353](https://github.com/RocketChat/Rocket.Chat/pull/15353))
+
 - [CHORE] Remove obsolete modal template ([#15257](https://github.com/RocketChat/Rocket.Chat/pull/15257))
+
 - Update Meteor to 1.8.1 ([#15358](https://github.com/RocketChat/Rocket.Chat/pull/15358))
+
 - Merge master into develop & Set version to 2.1.0-develop ([#15357](https://github.com/RocketChat/Rocket.Chat/pull/15357))
+
 - Regression: Fix invalid version string error on marketplace screen ([#15437](https://github.com/RocketChat/Rocket.Chat/pull/15437))
+
 - Regression: Fix Commit Section when there is no commit info ([#15436](https://github.com/RocketChat/Rocket.Chat/pull/15436))
+
 - Regression: setup wizard dynamic import using relative url ([#15432](https://github.com/RocketChat/Rocket.Chat/pull/15432))
+
 - Regression: Favorite room button ([#15426](https://github.com/RocketChat/Rocket.Chat/pull/15426))
+
 - Regression: API CORS not working after Cordova being disabled by default ([#15443](https://github.com/RocketChat/Rocket.Chat/pull/15443))
+
 - Update Apps-Engine version to final version ([#15458](https://github.com/RocketChat/Rocket.Chat/pull/15458))
 
 </details>
@@ -1359,97 +1949,176 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Federation refactor with addition of chained events ([#15206](https://github.com/RocketChat/Rocket.Chat/pull/15206))
+
 - Remove support of MongoDB 3.2 and deprecate MongoDB 3.4 ([#15199](https://github.com/RocketChat/Rocket.Chat/pull/15199))
+
 - Remove GraphQL and grant packages ([#15192](https://github.com/RocketChat/Rocket.Chat/pull/15192))
+
 - Remove publication `roomSubscriptionsByRole` ([#15193](https://github.com/RocketChat/Rocket.Chat/pull/15193))
+
 - Remove publication `usersInRole` ([#15194](https://github.com/RocketChat/Rocket.Chat/pull/15194))
+
 - Remove old livechat client ([#15133](https://github.com/RocketChat/Rocket.Chat/pull/15133))
+
 - Replace tap:i18n to add support to 3-digit locales ([#15109](https://github.com/RocketChat/Rocket.Chat/pull/15109))
 
 ### 🎉 New features
 
+
 - Custom message popups ([#15117](https://github.com/RocketChat/Rocket.Chat/pull/15117) by [@Hudell](https://github.com/Hudell))
+
 - Options for SAML auth for individual organizations needs ([#14275](https://github.com/RocketChat/Rocket.Chat/pull/14275) by [@Deltachaos](https://github.com/Deltachaos) & [@Hudell](https://github.com/Hudell))
+
 - Assume that Rocket.Chat runs behind one proxy by default (HTTP_FORWARDED_COUNT=1) ([#15214](https://github.com/RocketChat/Rocket.Chat/pull/15214))
+
 - LDAP User Groups, Roles, and Channel Synchronization ([#14278](https://github.com/RocketChat/Rocket.Chat/pull/14278) by [@Hudell](https://github.com/Hudell) & [@wreiske](https://github.com/wreiske))
+
 - Setup Wizard and Page not found, using React components ([#15204](https://github.com/RocketChat/Rocket.Chat/pull/15204))
+
 - Add Mobex to the list of SMS service providers ([#14655](https://github.com/RocketChat/Rocket.Chat/pull/14655) by [@zolbayars](https://github.com/zolbayars))
+
 - Support multiple push gateways ([#14902](https://github.com/RocketChat/Rocket.Chat/pull/14902) by [@cardoso](https://github.com/cardoso))
+
 - Rest API Endpoint to get pinned messages from a room  ([#13864](https://github.com/RocketChat/Rocket.Chat/pull/13864) by [@thayannevls](https://github.com/thayannevls))
+
 - Granular permissions for settings ([#8942](https://github.com/RocketChat/Rocket.Chat/pull/8942) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Add autotranslate Rest endpoints ([#14885](https://github.com/RocketChat/Rocket.Chat/pull/14885))
+
 - Option to hide the button of Custom OAuth on login screen ([#15053](https://github.com/RocketChat/Rocket.Chat/pull/15053))
+
 - Endpoint to fetch livechat rooms with several filters ([#15155](https://github.com/RocketChat/Rocket.Chat/pull/15155))
+
 - Integrate DEEPL translation service to RC core ([#12174](https://github.com/RocketChat/Rocket.Chat/pull/12174) by [@mrsimpson](https://github.com/mrsimpson) & [@vickyokrm](https://github.com/vickyokrm))
+
 - Jitsi meet room access via a token ([#12259](https://github.com/RocketChat/Rocket.Chat/pull/12259) by [@rrzharikov](https://github.com/rrzharikov))
 
 ### 🚀 Improvements
 
+
 - Livechat User Management Improvements ([#14736](https://github.com/RocketChat/Rocket.Chat/pull/14736) by [@Hudell](https://github.com/Hudell))
+
 - Refactoring the queuing and routing processes of new livechats ([#15003](https://github.com/RocketChat/Rocket.Chat/pull/15003))
+
 - Add limit of 50 user's resume tokens ([#15102](https://github.com/RocketChat/Rocket.Chat/pull/15102))
+
 - Add asset extension validation ([#15088](https://github.com/RocketChat/Rocket.Chat/pull/15088))
+
 - Add possibility to use commands inside threads through Rest API ([#15167](https://github.com/RocketChat/Rocket.Chat/pull/15167))
+
 - Message tooltips as everyone else ([#15135](https://github.com/RocketChat/Rocket.Chat/pull/15135))
 
 ### 🐛 Bug fixes
 
+
 - Webdav crash ([#14918](https://github.com/RocketChat/Rocket.Chat/pull/14918))
+
 - Mark room as read logic ([#15174](https://github.com/RocketChat/Rocket.Chat/pull/15174))
+
 - Forget user session on window close ([#15205](https://github.com/RocketChat/Rocket.Chat/pull/15205))
+
 - Search message wrongly grouping messages ([#15094](https://github.com/RocketChat/Rocket.Chat/pull/15094))
+
 - Rate limit incoming integrations (webhooks) ([#15038](https://github.com/RocketChat/Rocket.Chat/pull/15038) by [@mrsimpson](https://github.com/mrsimpson))
+
 - User's auto complete showing everyone on the server ([#15212](https://github.com/RocketChat/Rocket.Chat/pull/15212))
+
 - "Discussion" label in Sidebar not hidden, when Discussions are disabled (#14660) ([#14682](https://github.com/RocketChat/Rocket.Chat/pull/14682) by [@ifantom](https://github.com/ifantom))
+
 - Typo in 'access-permissions_description' ja translation ([#15162](https://github.com/RocketChat/Rocket.Chat/pull/15162) by [@NatsumiKubo](https://github.com/NatsumiKubo))
+
 - IE11 modal, menu action and edit user page ([#15201](https://github.com/RocketChat/Rocket.Chat/pull/15201))
+
 - TabBar not loading template titles ([#15177](https://github.com/RocketChat/Rocket.Chat/pull/15177) by [@Hudell](https://github.com/Hudell))
+
 - Threads contextual bar button visible even with threads disabled ([#14956](https://github.com/RocketChat/Rocket.Chat/pull/14956) by [@cesarmal](https://github.com/cesarmal))
+
 - Prevent to create discussion with empty name ([#14507](https://github.com/RocketChat/Rocket.Chat/pull/14507))
+
 - Remove new hidden file and fix for .env files for Snap ([#15120](https://github.com/RocketChat/Rocket.Chat/pull/15120))
+
 - cachedcollection calling multiple times SYNC ([#15104](https://github.com/RocketChat/Rocket.Chat/pull/15104))
+
 - Redirect on app manual install ([#15306](https://github.com/RocketChat/Rocket.Chat/pull/15306))
+
 - IE11 baseURI  ([#15319](https://github.com/RocketChat/Rocket.Chat/pull/15319))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - LingoHub based on develop ([#15218](https://github.com/RocketChat/Rocket.Chat/pull/15218))
+
 - Regression: fix typo permisson to permission ([#15217](https://github.com/RocketChat/Rocket.Chat/pull/15217))
+
 - NEW: Apps enable after app installed ([#15202](https://github.com/RocketChat/Rocket.Chat/pull/15202))
+
 - Change notifications file imports to server ([#15184](https://github.com/RocketChat/Rocket.Chat/pull/15184))
+
 - Update Livechat to 1.1.6 ([#15186](https://github.com/RocketChat/Rocket.Chat/pull/15186))
+
 - Regression: remove livechat cache from circle ci ([#15183](https://github.com/RocketChat/Rocket.Chat/pull/15183))
+
 - Update presence package ([#15178](https://github.com/RocketChat/Rocket.Chat/pull/15178))
+
 - LingoHub based on develop ([#15166](https://github.com/RocketChat/Rocket.Chat/pull/15166))
+
 - Switch outdated roadmap to point to milestones ([#15156](https://github.com/RocketChat/Rocket.Chat/pull/15156))
+
 - Remove GPG file ([#15146](https://github.com/RocketChat/Rocket.Chat/pull/15146))
+
 - Add wreiske to authorized users in catbot ([#15147](https://github.com/RocketChat/Rocket.Chat/pull/15147))
+
 - Update to version 2.0.0-develop ([#15142](https://github.com/RocketChat/Rocket.Chat/pull/15142))
+
 - removed unwanted code ([#15078](https://github.com/RocketChat/Rocket.Chat/pull/15078) by [@httpsOmkar](https://github.com/httpsOmkar))
+
 - Update pt-BR.i18n.json ([#15083](https://github.com/RocketChat/Rocket.Chat/pull/15083) by [@lucassmacedo](https://github.com/lucassmacedo))
+
 - Regression: cachedCollection wrong callback parameters ([#15136](https://github.com/RocketChat/Rocket.Chat/pull/15136))
+
 - Allow file upload paths on attachments URLs ([#15121](https://github.com/RocketChat/Rocket.Chat/pull/15121))
+
 - Fix automated test for manual user activation ([#14978](https://github.com/RocketChat/Rocket.Chat/pull/14978) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Add new step to build Docker image from PRs for production again ([#15124](https://github.com/RocketChat/Rocket.Chat/pull/15124))
+
 - LingoHub based on develop ([#15115](https://github.com/RocketChat/Rocket.Chat/pull/15115))
+
 - Improve url validation inside message object ([#15074](https://github.com/RocketChat/Rocket.Chat/pull/15074))
+
 - Merge master into develop & Set version to 1.4.0-develop ([#15097](https://github.com/RocketChat/Rocket.Chat/pull/15097))
+
 - Federation improvements ([#15234](https://github.com/RocketChat/Rocket.Chat/pull/15234))
+
 - Regression: Fix assets extension detection ([#15231](https://github.com/RocketChat/Rocket.Chat/pull/15231))
+
 - Regression: Double error toast on Setup Wizard ([#15268](https://github.com/RocketChat/Rocket.Chat/pull/15268))
+
 - Regression: addPermissionToRole argument as string ([#15267](https://github.com/RocketChat/Rocket.Chat/pull/15267))
+
 - Regression: Remove old scripts of Setup Wizard ([#15263](https://github.com/RocketChat/Rocket.Chat/pull/15263))
+
 - Fix get IP for rate limiter ([#15262](https://github.com/RocketChat/Rocket.Chat/pull/15262))
+
 - Add oplog events metrics ([#15249](https://github.com/RocketChat/Rocket.Chat/pull/15249))
+
 - Regression: last message doesn't update after reconnect ([#15329](https://github.com/RocketChat/Rocket.Chat/pull/15329))
+
 - Regression: New Livechat methods and processes ([#15242](https://github.com/RocketChat/Rocket.Chat/pull/15242))
+
 - Regression: Remove duplicated permission changes emitter ([#15321](https://github.com/RocketChat/Rocket.Chat/pull/15321))
+
 - Regression: Errors on the console preventing some settings to be saved ([#15310](https://github.com/RocketChat/Rocket.Chat/pull/15310))
+
 - Fix v148 migration ([#15285](https://github.com/RocketChat/Rocket.Chat/pull/15285))
+
 - Fix apps list error ([#15258](https://github.com/RocketChat/Rocket.Chat/pull/15258))
+
 - Federation migration and additional improvements ([#15336](https://github.com/RocketChat/Rocket.Chat/pull/15336))
+
 - Regression: Fix wrong import and minor code improvements ([#15352](https://github.com/RocketChat/Rocket.Chat/pull/15352))
 
 </details>
@@ -1496,7 +2165,9 @@
 
 ### 🐛 Bug fixes
 
+
 - Markdown link parser ([#15794](https://github.com/RocketChat/Rocket.Chat/pull/15794))
+
 - Updating an app via "Update" button errors out with "App already exists" ([#15814](https://github.com/RocketChat/Rocket.Chat/pull/15814))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -1514,15 +2185,21 @@
 
 ### 🐛 Bug fixes
 
+
 - Attachment download button behavior ([#15172](https://github.com/RocketChat/Rocket.Chat/pull/15172))
+
 - Messages search scroll ([#15175](https://github.com/RocketChat/Rocket.Chat/pull/15175))
+
 - IE11 -  callback createTreeWalker doesnt accept acceptNode ([#15157](https://github.com/RocketChat/Rocket.Chat/pull/15157))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 1.3.2 ([#15176](https://github.com/RocketChat/Rocket.Chat/pull/15176))
+
 - Update latest Livechat widget version to 1.1.4 ([#15173](https://github.com/RocketChat/Rocket.Chat/pull/15173))
+
 - Update latest Livechat widget version(1.1.3) ([#15154](https://github.com/RocketChat/Rocket.Chat/pull/15154))
 
 </details>
@@ -1544,12 +2221,15 @@
 
 ### 🐛 Bug fixes
 
+
 - Custom emoji table scroll ([#15119](https://github.com/RocketChat/Rocket.Chat/pull/15119))
+
 - Direct Message names not visible on Admin panel ([#15114](https://github.com/RocketChat/Rocket.Chat/pull/15114))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 1.3.1 ([#15148](https://github.com/RocketChat/Rocket.Chat/pull/15148))
 
 </details>
@@ -1570,92 +2250,169 @@
 
 ### 🎉 New features
 
+
 - Show helpful error when oplog is missing ([#14954](https://github.com/RocketChat/Rocket.Chat/pull/14954) by [@justinr1234](https://github.com/justinr1234))
+
 - Subscription enabled marketplace ([#14948](https://github.com/RocketChat/Rocket.Chat/pull/14948))
+
 - Deprecate MongoDB version 3.2 ([#15025](https://github.com/RocketChat/Rocket.Chat/pull/15025))
+
 - Options to filter discussion and livechat on Admin > Rooms ([#15019](https://github.com/RocketChat/Rocket.Chat/pull/15019))
+
 - Settings to further customize GitLab OAuth ([#15014](https://github.com/RocketChat/Rocket.Chat/pull/15014) by [@Hudell](https://github.com/Hudell))
+
 - Accept multiple redirect URIs on OAuth Apps ([#14935](https://github.com/RocketChat/Rocket.Chat/pull/14935) by [@Hudell](https://github.com/Hudell))
+
 - Setting to configure custom authn context on SAML requests ([#14675](https://github.com/RocketChat/Rocket.Chat/pull/14675) by [@Hudell](https://github.com/Hudell))
+
 - Webdav File Picker ([#14879](https://github.com/RocketChat/Rocket.Chat/pull/14879) by [@ubarsaiyan](https://github.com/ubarsaiyan))
+
 - Setting to prevent Livechat agents online when Office Hours are closed ([#14921](https://github.com/RocketChat/Rocket.Chat/pull/14921))
 
 ### 🚀 Improvements
 
+
 - Connectivity Services License Sync ([#15022](https://github.com/RocketChat/Rocket.Chat/pull/15022))
+
 - Add flag to identify remote federation users ([#15004](https://github.com/RocketChat/Rocket.Chat/pull/15004))
+
 - Extract federation config to its own file ([#14992](https://github.com/RocketChat/Rocket.Chat/pull/14992))
+
 - Update tabs markup ([#14964](https://github.com/RocketChat/Rocket.Chat/pull/14964))
+
 - Remove too specific helpers isFirefox() and isChrome() ([#14963](https://github.com/RocketChat/Rocket.Chat/pull/14963))
+
 - Add descriptions on user data download buttons and popup info ([#14852](https://github.com/RocketChat/Rocket.Chat/pull/14852))
 
 ### 🐛 Bug fixes
 
+
 - Russian grammatical errors ([#14622](https://github.com/RocketChat/Rocket.Chat/pull/14622) by [@BehindLoader](https://github.com/BehindLoader))
+
 - Message attachments not allowing float numbers ([#14412](https://github.com/RocketChat/Rocket.Chat/pull/14412))
+
 - Typo in german translation ([#14833](https://github.com/RocketChat/Rocket.Chat/pull/14833) by [@Le-onardo](https://github.com/Le-onardo))
+
 - users.setStatus REST endpoint not allowing reset status message ([#14916](https://github.com/RocketChat/Rocket.Chat/pull/14916) by [@cardoso](https://github.com/cardoso))
+
 - SVG uploads crashing process ([#15006](https://github.com/RocketChat/Rocket.Chat/pull/15006) by [@snoopotic](https://github.com/snoopotic))
+
 - Edit message with arrow up key if not last message ([#15021](https://github.com/RocketChat/Rocket.Chat/pull/15021))
+
 - Livechat dashboard average and reaction time labels ([#14845](https://github.com/RocketChat/Rocket.Chat/pull/14845) by [@anandpathak](https://github.com/anandpathak))
+
 - Edit permissions screen ([#14950](https://github.com/RocketChat/Rocket.Chat/pull/14950))
+
 - Invite users auto complete cropping results ([#15020](https://github.com/RocketChat/Rocket.Chat/pull/15020))
+
 - Always displaying jumbomojis when using "marked" markdown ([#14861](https://github.com/RocketChat/Rocket.Chat/pull/14861) by [@brakhane](https://github.com/brakhane))
+
 - CustomOauth Identity Step errors displayed in HTML format ([#15000](https://github.com/RocketChat/Rocket.Chat/pull/15000) by [@Hudell](https://github.com/Hudell))
+
 - Custom User Status throttled by rate limiter ([#15001](https://github.com/RocketChat/Rocket.Chat/pull/15001) by [@Hudell](https://github.com/Hudell))
+
 - Not being able to mention users with "all" and "here" usernames - do not allow users register that usernames ([#14468](https://github.com/RocketChat/Rocket.Chat/pull/14468) by [@hamidrezabstn](https://github.com/hamidrezabstn))
+
 - Users staying online after logout ([#14966](https://github.com/RocketChat/Rocket.Chat/pull/14966))
+
 - Chrome doesn't load additional search results when bottom is reached ([#14965](https://github.com/RocketChat/Rocket.Chat/pull/14965))
+
 - Wrong label order on room settings ([#14960](https://github.com/RocketChat/Rocket.Chat/pull/14960) by [@Hudell](https://github.com/Hudell))
+
 - Allow storing the navigation history of unregistered Livechat visitors ([#14970](https://github.com/RocketChat/Rocket.Chat/pull/14970))
+
 - 50 custom emoji limit ([#14951](https://github.com/RocketChat/Rocket.Chat/pull/14951))
+
 - eternal loading file list ([#14952](https://github.com/RocketChat/Rocket.Chat/pull/14952))
+
 - load more messages ([#14967](https://github.com/RocketChat/Rocket.Chat/pull/14967))
+
 - Loading indicator positioning ([#14968](https://github.com/RocketChat/Rocket.Chat/pull/14968))
+
 - Jump to message missing in Starred Messages ([#14949](https://github.com/RocketChat/Rocket.Chat/pull/14949))
+
 - Method `getUsersOfRoom` not returning offline users if limit is not defined ([#14753](https://github.com/RocketChat/Rocket.Chat/pull/14753))
+
 - OTR key icon missing on messages ([#14953](https://github.com/RocketChat/Rocket.Chat/pull/14953))
+
 - Prevent error on trying insert message with duplicated id ([#14945](https://github.com/RocketChat/Rocket.Chat/pull/14945))
+
 - LDAP login with customField sync ([#14808](https://github.com/RocketChat/Rocket.Chat/pull/14808) by [@magicbelette](https://github.com/magicbelette))
+
 - Wrong custom status displayed on room leader panel ([#14958](https://github.com/RocketChat/Rocket.Chat/pull/14958) by [@Hudell](https://github.com/Hudell))
+
 - Video recorder message echo ([#14671](https://github.com/RocketChat/Rocket.Chat/pull/14671) by [@vova-zush](https://github.com/vova-zush))
+
 - Opening Livechat messages on mobile apps ([#14785](https://github.com/RocketChat/Rocket.Chat/pull/14785) by [@zolbayars](https://github.com/zolbayars))
+
 - SAML login by giving displayName priority over userName for fullName ([#14880](https://github.com/RocketChat/Rocket.Chat/pull/14880) by [@pkolmann](https://github.com/pkolmann))
+
 - setupWizard calling multiple getSetupWizardParameters ([#15060](https://github.com/RocketChat/Rocket.Chat/pull/15060))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Wrong text when reporting a message ([#14515](https://github.com/RocketChat/Rocket.Chat/pull/14515) by [@zdumitru](https://github.com/zdumitru))
+
 - Add missing French translation ([#15013](https://github.com/RocketChat/Rocket.Chat/pull/15013) by [@commiaI](https://github.com/commiaI))
+
 - Fix statistics error for apps on first load ([#15026](https://github.com/RocketChat/Rocket.Chat/pull/15026))
+
 - Always convert the sha256 password to lowercase on checking ([#14941](https://github.com/RocketChat/Rocket.Chat/pull/14941))
+
 - New: Apps and integrations statistics ([#14878](https://github.com/RocketChat/Rocket.Chat/pull/14878))
+
 - improve: relocate some of wizard info to register ([#14884](https://github.com/RocketChat/Rocket.Chat/pull/14884))
+
 - Improve Docker compose readability ([#14457](https://github.com/RocketChat/Rocket.Chat/pull/14457) by [@NateScarlet](https://github.com/NateScarlet))
+
 - Bump marked from 0.5.2 to 0.6.1 ([#14969](https://github.com/RocketChat/Rocket.Chat/pull/14969) by [@dependabot[bot]](https://github.com/dependabot[bot]))
+
 - Remove unused Meteor dependency (yasinuslu:blaze-meta) ([#14971](https://github.com/RocketChat/Rocket.Chat/pull/14971))
+
 - Bump photoswipe version to 4.1.3 ([#14977](https://github.com/RocketChat/Rocket.Chat/pull/14977))
+
 - Bump node-rsa version to 1.0.5 ([#14976](https://github.com/RocketChat/Rocket.Chat/pull/14976))
+
 - Bump juice version to 5.2.0 ([#14974](https://github.com/RocketChat/Rocket.Chat/pull/14974))
+
 - Remove unused dependency (lokijs) ([#14973](https://github.com/RocketChat/Rocket.Chat/pull/14973))
+
 - Regression: patch to improve emoji render ([#14980](https://github.com/RocketChat/Rocket.Chat/pull/14980))
+
 - [IMPROVEMENT] patch to improve emoji render ([#14722](https://github.com/RocketChat/Rocket.Chat/pull/14722))
+
 - Bump jquery from 3.3.1 to 3.4.0 in /packages/rocketchat-livechat/.app ([#14922](https://github.com/RocketChat/Rocket.Chat/pull/14922) by [@dependabot[bot]](https://github.com/dependabot[bot]))
+
 - Callbacks perf ([#14915](https://github.com/RocketChat/Rocket.Chat/pull/14915))
+
 - Split oplog emitters in files ([#14917](https://github.com/RocketChat/Rocket.Chat/pull/14917))
+
 - Extract canSendMessage function ([#14909](https://github.com/RocketChat/Rocket.Chat/pull/14909))
+
 - Improve: Get public key for marketplace ([#14851](https://github.com/RocketChat/Rocket.Chat/pull/14851))
+
 - Merge master into develop & Set version to 1.3.0-develop ([#14889](https://github.com/RocketChat/Rocket.Chat/pull/14889) by [@Hudell](https://github.com/Hudell))
+
 - Regression: fix code style, setup wizard error and profile page header ([#15041](https://github.com/RocketChat/Rocket.Chat/pull/15041))
+
 - Regression: Framework version being attached to a request that doesn't require it ([#15039](https://github.com/RocketChat/Rocket.Chat/pull/15039))
+
 - Update Livechat widget ([#15046](https://github.com/RocketChat/Rocket.Chat/pull/15046))
+
 - Regression: getSetupWizardParameters ([#15067](https://github.com/RocketChat/Rocket.Chat/pull/15067))
+
 - Regression: Webdav File Picker search and fixed overflows ([#15027](https://github.com/RocketChat/Rocket.Chat/pull/15027) by [@ubarsaiyan](https://github.com/ubarsaiyan))
+
 - Regression: Improve apps bridges for HA setup ([#15080](https://github.com/RocketChat/Rocket.Chat/pull/15080))
+
 - Regression: displaying errors for apps not installed from Marketplace ([#15075](https://github.com/RocketChat/Rocket.Chat/pull/15075))
+
 - Regression: Marketplace app pricing plan description ([#15076](https://github.com/RocketChat/Rocket.Chat/pull/15076))
+
 - Regression: uninstall subscribed app modal ([#15077](https://github.com/RocketChat/Rocket.Chat/pull/15077))
+
 - Regression: Apps and Marketplace UI issues ([#15045](https://github.com/RocketChat/Rocket.Chat/pull/15045))
 
 </details>
@@ -1721,11 +2478,13 @@
 
 ### 🐛 Bug fixes
 
+
 - Not showing local app on App Details ([#14894](https://github.com/RocketChat/Rocket.Chat/pull/14894))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 1.2.1 ([#14898](https://github.com/RocketChat/Rocket.Chat/pull/14898))
 
 </details>
@@ -1745,47 +2504,79 @@
 
 ### 🎉 New features
 
+
 - Custom User Status ([#13933](https://github.com/RocketChat/Rocket.Chat/pull/13933) by [@Hudell](https://github.com/Hudell) & [@wreiske](https://github.com/wreiske))
+
 - changed mongo version for snap from 3.2.7 to 3.4.20 ([#14838](https://github.com/RocketChat/Rocket.Chat/pull/14838))
+
 - Add loading animation to webdav file picker ([#14759](https://github.com/RocketChat/Rocket.Chat/pull/14759) by [@ubarsaiyan](https://github.com/ubarsaiyan))
+
 - Add tmid property to outgoing integration ([#14699](https://github.com/RocketChat/Rocket.Chat/pull/14699))
+
 - Endpoint to anonymously read channel's messages ([#14714](https://github.com/RocketChat/Rocket.Chat/pull/14714) by [@PrajvalRaval](https://github.com/PrajvalRaval))
+
 - Add Livechat inquiries endpoints ([#14779](https://github.com/RocketChat/Rocket.Chat/pull/14779))
+
 - Configuration to limit amount of livechat inquiries displayed ([#14690](https://github.com/RocketChat/Rocket.Chat/pull/14690))
+
 - Show App bundles and its apps ([#14886](https://github.com/RocketChat/Rocket.Chat/pull/14886))
 
 ### 🚀 Improvements
 
+
 - Adds link to download generated user data file ([#14175](https://github.com/RocketChat/Rocket.Chat/pull/14175) by [@Hudell](https://github.com/Hudell))
+
 - Layout of livechat manager pages to new style ([#13900](https://github.com/RocketChat/Rocket.Chat/pull/13900))
+
 - Add an optional rocketchat-protocol DNS entry for Federation ([#14589](https://github.com/RocketChat/Rocket.Chat/pull/14589))
+
 - Use configurable colors on sidebar items ([#14624](https://github.com/RocketChat/Rocket.Chat/pull/14624))
 
 ### 🐛 Bug fixes
 
+
 - Error when using Download My Data or Export My Data ([#14645](https://github.com/RocketChat/Rocket.Chat/pull/14645) by [@Hudell](https://github.com/Hudell))
+
 - Removes E2E action button, icon and banner when E2E is disabled. ([#14810](https://github.com/RocketChat/Rocket.Chat/pull/14810))
+
 - Assume microphone is available ([#14710](https://github.com/RocketChat/Rocket.Chat/pull/14710))
+
 - Move the set Avatar call on user creation to make sure the user has username ([#14665](https://github.com/RocketChat/Rocket.Chat/pull/14665))
+
 - users typing forever ([#14724](https://github.com/RocketChat/Rocket.Chat/pull/14724))
+
 - Increasing time to rate limit in shield.svg endpoint and add a setting to disable API rate limiter ([#14709](https://github.com/RocketChat/Rocket.Chat/pull/14709))
+
 - Wrong filter field when filtering current Livechats ([#14569](https://github.com/RocketChat/Rocket.Chat/pull/14569))
+
 - Import Chart.js error ([#14471](https://github.com/RocketChat/Rocket.Chat/pull/14471) by [@Hudell](https://github.com/Hudell) & [@sonbn0](https://github.com/sonbn0))
+
 - Name is undefined in some emails ([#14533](https://github.com/RocketChat/Rocket.Chat/pull/14533))
+
 - Direct reply delete config and description ([#14493](https://github.com/RocketChat/Rocket.Chat/pull/14493) by [@ruKurz](https://github.com/ruKurz))
+
 - Custom status fixes ([#14853](https://github.com/RocketChat/Rocket.Chat/pull/14853) by [@Hudell](https://github.com/Hudell) & [@wreiske](https://github.com/wreiske))
+
 - LinkedIn OAuth login ([#14887](https://github.com/RocketChat/Rocket.Chat/pull/14887) by [@Hudell](https://github.com/Hudell))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Fix not fully extracted pieces ([#14805](https://github.com/RocketChat/Rocket.Chat/pull/14805))
+
 - Regression: Fix file upload ([#14804](https://github.com/RocketChat/Rocket.Chat/pull/14804))
+
 - Extract permissions functions ([#14777](https://github.com/RocketChat/Rocket.Chat/pull/14777))
+
 - Add custom fileupload whitelist property ([#14754](https://github.com/RocketChat/Rocket.Chat/pull/14754))
+
 - Merge master into develop & Set version to 1.2.0-develop ([#14656](https://github.com/RocketChat/Rocket.Chat/pull/14656) by [@AnBo83](https://github.com/AnBo83) & [@knrt10](https://github.com/knrt10) & [@mohamedar97](https://github.com/mohamedar97) & [@thaiphv](https://github.com/thaiphv))
+
 - Regression: Fix desktop notifications not being sent ([#14860](https://github.com/RocketChat/Rocket.Chat/pull/14860))
+
 - Regression: Allow debugging of cached collections by name ([#14862](https://github.com/RocketChat/Rocket.Chat/pull/14862))
+
 - Allow debugging of cached collections by name ([#14859](https://github.com/RocketChat/Rocket.Chat/pull/14859))
 
 </details>
@@ -1843,12 +2634,15 @@
 
 ### 🐛 Bug fixes
 
+
 - Gap of messages when loading history when using threads ([#14837](https://github.com/RocketChat/Rocket.Chat/pull/14837))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 1.1.3 ([#14850](https://github.com/RocketChat/Rocket.Chat/pull/14850))
+
 - Regression: thread loading parent msg if is not loaded ([#14839](https://github.com/RocketChat/Rocket.Chat/pull/14839))
 
 </details>
@@ -1868,13 +2662,17 @@
 
 ### 🐛 Bug fixes
 
+
 - User status information on User Info panel ([#14763](https://github.com/RocketChat/Rocket.Chat/pull/14763))
+
 - User Real Name being erased when not modified ([#14711](https://github.com/RocketChat/Rocket.Chat/pull/14711) by [@Hudell](https://github.com/Hudell))
+
 - Anonymous chat read ([#14717](https://github.com/RocketChat/Rocket.Chat/pull/14717))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 1.1.2 ([#14823](https://github.com/RocketChat/Rocket.Chat/pull/14823) by [@Hudell](https://github.com/Hudell))
 
 </details>
@@ -1899,12 +2697,15 @@
 
 ### 🐛 Bug fixes
 
+
 - SAML login error. ([#14686](https://github.com/RocketChat/Rocket.Chat/pull/14686) by [@Hudell](https://github.com/Hudell))
+
 - Load messages after disconnect and message box scroll missing ([#14668](https://github.com/RocketChat/Rocket.Chat/pull/14668))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Removing unnecesary federation configs ([#14674](https://github.com/RocketChat/Rocket.Chat/pull/14674))
 
 </details>
@@ -1928,117 +2729,219 @@
 
 ### 🎉 New features
 
+
 - Setting option to mark as containing a secret/password ([#10273](https://github.com/RocketChat/Rocket.Chat/pull/10273))
+
 - Custom user name field from Custom OAuth ([#14381](https://github.com/RocketChat/Rocket.Chat/pull/14381) by [@mjovanovic0](https://github.com/mjovanovic0))
+
 - Add pause and reset button when adding custom sound   ([#13615](https://github.com/RocketChat/Rocket.Chat/pull/13615) by [@knrt10](https://github.com/knrt10))
+
 - Missing "view-outside-room_description" translation key ([#13680](https://github.com/RocketChat/Rocket.Chat/pull/13680) by [@bhardwajaditya](https://github.com/bhardwajaditya))
+
 - Returns custom emojis through the Livechat REST API ([#14370](https://github.com/RocketChat/Rocket.Chat/pull/14370))
 
 ### 🚀 Improvements
 
+
 - Message rendering time ([#14252](https://github.com/RocketChat/Rocket.Chat/pull/14252))
+
 - Change user presence events to Meteor Streams ([#14488](https://github.com/RocketChat/Rocket.Chat/pull/14488))
+
 - Upgrade EmojiOne to JoyPixels 4.5.0 ([#13807](https://github.com/RocketChat/Rocket.Chat/pull/13807) by [@wreiske](https://github.com/wreiske))
+
 - Don't show unread count badge in burger menu if it is from the opened room ([#12971](https://github.com/RocketChat/Rocket.Chat/pull/12971))
+
 - Livechat CRM secret token optional ([#14022](https://github.com/RocketChat/Rocket.Chat/pull/14022))
+
 - jump to selected message on open thread ([#14460](https://github.com/RocketChat/Rocket.Chat/pull/14460))
+
 - Don't use regex to find users ([#14397](https://github.com/RocketChat/Rocket.Chat/pull/14397))
+
 - Added flag `skipActiveUsersToBeReady` to not wait the load of `active users` to present the Web interface ([#14431](https://github.com/RocketChat/Rocket.Chat/pull/14431))
+
 - SAML login process refactoring ([#12891](https://github.com/RocketChat/Rocket.Chat/pull/12891) by [@kukkjanos](https://github.com/kukkjanos))
+
 - Allow change Discussion's properties ([#14389](https://github.com/RocketChat/Rocket.Chat/pull/14389))
 
 ### 🐛 Bug fixes
 
+
 - Downloading files when running in sub directory ([#14485](https://github.com/RocketChat/Rocket.Chat/pull/14485) by [@miolane](https://github.com/miolane))
+
 - Broken layout when sidebar is open on IE/Edge ([#14567](https://github.com/RocketChat/Rocket.Chat/pull/14567))
+
 - Channel names on Directory got cut on small screens ([#14542](https://github.com/RocketChat/Rocket.Chat/pull/14542))
+
 - Duplicated link to jump to message  ([#14505](https://github.com/RocketChat/Rocket.Chat/pull/14505))
+
 - Edit Message when down arrow is pressed. ([#14369](https://github.com/RocketChat/Rocket.Chat/pull/14369) by [@Kailash0311](https://github.com/Kailash0311))
+
 - Unread property of the room's lastMessage object was being wrong some times ([#13919](https://github.com/RocketChat/Rocket.Chat/pull/13919))
+
 - Multiple Slack Importer Bugs ([#12084](https://github.com/RocketChat/Rocket.Chat/pull/12084) by [@Hudell](https://github.com/Hudell))
+
 - No feedback when adding users that already exists in a room ([#14534](https://github.com/RocketChat/Rocket.Chat/pull/14534) by [@gsunit](https://github.com/gsunit))
+
 - Custom scripts descriptions were not clear enough  ([#14516](https://github.com/RocketChat/Rocket.Chat/pull/14516))
+
 - Role `user` has being added after email verification even for non anonymous users ([#14263](https://github.com/RocketChat/Rocket.Chat/pull/14263))
+
 - Several problems with read-only rooms and muted users ([#11311](https://github.com/RocketChat/Rocket.Chat/pull/11311) by [@Hudell](https://github.com/Hudell))
+
 - Channel settings form to textarea for Topic and Description ([#13328](https://github.com/RocketChat/Rocket.Chat/pull/13328) by [@supra08](https://github.com/supra08))
+
 - Elements in User Info require some padding ([#13640](https://github.com/RocketChat/Rocket.Chat/pull/13640) by [@mushroomgenie](https://github.com/mushroomgenie))
+
 - Showing the id instead of the name of custom notification sound ([#13660](https://github.com/RocketChat/Rocket.Chat/pull/13660) by [@knrt10](https://github.com/knrt10))
+
 - Remove Livechat guest data was removing more rooms than expected ([#14509](https://github.com/RocketChat/Rocket.Chat/pull/14509))
+
 - Save custom emoji with special characters causes some errors ([#14456](https://github.com/RocketChat/Rocket.Chat/pull/14456))
+
 - Verify if the user is requesting your own information in users.info ([#14242](https://github.com/RocketChat/Rocket.Chat/pull/14242))
+
 - RocketChat client sending out video call requests unnecessarily ([#14496](https://github.com/RocketChat/Rocket.Chat/pull/14496))
+
 - `Alphabetical` translation in DE ([#14490](https://github.com/RocketChat/Rocket.Chat/pull/14490) by [@AnBo83](https://github.com/AnBo83))
+
 - Fix redirect to First channel after login ([#14434](https://github.com/RocketChat/Rocket.Chat/pull/14434))
+
 - Ignored messages ([#14465](https://github.com/RocketChat/Rocket.Chat/pull/14465))
+
 - Allow data URLs in isURL/getURL helpers ([#14464](https://github.com/RocketChat/Rocket.Chat/pull/14464))
+
 - You must join to view messages in this channel ([#14461](https://github.com/RocketChat/Rocket.Chat/pull/14461))
+
 - Channel Leader Bar is in the way of Thread Header  ([#14443](https://github.com/RocketChat/Rocket.Chat/pull/14443))
+
 - Discussion name being invalid ([#14442](https://github.com/RocketChat/Rocket.Chat/pull/14442))
+
 - Room name was undefined in some info dialogs ([#14415](https://github.com/RocketChat/Rocket.Chat/pull/14415))
+
 - Exception on crowd sync due to a wrong logging method ([#14405](https://github.com/RocketChat/Rocket.Chat/pull/14405))
+
 - IE11 support ([#14422](https://github.com/RocketChat/Rocket.Chat/pull/14422))
+
 - Escape unrecognized slash command message ([#14432](https://github.com/RocketChat/Rocket.Chat/pull/14432))
+
 - Mentions message missing 'jump to message' action ([#14430](https://github.com/RocketChat/Rocket.Chat/pull/14430))
+
 - preview pdf its not working ([#14419](https://github.com/RocketChat/Rocket.Chat/pull/14419))
+
 - Messages on thread panel were receiving wrong context/subscription ([#14404](https://github.com/RocketChat/Rocket.Chat/pull/14404))
+
 - Error 400 on send a reply to an old thread ([#14402](https://github.com/RocketChat/Rocket.Chat/pull/14402))
+
 - Users actions in administration were returning error ([#14400](https://github.com/RocketChat/Rocket.Chat/pull/14400))
+
 - Fallback to mongo version that doesn't require clusterMonitor role ([#14403](https://github.com/RocketChat/Rocket.Chat/pull/14403))
+
 - SAML credentialToken removal was preventing mobile from being able to authenticate ([#14345](https://github.com/RocketChat/Rocket.Chat/pull/14345))
+
 - Stream not connecting connect when using subdir and multi-instance ([#14376](https://github.com/RocketChat/Rocket.Chat/pull/14376))
+
 - Pressing Enter in User Search field at channel causes reload ([#14388](https://github.com/RocketChat/Rocket.Chat/pull/14388))
+
 - Wrong token name was generating error on Gitlab OAuth login ([#14379](https://github.com/RocketChat/Rocket.Chat/pull/14379))
+
 - more message actions to threads context(follow, unfollow, copy, delete) ([#14387](https://github.com/RocketChat/Rocket.Chat/pull/14387))
+
 - Unnecessary meteor.defer on openRoom ([#14396](https://github.com/RocketChat/Rocket.Chat/pull/14396))
+
 - Messages on threads disappearing ([#14393](https://github.com/RocketChat/Rocket.Chat/pull/14393))
+
 - Bell was too small on threads ([#14394](https://github.com/RocketChat/Rocket.Chat/pull/14394))
+
 - Main thread title on replies ([#14372](https://github.com/RocketChat/Rocket.Chat/pull/14372))
+
 - New day separator overlapping above system message ([#14362](https://github.com/RocketChat/Rocket.Chat/pull/14362))
+
 - E2E messages not decrypting in message threads ([#14580](https://github.com/RocketChat/Rocket.Chat/pull/14580))
+
 - Send replyTo for livechat offline messages ([#14568](https://github.com/RocketChat/Rocket.Chat/pull/14568))
+
 - Mailer breaking if user doesn't have an email address ([#14614](https://github.com/RocketChat/Rocket.Chat/pull/14614))
+
 - Role name spacing on Permissions page ([#14625](https://github.com/RocketChat/Rocket.Chat/pull/14625))
+
 - Avatar images on old Livechat client ([#14590](https://github.com/RocketChat/Rocket.Chat/pull/14590) by [@arminfelder](https://github.com/arminfelder))
+
 - Inject code at the end of <head> tag ([#14623](https://github.com/RocketChat/Rocket.Chat/pull/14623))
+
 - "Blank page" on safari 10.x ([#14651](https://github.com/RocketChat/Rocket.Chat/pull/14651))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Removed unnecessary DDP unblocks ([#13641](https://github.com/RocketChat/Rocket.Chat/pull/13641))
+
 - Fix emoji replacing some chars ([#14570](https://github.com/RocketChat/Rocket.Chat/pull/14570))
+
 - LingoHub based on develop ([#14561](https://github.com/RocketChat/Rocket.Chat/pull/14561))
+
 - Refactor WebRTC class ([#13736](https://github.com/RocketChat/Rocket.Chat/pull/13736))
+
 - Update Meteor Streamer package ([#14551](https://github.com/RocketChat/Rocket.Chat/pull/14551))
+
 - Regression: unit tests were being skipped ([#14543](https://github.com/RocketChat/Rocket.Chat/pull/14543))
+
 - MsgTyping refactor ([#14495](https://github.com/RocketChat/Rocket.Chat/pull/14495))
+
 - Google Plus account is no longer accessible ([#14503](https://github.com/RocketChat/Rocket.Chat/pull/14503) by [@zdumitru](https://github.com/zdumitru))
+
 - [IMPROVEMENT] Add tooltip to to notify user the purpose of back button in discussion ([#13872](https://github.com/RocketChat/Rocket.Chat/pull/13872) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
 - eslint errors currently on develop ([#14518](https://github.com/RocketChat/Rocket.Chat/pull/14518) by [@Hudell](https://github.com/Hudell))
+
 - Allow removing description, topic and annoucement of rooms(set as empty string) ([#13682](https://github.com/RocketChat/Rocket.Chat/pull/13682))
+
 - [IMPROVEMENT] Don't group messages with different alias ([#14257](https://github.com/RocketChat/Rocket.Chat/pull/14257) by [@jungeonkim](https://github.com/jungeonkim))
+
 - LingoHub based on develop ([#14478](https://github.com/RocketChat/Rocket.Chat/pull/14478))
+
 - Remove specific eslint rules ([#14459](https://github.com/RocketChat/Rocket.Chat/pull/14459))
+
 - New eslint rules ([#14332](https://github.com/RocketChat/Rocket.Chat/pull/14332))
+
 - Fix i18n files keys sort ([#14433](https://github.com/RocketChat/Rocket.Chat/pull/14433))
+
 - Fixes on DAU and MAU aggregations ([#14418](https://github.com/RocketChat/Rocket.Chat/pull/14418))
+
 - Add missing german translations ([#14386](https://github.com/RocketChat/Rocket.Chat/pull/14386) by [@mrsimpson](https://github.com/mrsimpson))
+
 - LingoHub based on develop ([#14426](https://github.com/RocketChat/Rocket.Chat/pull/14426))
+
 - fix discussions: remove restriction for editing room info, server side ([#14039](https://github.com/RocketChat/Rocket.Chat/pull/14039) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Fix: Message body was not being updated when user disabled nrr message ([#14390](https://github.com/RocketChat/Rocket.Chat/pull/14390))
+
 - Improve German translations ([#14351](https://github.com/RocketChat/Rocket.Chat/pull/14351) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Merge master into develop & Set version to 1.1.0-develop ([#14317](https://github.com/RocketChat/Rocket.Chat/pull/14317) by [@wreiske](https://github.com/wreiske))
+
 - Merge master into develop & Set version to 1.1.0-develop ([#14294](https://github.com/RocketChat/Rocket.Chat/pull/14294))
+
 - Fix: Add emoji shortnames to emoji's list ([#14576](https://github.com/RocketChat/Rocket.Chat/pull/14576))
+
 - Ci improvements ([#14600](https://github.com/RocketChat/Rocket.Chat/pull/14600))
+
 - Fix: emoji render performance for alias ([#14593](https://github.com/RocketChat/Rocket.Chat/pull/14593))
+
 - Federation i18n message changes ([#14595](https://github.com/RocketChat/Rocket.Chat/pull/14595))
+
 - [REGRESSION] Fix Slack bridge channel owner on channel creation ([#14565](https://github.com/RocketChat/Rocket.Chat/pull/14565))
+
 - Fix thumbs up emoji shortname ([#14581](https://github.com/RocketChat/Rocket.Chat/pull/14581))
+
 - [Fix] broken logo url in app.json ([#14572](https://github.com/RocketChat/Rocket.Chat/pull/14572) by [@jaredmoody](https://github.com/jaredmoody))
+
 - Add digitalocean button to readme ([#14583](https://github.com/RocketChat/Rocket.Chat/pull/14583))
+
 - Improvement: Permissions table ([#14646](https://github.com/RocketChat/Rocket.Chat/pull/14646))
+
 - Regression: Handle missing emojis ([#14641](https://github.com/RocketChat/Rocket.Chat/pull/14641))
+
 - LingoHub based on develop ([#14643](https://github.com/RocketChat/Rocket.Chat/pull/14643))
 
 </details>
@@ -2087,6 +2990,7 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Fix custom auth ([#15141](https://github.com/RocketChat/Rocket.Chat/pull/15141))
 
 </details>
@@ -2105,6 +3009,7 @@
 
 ### 🐛 Bug fixes
 
+
 - Not sanitized message types ([#15054](https://github.com/RocketChat/Rocket.Chat/pull/15054))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -2122,6 +3027,7 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 1.0.3 ([#14446](https://github.com/RocketChat/Rocket.Chat/pull/14446) by [@mrsimpson](https://github.com/mrsimpson))
 
 </details>
@@ -2150,28 +3056,44 @@
 
 ### 🚀 Improvements
 
+
 - i18n of threads and discussion buttons ([#14334](https://github.com/RocketChat/Rocket.Chat/pull/14334))
+
 - Better error message when not able to get MongoDB Version ([#14320](https://github.com/RocketChat/Rocket.Chat/pull/14320))
 
 ### 🐛 Bug fixes
 
+
 - Unread line and new day separator were not aligned  ([#14338](https://github.com/RocketChat/Rocket.Chat/pull/14338))
+
 - Audio notification for messages on DM ([#14336](https://github.com/RocketChat/Rocket.Chat/pull/14336))
+
 - Duplicate thread message after editing ([#14330](https://github.com/RocketChat/Rocket.Chat/pull/14330))
+
 - New day separator rendered over thread reply ([#14328](https://github.com/RocketChat/Rocket.Chat/pull/14328))
+
 - Missing i18n for some new Permissions ([#14011](https://github.com/RocketChat/Rocket.Chat/pull/14011))
+
 - View Logs admin page was broken and not rendering color logs ([#14316](https://github.com/RocketChat/Rocket.Chat/pull/14316))
+
 - show roles on message ([#14313](https://github.com/RocketChat/Rocket.Chat/pull/14313))
+
 - Remove reference to inexistent field when deleting message in thread ([#14311](https://github.com/RocketChat/Rocket.Chat/pull/14311))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 1.0.2 ([#14339](https://github.com/RocketChat/Rocket.Chat/pull/14339) by [@AnBo83](https://github.com/AnBo83) & [@knrt10](https://github.com/knrt10) & [@mohamedar97](https://github.com/mohamedar97) & [@thaiphv](https://github.com/thaiphv))
+
 - Add cross-browser select arrow positioning ([#14318](https://github.com/RocketChat/Rocket.Chat/pull/14318))
+
 - i18n: Update German strings ([#14182](https://github.com/RocketChat/Rocket.Chat/pull/14182) by [@AnBo83](https://github.com/AnBo83))
+
 - [Regression] Anonymous user fix ([#14301](https://github.com/RocketChat/Rocket.Chat/pull/14301) by [@knrt10](https://github.com/knrt10))
+
 - Coerces the MongoDB version string ([#14299](https://github.com/RocketChat/Rocket.Chat/pull/14299) by [@thaiphv](https://github.com/thaiphv))
+
 - [Fix] group name appears instead of the room id ([#14075](https://github.com/RocketChat/Rocket.Chat/pull/14075) by [@mohamedar97](https://github.com/mohamedar97))
 
 </details>
@@ -2202,12 +3124,19 @@
 
 ### 🐛 Bug fixes
 
+
 - Popup cloud console in new window ([#14296](https://github.com/RocketChat/Rocket.Chat/pull/14296))
+
 - Switch oplog required doc link to more accurate link ([#14288](https://github.com/RocketChat/Rocket.Chat/pull/14288))
+
 - Optional exit on Unhandled Promise Rejection ([#14291](https://github.com/RocketChat/Rocket.Chat/pull/14291))
+
 - Error when accessing avatar with no token ([#14293](https://github.com/RocketChat/Rocket.Chat/pull/14293))
+
 - Startup error in registration check ([#14286](https://github.com/RocketChat/Rocket.Chat/pull/14286))
+
 - Wrong header at Apps admin section ([#14290](https://github.com/RocketChat/Rocket.Chat/pull/14290))
+
 - Error when accessing an invalid file upload url ([#14282](https://github.com/RocketChat/Rocket.Chat/pull/14282) by [@wreiske](https://github.com/wreiske))
 
 ### 👩‍💻👨‍💻 Contributors 😍
@@ -2230,354 +3159,690 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Remove deprecated file upload engine Slingshot ([#13724](https://github.com/RocketChat/Rocket.Chat/pull/13724))
+
 - Remove internal hubot package ([#13522](https://github.com/RocketChat/Rocket.Chat/pull/13522))
+
 - Prevent start if incompatible mongo version ([#13927](https://github.com/RocketChat/Rocket.Chat/pull/13927))
+
 - Require OPLOG/REPLICASET to run Rocket.Chat ([#14227](https://github.com/RocketChat/Rocket.Chat/pull/14227))
 
 ### 🎉 New features
 
+
 - Marketplace integration with Rocket.Chat Cloud ([#13809](https://github.com/RocketChat/Rocket.Chat/pull/13809))
+
 - Add message action to copy message to input as reply ([#12626](https://github.com/RocketChat/Rocket.Chat/pull/12626) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Allow sending long messages as attachments ([#13819](https://github.com/RocketChat/Rocket.Chat/pull/13819))
+
 - Add e-mail field on Livechat Departments ([#13775](https://github.com/RocketChat/Rocket.Chat/pull/13775))
+
 - Provide new Livechat client as community feature ([#13723](https://github.com/RocketChat/Rocket.Chat/pull/13723))
+
 - Discussions ([#13541](https://github.com/RocketChat/Rocket.Chat/pull/13541) by [@mrsimpson](https://github.com/mrsimpson) & [@vickyokrm](https://github.com/vickyokrm))
+
 - Bosnian lang (BS) ([#13635](https://github.com/RocketChat/Rocket.Chat/pull/13635) by [@fliptrail](https://github.com/fliptrail))
+
 - Federation ([#12370](https://github.com/RocketChat/Rocket.Chat/pull/12370))
+
 - Show department field on Livechat visitor panel ([#13530](https://github.com/RocketChat/Rocket.Chat/pull/13530))
+
 - Add offset parameter to channels.history, groups.history, dm.history ([#13310](https://github.com/RocketChat/Rocket.Chat/pull/13310) by [@xbolshe](https://github.com/xbolshe))
+
 - Permission to assign roles ([#13597](https://github.com/RocketChat/Rocket.Chat/pull/13597))
+
 - reply with a file ([#12095](https://github.com/RocketChat/Rocket.Chat/pull/12095) by [@rssilva](https://github.com/rssilva))
+
 - legal notice page ([#12472](https://github.com/RocketChat/Rocket.Chat/pull/12472) by [@localguru](https://github.com/localguru))
+
 - Add missing remove add leader channel ([#13315](https://github.com/RocketChat/Rocket.Chat/pull/13315) by [@Montel](https://github.com/Montel))
+
 - users.setActiveStatus endpoint in rest api ([#13443](https://github.com/RocketChat/Rocket.Chat/pull/13443) by [@thayannevls](https://github.com/thayannevls))
+
 - User avatars from external source ([#7929](https://github.com/RocketChat/Rocket.Chat/pull/7929) by [@mjovanovic0](https://github.com/mjovanovic0))
+
 - Add an option to delete file in files list ([#13815](https://github.com/RocketChat/Rocket.Chat/pull/13815))
+
 - Threads V 1.0 ([#13996](https://github.com/RocketChat/Rocket.Chat/pull/13996))
+
 - Add support to updatedSince parameter in emoji-custom.list and deprecated old endpoint ([#13510](https://github.com/RocketChat/Rocket.Chat/pull/13510))
+
 - Chatpal: Enable custom search parameters ([#13829](https://github.com/RocketChat/Rocket.Chat/pull/13829) by [@Peym4n](https://github.com/Peym4n))
+
 - - Add setting to request a comment when closing Livechat room ([#13983](https://github.com/RocketChat/Rocket.Chat/pull/13983) by [@knrt10](https://github.com/knrt10))
+
 - Rest threads ([#14045](https://github.com/RocketChat/Rocket.Chat/pull/14045))
+
 - Add GET method to fetch Livechat message through REST API ([#14147](https://github.com/RocketChat/Rocket.Chat/pull/14147))
+
 - Add Voxtelesys to list of SMS providers ([#13697](https://github.com/RocketChat/Rocket.Chat/pull/13697) by [@jhnburke8](https://github.com/jhnburke8) & [@john08burke](https://github.com/john08burke))
+
 - Rest endpoints of discussions ([#13987](https://github.com/RocketChat/Rocket.Chat/pull/13987))
+
 - Multiple slackbridges ([#11346](https://github.com/RocketChat/Rocket.Chat/pull/11346) by [@Hudell](https://github.com/Hudell) & [@kable-wilmoth](https://github.com/kable-wilmoth))
+
 - option to not use nrr (experimental) ([#14224](https://github.com/RocketChat/Rocket.Chat/pull/14224))
+
 - Set up livechat connections created from new client ([#14236](https://github.com/RocketChat/Rocket.Chat/pull/14236))
+
 - allow drop files on thread ([#14214](https://github.com/RocketChat/Rocket.Chat/pull/14214))
+
 - Update message actions ([#14268](https://github.com/RocketChat/Rocket.Chat/pull/14268))
 
 ### 🚀 Improvements
 
+
 - UI of page not found ([#13757](https://github.com/RocketChat/Rocket.Chat/pull/13757) by [@fliptrail](https://github.com/fliptrail))
+
 - Show rooms with mentions on unread category even with hide counter ([#13948](https://github.com/RocketChat/Rocket.Chat/pull/13948))
+
 - Join channels by sending a message or join button (#13752) ([#13752](https://github.com/RocketChat/Rocket.Chat/pull/13752) by [@bhardwajaditya](https://github.com/bhardwajaditya))
+
 - Filter agents with autocomplete input instead of select element ([#13730](https://github.com/RocketChat/Rocket.Chat/pull/13730))
+
 - Ignore agent status when queuing incoming livechats via Guest Pool ([#13818](https://github.com/RocketChat/Rocket.Chat/pull/13818))
+
 - Replaces color #13679A to #1d74f5 ([#13796](https://github.com/RocketChat/Rocket.Chat/pull/13796) by [@fliptrail](https://github.com/fliptrail))
+
 - Remove unnecessary "File Upload". ([#13743](https://github.com/RocketChat/Rocket.Chat/pull/13743) by [@knrt10](https://github.com/knrt10))
+
 - Add index for room's ts ([#13726](https://github.com/RocketChat/Rocket.Chat/pull/13726))
+
 - Add decoding for commonName (cn) and displayName attributes for SAML ([#12347](https://github.com/RocketChat/Rocket.Chat/pull/12347) by [@pkolmann](https://github.com/pkolmann))
+
 - Deprecate fixCordova helper ([#13598](https://github.com/RocketChat/Rocket.Chat/pull/13598))
+
 - Remove dangling side-nav styles ([#13584](https://github.com/RocketChat/Rocket.Chat/pull/13584))
+
 - Disable X-Powered-By header in all known express middlewares ([#13388](https://github.com/RocketChat/Rocket.Chat/pull/13388))
+
 - Allow custom rocketchat username for crowd users and enable login via email/crowd_username ([#12981](https://github.com/RocketChat/Rocket.Chat/pull/12981) by [@steerben](https://github.com/steerben))
+
 - Add department field on find guest method ([#13491](https://github.com/RocketChat/Rocket.Chat/pull/13491))
+
 - KaTeX and Autolinker message rendering ([#11698](https://github.com/RocketChat/Rocket.Chat/pull/11698))
+
 - Update to MongoDB 4.0 in docker-compose file ([#13396](https://github.com/RocketChat/Rocket.Chat/pull/13396) by [@ngulden](https://github.com/ngulden))
+
 - Admin ui ([#13393](https://github.com/RocketChat/Rocket.Chat/pull/13393))
+
 - End to end tests ([#13401](https://github.com/RocketChat/Rocket.Chat/pull/13401))
+
 - Update deleteUser errors to be more semantic ([#12380](https://github.com/RocketChat/Rocket.Chat/pull/12380) by [@timkinnane](https://github.com/timkinnane))
+
 - Line height on static content pages ([#11673](https://github.com/RocketChat/Rocket.Chat/pull/11673) by [@timkinnane](https://github.com/timkinnane))
+
 - new icons ([#13289](https://github.com/RocketChat/Rocket.Chat/pull/13289))
+
 - Add permission to change other user profile avatar ([#13884](https://github.com/RocketChat/Rocket.Chat/pull/13884) by [@knrt10](https://github.com/knrt10))
+
 - UI of Permissions page ([#13732](https://github.com/RocketChat/Rocket.Chat/pull/13732) by [@fliptrail](https://github.com/fliptrail))
+
 - Use SessionId for credential token in SAML request ([#13791](https://github.com/RocketChat/Rocket.Chat/pull/13791) by [@MohammedEssehemy](https://github.com/MohammedEssehemy))
+
 - Include more information to help with bug reports and debugging ([#14047](https://github.com/RocketChat/Rocket.Chat/pull/14047))
+
 - New sidebar item badges, mention links, and ticks ([#14030](https://github.com/RocketChat/Rocket.Chat/pull/14030))
+
 - Remove setting to show a livechat is waiting ([#13992](https://github.com/RocketChat/Rocket.Chat/pull/13992))
+
 - Attachment download caching ([#14137](https://github.com/RocketChat/Rocket.Chat/pull/14137) by [@wreiske](https://github.com/wreiske))
+
 - Get avatar from oauth ([#14131](https://github.com/RocketChat/Rocket.Chat/pull/14131))
+
 - OAuth Role Sync ([#13761](https://github.com/RocketChat/Rocket.Chat/pull/13761) by [@hypery2k](https://github.com/hypery2k))
+
 - Update the Apps Engine version to v1.4.1 ([#14072](https://github.com/RocketChat/Rocket.Chat/pull/14072))
+
 - Replace livechat inquiry dialog with preview room ([#13986](https://github.com/RocketChat/Rocket.Chat/pull/13986))
 
 ### 🐛 Bug fixes
 
+
 - Opening a Livechat room from another agent ([#13951](https://github.com/RocketChat/Rocket.Chat/pull/13951))
+
 - Directory and Apps logs page ([#13938](https://github.com/RocketChat/Rocket.Chat/pull/13938))
+
 - Minor issues detected after testing the new Livechat client ([#13521](https://github.com/RocketChat/Rocket.Chat/pull/13521))
+
 - Display first message when taking Livechat inquiry ([#13896](https://github.com/RocketChat/Rocket.Chat/pull/13896))
+
 - Loading theme CSS on first server startup ([#13953](https://github.com/RocketChat/Rocket.Chat/pull/13953))
+
 - OTR dialog issue ([#13755](https://github.com/RocketChat/Rocket.Chat/pull/13755) by [@knrt10](https://github.com/knrt10))
+
 - Limit App’s HTTP calls to 500ms ([#13949](https://github.com/RocketChat/Rocket.Chat/pull/13949))
+
 - Read Receipt for Livechat Messages fixed ([#13832](https://github.com/RocketChat/Rocket.Chat/pull/13832) by [@knrt10](https://github.com/knrt10))
+
 - Avatar image being shrinked on autocomplete ([#13914](https://github.com/RocketChat/Rocket.Chat/pull/13914))
+
 - VIDEO/JITSI multiple calls before video call ([#13855](https://github.com/RocketChat/Rocket.Chat/pull/13855))
+
 - Some Safari bugs ([#13895](https://github.com/RocketChat/Rocket.Chat/pull/13895))
+
 - wrong width/height for tile_70 (mstile 70x70 (png)) ([#13851](https://github.com/RocketChat/Rocket.Chat/pull/13851) by [@ulf-f](https://github.com/ulf-f))
+
 - wrong importing of e2e ([#13863](https://github.com/RocketChat/Rocket.Chat/pull/13863))
+
 - Forwarded Livechat visitor name is not getting updated on the sidebar ([#13783](https://github.com/RocketChat/Rocket.Chat/pull/13783) by [@zolbayars](https://github.com/zolbayars))
+
 - Remove spaces in some i18n files ([#13801](https://github.com/RocketChat/Rocket.Chat/pull/13801))
+
 - Translation interpolations for many languages ([#13751](https://github.com/RocketChat/Rocket.Chat/pull/13751) by [@fliptrail](https://github.com/fliptrail))
+
 - Fixed grammatical error. ([#13559](https://github.com/RocketChat/Rocket.Chat/pull/13559) by [@gsunit](https://github.com/gsunit))
+
 - In home screen Rocket.Chat+ is dispalyed as Rocket.Chat ([#13784](https://github.com/RocketChat/Rocket.Chat/pull/13784) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
 - No new room created when conversation is closed ([#13753](https://github.com/RocketChat/Rocket.Chat/pull/13753) by [@knrt10](https://github.com/knrt10))
+
 - Loading user list from room messages ([#13769](https://github.com/RocketChat/Rocket.Chat/pull/13769))
+
 - User is unable to enter multiple emojis by clicking on the emoji icon ([#13744](https://github.com/RocketChat/Rocket.Chat/pull/13744) by [@Kailash0311](https://github.com/Kailash0311))
+
 - Audio message recording ([#13727](https://github.com/RocketChat/Rocket.Chat/pull/13727))
+
 - Remove Room info for Direct Messages (#9383) ([#12429](https://github.com/RocketChat/Rocket.Chat/pull/12429) by [@vinade](https://github.com/vinade))
+
 - WebRTC wasn't working duo to design and browser's APIs changes ([#13675](https://github.com/RocketChat/Rocket.Chat/pull/13675))
+
 - Adds Proper Language display name for many languages ([#13714](https://github.com/RocketChat/Rocket.Chat/pull/13714) by [@fliptrail](https://github.com/fliptrail))
+
 - Update bad-words to 3.0.2 ([#13705](https://github.com/RocketChat/Rocket.Chat/pull/13705) by [@trivoallan](https://github.com/trivoallan))
+
 - Changing Room name updates the webhook ([#13672](https://github.com/RocketChat/Rocket.Chat/pull/13672) by [@knrt10](https://github.com/knrt10))
+
 - Fix snap refresh hook ([#13702](https://github.com/RocketChat/Rocket.Chat/pull/13702))
+
 - Audio message recording issues ([#13486](https://github.com/RocketChat/Rocket.Chat/pull/13486))
+
 - Legal pages' style ([#13677](https://github.com/RocketChat/Rocket.Chat/pull/13677))
+
 - Stop livestream ([#13676](https://github.com/RocketChat/Rocket.Chat/pull/13676))
+
 - Avatar fonts for PNG and JPG ([#13681](https://github.com/RocketChat/Rocket.Chat/pull/13681))
+
 - Block User Icon ([#13630](https://github.com/RocketChat/Rocket.Chat/pull/13630) by [@knrt10](https://github.com/knrt10))
+
 - Corrects UI background of forced F2A Authentication ([#13670](https://github.com/RocketChat/Rocket.Chat/pull/13670) by [@fliptrail](https://github.com/fliptrail))
+
 - Race condition on the loading of Apps on the admin page ([#13587](https://github.com/RocketChat/Rocket.Chat/pull/13587))
+
 - Do not allow change avatars of another users without permission ([#13629](https://github.com/RocketChat/Rocket.Chat/pull/13629))
+
 - link of k8s deploy ([#13612](https://github.com/RocketChat/Rocket.Chat/pull/13612) by [@Mr-Linus](https://github.com/Mr-Linus))
+
 - Bugfix markdown Marked link new tab ([#13245](https://github.com/RocketChat/Rocket.Chat/pull/13245) by [@DeviaVir](https://github.com/DeviaVir))
+
 - Partially messaging formatting for bold letters ([#13599](https://github.com/RocketChat/Rocket.Chat/pull/13599) by [@knrt10](https://github.com/knrt10))
+
 - Change userId of rate limiter, change to logged user ([#13442](https://github.com/RocketChat/Rocket.Chat/pull/13442))
+
 - Add retries to docker-compose.yml, to wait for MongoDB to be ready ([#13199](https://github.com/RocketChat/Rocket.Chat/pull/13199) by [@tiangolo](https://github.com/tiangolo))
+
 - Non-latin room names and other slugifications ([#13467](https://github.com/RocketChat/Rocket.Chat/pull/13467))
+
 - Fixed rocketchat-oembed meta fragment pulling ([#13056](https://github.com/RocketChat/Rocket.Chat/pull/13056) by [@wreiske](https://github.com/wreiske))
+
 - Attachments without dates were showing December 31, 1970 ([#13428](https://github.com/RocketChat/Rocket.Chat/pull/13428) by [@wreiske](https://github.com/wreiske))
+
 - Restart required to apply changes in API Rate Limiter settings ([#13451](https://github.com/RocketChat/Rocket.Chat/pull/13451))
+
 - Ability to activate an app installed by zip even offline ([#13563](https://github.com/RocketChat/Rocket.Chat/pull/13563))
+
 - .bin extension added to attached file names ([#13468](https://github.com/RocketChat/Rocket.Chat/pull/13468) by [@Hudell](https://github.com/Hudell))
+
 - Right arrows in default HTML content ([#13502](https://github.com/RocketChat/Rocket.Chat/pull/13502))
+
 - Typo in a referrer header in inject.js file ([#13469](https://github.com/RocketChat/Rocket.Chat/pull/13469) by [@algomaster99](https://github.com/algomaster99))
+
 - Fix issue cannot filter channels by name ([#12952](https://github.com/RocketChat/Rocket.Chat/pull/12952) by [@huydang284](https://github.com/huydang284))
+
 - mention-links not being always resolved ([#11745](https://github.com/RocketChat/Rocket.Chat/pull/11745) by [@mrsimpson](https://github.com/mrsimpson))
+
 - allow user to logout before set username ([#13439](https://github.com/RocketChat/Rocket.Chat/pull/13439))
+
 - Error when recording data into the connection object ([#13553](https://github.com/RocketChat/Rocket.Chat/pull/13553))
+
 - Handle showing/hiding input in messageBox ([#13564](https://github.com/RocketChat/Rocket.Chat/pull/13564))
+
 - Fix wrong this scope in Notifications ([#13515](https://github.com/RocketChat/Rocket.Chat/pull/13515))
+
 - Get next Livechat agent endpoint ([#13485](https://github.com/RocketChat/Rocket.Chat/pull/13485))
+
 - Sidenav mouse hover was slow ([#13482](https://github.com/RocketChat/Rocket.Chat/pull/13482))
+
 - Emoji detection at line breaks ([#13447](https://github.com/RocketChat/Rocket.Chat/pull/13447) by [@savish28](https://github.com/savish28))
+
 - Small improvements on message box ([#13444](https://github.com/RocketChat/Rocket.Chat/pull/13444))
+
 - Fixing rooms find by type and name ([#11451](https://github.com/RocketChat/Rocket.Chat/pull/11451) by [@hmagarotto](https://github.com/hmagarotto))
+
 - linear-gradient background on safari ([#13363](https://github.com/RocketChat/Rocket.Chat/pull/13363))
+
 - Fixed text for "bulk-register-user" ([#11558](https://github.com/RocketChat/Rocket.Chat/pull/11558) by [@the4ndy](https://github.com/the4ndy))
+
 - Closing sidebar when room menu is clicked. ([#13842](https://github.com/RocketChat/Rocket.Chat/pull/13842) by [@Kailash0311](https://github.com/Kailash0311))
+
 - Check settings for name requirement before validating ([#14021](https://github.com/RocketChat/Rocket.Chat/pull/14021))
+
 - Links and upload paths when running in a subdir ([#13982](https://github.com/RocketChat/Rocket.Chat/pull/13982))
+
 - users.getPreferences when the user doesn't have any preferences ([#13532](https://github.com/RocketChat/Rocket.Chat/pull/13532) by [@thayannevls](https://github.com/thayannevls))
+
 - Real names were not displayed in the reactions (API/UI) ([#13495](https://github.com/RocketChat/Rocket.Chat/pull/13495))
+
 - Theme CSS loading in subdir env ([#14015](https://github.com/RocketChat/Rocket.Chat/pull/14015))
+
 - Fix rendering of links in the announcement modal ([#13250](https://github.com/RocketChat/Rocket.Chat/pull/13250) by [@supra08](https://github.com/supra08))
+
 - Add custom MIME types for *.ico extension ([#13969](https://github.com/RocketChat/Rocket.Chat/pull/13969))
+
 - Groups endpoints permission validations ([#13994](https://github.com/RocketChat/Rocket.Chat/pull/13994))
+
 - Focus on input when emoji picker box is open was not working ([#13981](https://github.com/RocketChat/Rocket.Chat/pull/13981))
+
 - Auto hide Livechat room from sidebar on close ([#13824](https://github.com/RocketChat/Rocket.Chat/pull/13824) by [@knrt10](https://github.com/knrt10))
+
 - Improve cloud section ([#13820](https://github.com/RocketChat/Rocket.Chat/pull/13820))
+
 - Wrong permalink when running in subdir ([#13746](https://github.com/RocketChat/Rocket.Chat/pull/13746) by [@ura14h](https://github.com/ura14h))
+
 - Change localStorage keys to work when server is running in a subdir ([#13968](https://github.com/RocketChat/Rocket.Chat/pull/13968))
+
 - SAML certificate settings don't follow a pattern ([#14179](https://github.com/RocketChat/Rocket.Chat/pull/14179) by [@Hudell](https://github.com/Hudell))
+
 - Custom Oauth store refresh and id tokens with expiresIn ([#14121](https://github.com/RocketChat/Rocket.Chat/pull/14121) by [@ralfbecker](https://github.com/ralfbecker))
+
 - Apps converters delete fields on message attachments ([#14028](https://github.com/RocketChat/Rocket.Chat/pull/14028))
+
 - Custom Oauth login not working with accessToken ([#14113](https://github.com/RocketChat/Rocket.Chat/pull/14113) by [@knrt10](https://github.com/knrt10))
+
 - renderField template to correct short property usage ([#14148](https://github.com/RocketChat/Rocket.Chat/pull/14148))
+
 - Updating a message from apps if keep history is on ([#14129](https://github.com/RocketChat/Rocket.Chat/pull/14129))
+
 - Missing connection headers on Livechat REST API ([#14130](https://github.com/RocketChat/Rocket.Chat/pull/14130))
+
 - Receiving agent for new livechats from REST API ([#14103](https://github.com/RocketChat/Rocket.Chat/pull/14103))
+
 - Livechat user registration in another department ([#10695](https://github.com/RocketChat/Rocket.Chat/pull/10695))
+
 - Support for handling SAML LogoutRequest SLO ([#14074](https://github.com/RocketChat/Rocket.Chat/pull/14074))
+
 - Livechat office hours ([#14031](https://github.com/RocketChat/Rocket.Chat/pull/14031))
+
 - Auto-translate toggle not updating rendered messages ([#14262](https://github.com/RocketChat/Rocket.Chat/pull/14262))
+
 - Align burger menu in header with content matching room header ([#14265](https://github.com/RocketChat/Rocket.Chat/pull/14265))
+
 - Normalize TAPi18n language string on Livechat widget ([#14012](https://github.com/RocketChat/Rocket.Chat/pull/14012))
+
 - Autogrow not working properly for many message boxes ([#14163](https://github.com/RocketChat/Rocket.Chat/pull/14163))
+
 - Image attachment re-renders on message update ([#14207](https://github.com/RocketChat/Rocket.Chat/pull/14207) by [@Kailash0311](https://github.com/Kailash0311))
+
 - Sidenav does not open on some admin pages ([#14010](https://github.com/RocketChat/Rocket.Chat/pull/14010))
+
 - Empty result when getting badge count notification ([#14244](https://github.com/RocketChat/Rocket.Chat/pull/14244))
+
 - Obey audio notification preferences ([#14188](https://github.com/RocketChat/Rocket.Chat/pull/14188))
+
 - Slackbridge private channels ([#14273](https://github.com/RocketChat/Rocket.Chat/pull/14273) by [@Hudell](https://github.com/Hudell) & [@nylen](https://github.com/nylen))
+
 - View All members button now not in direct room ([#14081](https://github.com/RocketChat/Rocket.Chat/pull/14081) by [@knrt10](https://github.com/knrt10))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Update eslint config ([#13966](https://github.com/RocketChat/Rocket.Chat/pull/13966))
+
 - Remove some bad references to messageBox ([#13954](https://github.com/RocketChat/Rocket.Chat/pull/13954))
+
 - LingoHub based on develop ([#13964](https://github.com/RocketChat/Rocket.Chat/pull/13964))
+
 - Update preview Dockerfile to use Stretch dependencies ([#13947](https://github.com/RocketChat/Rocket.Chat/pull/13947))
+
 - Small improvements to federation callbacks/hooks ([#13946](https://github.com/RocketChat/Rocket.Chat/pull/13946))
+
 - Improve: Support search and adding federated users through regular endpoints ([#13936](https://github.com/RocketChat/Rocket.Chat/pull/13936))
+
 - Remove bitcoin link in Readme.md since the link is broken ([#13935](https://github.com/RocketChat/Rocket.Chat/pull/13935) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
 - Fix missing dependencies on stretch CI image ([#13910](https://github.com/RocketChat/Rocket.Chat/pull/13910))
+
 - Remove some index.js files routing for server/client files ([#13772](https://github.com/RocketChat/Rocket.Chat/pull/13772))
+
 - Use CircleCI Debian Stretch images ([#13906](https://github.com/RocketChat/Rocket.Chat/pull/13906))
+
 - LingoHub based on develop ([#13891](https://github.com/RocketChat/Rocket.Chat/pull/13891))
+
 - User remove role dialog fixed ([#13874](https://github.com/RocketChat/Rocket.Chat/pull/13874) by [@bhardwajaditya](https://github.com/bhardwajaditya))
+
 - Rename Threads to Discussion ([#13782](https://github.com/RocketChat/Rocket.Chat/pull/13782))
+
 - [BUG] Icon Fixed for Knowledge base on Livechat  ([#13806](https://github.com/RocketChat/Rocket.Chat/pull/13806) by [@knrt10](https://github.com/knrt10))
+
 - Add support to search for all users in directory ([#13803](https://github.com/RocketChat/Rocket.Chat/pull/13803))
+
 - LingoHub based on develop ([#13839](https://github.com/RocketChat/Rocket.Chat/pull/13839))
+
 - Remove unused style ([#13834](https://github.com/RocketChat/Rocket.Chat/pull/13834))
+
 - Remove unused files ([#13833](https://github.com/RocketChat/Rocket.Chat/pull/13833))
+
 - Lingohub sync and additional fixes ([#13825](https://github.com/RocketChat/Rocket.Chat/pull/13825))
+
 - Fix: addRoomAccessValidator method created for Threads ([#13789](https://github.com/RocketChat/Rocket.Chat/pull/13789))
+
 - Adds French translation of Personal Access Token ([#13779](https://github.com/RocketChat/Rocket.Chat/pull/13779) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
 - Remove Sandstorm support ([#13773](https://github.com/RocketChat/Rocket.Chat/pull/13773))
+
 - Removing (almost) every dynamic imports ([#13767](https://github.com/RocketChat/Rocket.Chat/pull/13767))
+
 - Regression: Threads styles improvement ([#13741](https://github.com/RocketChat/Rocket.Chat/pull/13741))
+
 - Convert imports to relative paths ([#13740](https://github.com/RocketChat/Rocket.Chat/pull/13740))
+
 - Regression: removed backup files ([#13729](https://github.com/RocketChat/Rocket.Chat/pull/13729))
+
 - Remove unused files ([#13725](https://github.com/RocketChat/Rocket.Chat/pull/13725))
+
 - Add Houston config ([#13707](https://github.com/RocketChat/Rocket.Chat/pull/13707))
+
 - Change the way to resolve DNS for Federation ([#13695](https://github.com/RocketChat/Rocket.Chat/pull/13695))
+
 - Update husky config ([#13687](https://github.com/RocketChat/Rocket.Chat/pull/13687))
+
 - Regression: Prune Threads ([#13683](https://github.com/RocketChat/Rocket.Chat/pull/13683))
+
 - Regression: Fix icon for DMs ([#13679](https://github.com/RocketChat/Rocket.Chat/pull/13679))
+
 - Regression: Add missing translations used in Apps pages ([#13674](https://github.com/RocketChat/Rocket.Chat/pull/13674))
+
 - Regression: User Discussions join message ([#13656](https://github.com/RocketChat/Rocket.Chat/pull/13656) by [@bhardwajaditya](https://github.com/bhardwajaditya))
+
 - Regression: Sidebar create new channel hover text ([#13658](https://github.com/RocketChat/Rocket.Chat/pull/13658) by [@bhardwajaditya](https://github.com/bhardwajaditya))
+
 - Regression: Fix embedded layout ([#13574](https://github.com/RocketChat/Rocket.Chat/pull/13574))
+
 - Improve: Send cloud token to Federation Hub ([#13651](https://github.com/RocketChat/Rocket.Chat/pull/13651))
+
 - Regression: Discussions - Invite users and DM ([#13646](https://github.com/RocketChat/Rocket.Chat/pull/13646))
+
 - LingoHub based on develop ([#13623](https://github.com/RocketChat/Rocket.Chat/pull/13623))
+
 - Force some words to translate in other languages ([#13367](https://github.com/RocketChat/Rocket.Chat/pull/13367) by [@soltanabadiyan](https://github.com/soltanabadiyan))
+
 - Fix wrong imports ([#13601](https://github.com/RocketChat/Rocket.Chat/pull/13601))
+
 - Fix: Some german translations ([#13299](https://github.com/RocketChat/Rocket.Chat/pull/13299) by [@soenkef](https://github.com/soenkef))
+
 - Add better positioning for tooltips on edges ([#13472](https://github.com/RocketChat/Rocket.Chat/pull/13472))
+
 - Fix: Mongo.setConnectionOptions was not being set correctly ([#13586](https://github.com/RocketChat/Rocket.Chat/pull/13586))
+
 - Regression: Missing settings import at `packages/rocketchat-livechat/server/methods/saveAppearance.js` ([#13573](https://github.com/RocketChat/Rocket.Chat/pull/13573))
+
 - Depack: Use mainModule for root files ([#13508](https://github.com/RocketChat/Rocket.Chat/pull/13508))
+
 - Regression: fix app pages styles ([#13567](https://github.com/RocketChat/Rocket.Chat/pull/13567))
+
 - Move mongo config away from cors package ([#13531](https://github.com/RocketChat/Rocket.Chat/pull/13531))
+
 - Regression: Add debounce on admin users search to avoid blocking by DDP Rate Limiter ([#13529](https://github.com/RocketChat/Rocket.Chat/pull/13529))
+
 - Remove Package references ([#13523](https://github.com/RocketChat/Rocket.Chat/pull/13523))
+
 - Remove Npm.depends and Npm.require except those that are inside package.js ([#13518](https://github.com/RocketChat/Rocket.Chat/pull/13518))
+
 - Update Meteor 1.8.0.2 ([#13519](https://github.com/RocketChat/Rocket.Chat/pull/13519))
+
 - Convert rc-nrr and slashcommands open to main module structure ([#13520](https://github.com/RocketChat/Rocket.Chat/pull/13520))
+
 - Regression: Fix wrong imports in rc-models ([#13516](https://github.com/RocketChat/Rocket.Chat/pull/13516))
+
 - Regression: Fix autolinker that was not parsing urls correctly ([#13497](https://github.com/RocketChat/Rocket.Chat/pull/13497))
+
 - Regression: Not updating subscriptions and not showing desktop notifcations ([#13509](https://github.com/RocketChat/Rocket.Chat/pull/13509))
+
 -  Fix some imports from wrong packages, remove exports and files unused in rc-ui ([#13422](https://github.com/RocketChat/Rocket.Chat/pull/13422))
+
 -  Remove functions from globals ([#13421](https://github.com/RocketChat/Rocket.Chat/pull/13421))
+
 -  Remove unused files and code in rc-lib - step 3 ([#13420](https://github.com/RocketChat/Rocket.Chat/pull/13420))
+
 -  Remove unused files in rc-lib - step 2 ([#13419](https://github.com/RocketChat/Rocket.Chat/pull/13419))
+
 -  Remove unused files and code in rc-lib - step 1 ([#13416](https://github.com/RocketChat/Rocket.Chat/pull/13416))
+
 -  Convert rocketchat-lib to main module structure ([#13415](https://github.com/RocketChat/Rocket.Chat/pull/13415))
+
 - Regression: Message box geolocation was throwing error ([#13496](https://github.com/RocketChat/Rocket.Chat/pull/13496))
+
 -  Import missed functions to remove dependency of RC namespace ([#13414](https://github.com/RocketChat/Rocket.Chat/pull/13414))
+
 -  Convert rocketchat-apps to main module structure ([#13409](https://github.com/RocketChat/Rocket.Chat/pull/13409))
+
 - Remove dependency of RC namespace in root server folder - step 6 ([#13405](https://github.com/RocketChat/Rocket.Chat/pull/13405))
+
 - Remove dependency of RC namespace in root server folder - step 5 ([#13402](https://github.com/RocketChat/Rocket.Chat/pull/13402))
+
 -  Remove dependency of RC namespace in root server folder - step 4 ([#13400](https://github.com/RocketChat/Rocket.Chat/pull/13400))
+
 - Remove dependency of RC namespace in root server folder - step 3 ([#13398](https://github.com/RocketChat/Rocket.Chat/pull/13398))
+
 - Remove dependency of RC namespace in root server folder - step 2 ([#13397](https://github.com/RocketChat/Rocket.Chat/pull/13397))
+
 -  Remove dependency of RC namespace in root server folder - step 1 ([#13390](https://github.com/RocketChat/Rocket.Chat/pull/13390))
+
 -  Remove dependency of RC namespace in root client folder, imports/message-read-receipt and imports/personal-access-tokens ([#13389](https://github.com/RocketChat/Rocket.Chat/pull/13389))
+
 -  Remove dependency of RC namespace in rc-integrations and importer-hipchat-enterprise ([#13386](https://github.com/RocketChat/Rocket.Chat/pull/13386))
+
 - Move rc-livechat server models to rc-models ([#13384](https://github.com/RocketChat/Rocket.Chat/pull/13384))
+
 -  Remove dependency of RC namespace in rc-livechat/server/publications ([#13383](https://github.com/RocketChat/Rocket.Chat/pull/13383))
+
 - Remove dependency of RC namespace in rc-livechat/server/methods ([#13382](https://github.com/RocketChat/Rocket.Chat/pull/13382))
+
 - Remove dependency of RC namespace in rc-livechat/imports, lib, server/api, server/hooks and server/lib ([#13379](https://github.com/RocketChat/Rocket.Chat/pull/13379))
+
 -  Remove LIvechat global variable from RC namespace ([#13378](https://github.com/RocketChat/Rocket.Chat/pull/13378))
+
 - Remove dependency of RC namespace in rc-livechat/server/models ([#13377](https://github.com/RocketChat/Rocket.Chat/pull/13377))
+
 -  Remove dependency of RC namespace in livechat/client ([#13370](https://github.com/RocketChat/Rocket.Chat/pull/13370))
+
 - Remove dependency of RC namespace in rc-wordpress, chatpal-search and irc ([#13492](https://github.com/RocketChat/Rocket.Chat/pull/13492))
+
 -  Remove dependency of RC namespace in rc-videobridge and webdav ([#13366](https://github.com/RocketChat/Rocket.Chat/pull/13366))
+
 -  Remove dependency of RC namespace in rc-ui-master, ui-message- user-data-download and version-check ([#13365](https://github.com/RocketChat/Rocket.Chat/pull/13365))
+
 - Remove dependency of RC namespace in rc-ui-clean-history, ui-admin and ui-login ([#13362](https://github.com/RocketChat/Rocket.Chat/pull/13362))
+
 -  Remove dependency of RC namespace in rc-ui, ui-account and ui-admin ([#13361](https://github.com/RocketChat/Rocket.Chat/pull/13361))
+
 -  Remove dependency of RC namespace in rc-statistics and tokenpass ([#13359](https://github.com/RocketChat/Rocket.Chat/pull/13359))
+
 -  Remove dependency of RC namespace in rc-smarsh-connector, sms and spotify ([#13358](https://github.com/RocketChat/Rocket.Chat/pull/13358))
+
 - Remove dependency of RC namespace in rc-slash-kick, leave, me, msg, mute, open, topic and unarchiveroom ([#13357](https://github.com/RocketChat/Rocket.Chat/pull/13357))
+
 -  Remove dependency of RC namespace in rc-slash-archiveroom, create, help, hide, invite, inviteall and join ([#13356](https://github.com/RocketChat/Rocket.Chat/pull/13356))
+
 - Remove dependency of RC namespace in rc-setup-wizard, slackbridge and asciiarts ([#13348](https://github.com/RocketChat/Rocket.Chat/pull/13348))
+
 -  Remove dependency of RC namespace in rc-reactions, retention-policy and search ([#13347](https://github.com/RocketChat/Rocket.Chat/pull/13347))
+
 -  Remove dependency of RC namespace in rc-oembed and rc-otr ([#13345](https://github.com/RocketChat/Rocket.Chat/pull/13345))
+
 - Remove dependency of RC namespace in rc-oauth2-server and message-star ([#13344](https://github.com/RocketChat/Rocket.Chat/pull/13344))
+
 -  Remove dependency of RC namespace in rc-message-pin and message-snippet ([#13343](https://github.com/RocketChat/Rocket.Chat/pull/13343))
+
 - Depackaging ([#13483](https://github.com/RocketChat/Rocket.Chat/pull/13483))
+
 - Merge master into develop & Set version to 1.0.0-develop ([#13435](https://github.com/RocketChat/Rocket.Chat/pull/13435) by [@Hudell](https://github.com/Hudell) & [@TkTech](https://github.com/TkTech) & [@theundefined](https://github.com/theundefined))
+
 - Regression: Table admin pages ([#13411](https://github.com/RocketChat/Rocket.Chat/pull/13411))
+
 - Regression: Template error ([#13410](https://github.com/RocketChat/Rocket.Chat/pull/13410))
+
 - Removed old templates ([#13406](https://github.com/RocketChat/Rocket.Chat/pull/13406))
+
 - Add pagination to getUsersOfRoom ([#12834](https://github.com/RocketChat/Rocket.Chat/pull/12834) by [@Hudell](https://github.com/Hudell))
+
 - OpenShift custom OAuth support ([#13925](https://github.com/RocketChat/Rocket.Chat/pull/13925) by [@bsharrow](https://github.com/bsharrow))
+
 - Settings: disable reset button ([#14026](https://github.com/RocketChat/Rocket.Chat/pull/14026))
+
 - Settings: hiding reset button for readonly fields ([#14025](https://github.com/RocketChat/Rocket.Chat/pull/14025))
+
 - Fix debug logging not being enabled by the setting ([#13979](https://github.com/RocketChat/Rocket.Chat/pull/13979))
+
 - Deprecate /api/v1/info in favor of /api/info ([#13798](https://github.com/RocketChat/Rocket.Chat/pull/13798))
+
 - Change dynamic dependency of FileUpload in Messages models ([#13776](https://github.com/RocketChat/Rocket.Chat/pull/13776))
+
 - Allow set env var METEOR_OPLOG_TOO_FAR_BEHIND ([#14017](https://github.com/RocketChat/Rocket.Chat/pull/14017))
+
 - Improve: Decrease padding for app buy modal ([#13984](https://github.com/RocketChat/Rocket.Chat/pull/13984))
+
 - Prioritize user-mentions badge ([#14057](https://github.com/RocketChat/Rocket.Chat/pull/14057))
+
 - Proper thread quote, clear message box on send, and other nice things to have ([#14049](https://github.com/RocketChat/Rocket.Chat/pull/14049))
+
 - Fix: Tests were not exiting RC instances ([#14054](https://github.com/RocketChat/Rocket.Chat/pull/14054))
+
 - Fix shield indentation ([#14048](https://github.com/RocketChat/Rocket.Chat/pull/14048))
+
 - Fix modal scroll ([#14052](https://github.com/RocketChat/Rocket.Chat/pull/14052))
+
 - Fix race condition of lastMessage set ([#14041](https://github.com/RocketChat/Rocket.Chat/pull/14041))
+
 - Fix room re-rendering ([#14044](https://github.com/RocketChat/Rocket.Chat/pull/14044))
+
 - Fix sending notifications to mentions on threads and discussion email sender ([#14043](https://github.com/RocketChat/Rocket.Chat/pull/14043))
+
 - Fix discussions issues after room deletion and translation actions not being shown ([#14018](https://github.com/RocketChat/Rocket.Chat/pull/14018))
+
 - Show discussion avatar ([#14053](https://github.com/RocketChat/Rocket.Chat/pull/14053))
+
 - Fix threads tests ([#14180](https://github.com/RocketChat/Rocket.Chat/pull/14180))
+
 - Prevent error for ldap login with invalid characters ([#14160](https://github.com/RocketChat/Rocket.Chat/pull/14160))
+
 - [REGRESSION] Messages sent by livechat's guests are losing sender info ([#14174](https://github.com/RocketChat/Rocket.Chat/pull/14174))
+
 - Faster CI build for PR ([#14171](https://github.com/RocketChat/Rocket.Chat/pull/14171))
+
 - Regression: Message box does not go back to initial state after sending a message ([#14161](https://github.com/RocketChat/Rocket.Chat/pull/14161))
+
 - Prevent error on normalize thread message for preview ([#14170](https://github.com/RocketChat/Rocket.Chat/pull/14170))
+
 - Update badges and mention links colors ([#14071](https://github.com/RocketChat/Rocket.Chat/pull/14071))
+
 - Smaller thread replies and system messages ([#14099](https://github.com/RocketChat/Rocket.Chat/pull/14099))
+
 - Regression: User autocomplete was not listing users from correct room ([#14125](https://github.com/RocketChat/Rocket.Chat/pull/14125))
+
 - Regression: Role creation and deletion error fixed ([#14097](https://github.com/RocketChat/Rocket.Chat/pull/14097) by [@knrt10](https://github.com/knrt10))
+
 - [Regression] Fix integrations message example ([#14111](https://github.com/RocketChat/Rocket.Chat/pull/14111))
+
 - Fix update apps capability of updating messages ([#14118](https://github.com/RocketChat/Rocket.Chat/pull/14118))
+
 - Fix: Skip thread notifications on message edit ([#14100](https://github.com/RocketChat/Rocket.Chat/pull/14100))
+
 - Fix: Remove message class `sequential` if `new-day` is present ([#14116](https://github.com/RocketChat/Rocket.Chat/pull/14116))
+
 - Fix top bar unread message counter ([#14102](https://github.com/RocketChat/Rocket.Chat/pull/14102))
+
 - LingoHub based on develop ([#14046](https://github.com/RocketChat/Rocket.Chat/pull/14046))
+
 - Fix sending message from action buttons in messages ([#14101](https://github.com/RocketChat/Rocket.Chat/pull/14101))
+
 - Fix: Error when version check endpoint was returning invalid data ([#14089](https://github.com/RocketChat/Rocket.Chat/pull/14089))
+
 - Wait port release to finish tests ([#14066](https://github.com/RocketChat/Rocket.Chat/pull/14066))
+
 - Fix threads rendering performance ([#14059](https://github.com/RocketChat/Rocket.Chat/pull/14059))
+
 - Unstuck observers every minute ([#14076](https://github.com/RocketChat/Rocket.Chat/pull/14076))
+
 - Fix messages losing thread titles on editing or reaction and improve message actions ([#14051](https://github.com/RocketChat/Rocket.Chat/pull/14051))
+
 - Improve message validation ([#14266](https://github.com/RocketChat/Rocket.Chat/pull/14266))
+
 - Added federation ping, loopback and dashboard ([#14007](https://github.com/RocketChat/Rocket.Chat/pull/14007))
+
 - Regression: Exception on notification when adding someone in room via mention ([#14251](https://github.com/RocketChat/Rocket.Chat/pull/14251))
+
 - Regression: fix grouping for reactive message ([#14246](https://github.com/RocketChat/Rocket.Chat/pull/14246))
+
 - Regression: Cursor position set to beginning when editing a message ([#14245](https://github.com/RocketChat/Rocket.Chat/pull/14245))
+
 - Regression: grouping messages on threads ([#14238](https://github.com/RocketChat/Rocket.Chat/pull/14238))
+
 - Regression: Remove border from unstyled message body ([#14235](https://github.com/RocketChat/Rocket.Chat/pull/14235))
+
 - Move LDAP Escape to login handler ([#14234](https://github.com/RocketChat/Rocket.Chat/pull/14234))
+
 - [Regression] Personal Access Token list fixed ([#14216](https://github.com/RocketChat/Rocket.Chat/pull/14216) by [@knrt10](https://github.com/knrt10))
+
 - ESLint: Add more import rules ([#14226](https://github.com/RocketChat/Rocket.Chat/pull/14226))
+
 - Regression: fix drop file ([#14225](https://github.com/RocketChat/Rocket.Chat/pull/14225))
+
 - Broken styles in Administration's contextual bar ([#14222](https://github.com/RocketChat/Rocket.Chat/pull/14222))
+
 - Regression: Broken UI for messages ([#14223](https://github.com/RocketChat/Rocket.Chat/pull/14223))
+
 - Exit process on unhandled rejection ([#14220](https://github.com/RocketChat/Rocket.Chat/pull/14220))
+
 - Unify mime-type package configuration ([#14217](https://github.com/RocketChat/Rocket.Chat/pull/14217))
+
 - Regression: Prevent startup errors for mentions parsing ([#14219](https://github.com/RocketChat/Rocket.Chat/pull/14219))
+
 - Regression: System messages styling ([#14189](https://github.com/RocketChat/Rocket.Chat/pull/14189))
+
 - Prevent click on reply thread to trigger flex tab closing ([#14215](https://github.com/RocketChat/Rocket.Chat/pull/14215))
+
 - created function to allow change default values, fix loading search users ([#14177](https://github.com/RocketChat/Rocket.Chat/pull/14177))
+
 - Use main message as thread tab title ([#14213](https://github.com/RocketChat/Rocket.Chat/pull/14213))
+
 - Use own logic to get thread infos via REST ([#14210](https://github.com/RocketChat/Rocket.Chat/pull/14210))
+
 - Regression: wrong expression at messageBox.actions.remove() ([#14192](https://github.com/RocketChat/Rocket.Chat/pull/14192))
+
 - Increment user counter on DMs ([#14185](https://github.com/RocketChat/Rocket.Chat/pull/14185))
+
 - [REGRESSION] Fix variable name references in message template ([#14184](https://github.com/RocketChat/Rocket.Chat/pull/14184))
+
 - Regression: Active room was not being marked ([#14276](https://github.com/RocketChat/Rocket.Chat/pull/14276))
+
 - Rename Cloud to Connectivity Services & split Apps in Apps and Marketplace ([#14211](https://github.com/RocketChat/Rocket.Chat/pull/14211))
+
 - LingoHub based on develop ([#14178](https://github.com/RocketChat/Rocket.Chat/pull/14178))
+
 - Regression: Discussions were not showing on Tab Bar ([#14050](https://github.com/RocketChat/Rocket.Chat/pull/14050) by [@knrt10](https://github.com/knrt10))
+
 - Force unstyling of blockquote under .message-body--unstyled ([#14274](https://github.com/RocketChat/Rocket.Chat/pull/14274))
+
 - Regression: Admin embedded layout ([#14229](https://github.com/RocketChat/Rocket.Chat/pull/14229))
+
 - New threads layout ([#14269](https://github.com/RocketChat/Rocket.Chat/pull/14269))
+
 - Improve: Marketplace auth inside Rocket.Chat instead of inside the iframe.   ([#14258](https://github.com/RocketChat/Rocket.Chat/pull/14258))
+
 - [New] Reply privately to group messages ([#14150](https://github.com/RocketChat/Rocket.Chat/pull/14150) by [@bhardwajaditya](https://github.com/bhardwajaditya))
 
 </details>
@@ -2658,29 +3923,46 @@
 
 ### 🚀 Improvements
 
+
 - Open rooms quicker ([#13417](https://github.com/RocketChat/Rocket.Chat/pull/13417))
+
 - Allow configure Prometheus port per process via Environment Variable ([#13436](https://github.com/RocketChat/Rocket.Chat/pull/13436))
+
 - Add API option "permissionsRequired" ([#13430](https://github.com/RocketChat/Rocket.Chat/pull/13430))
 
 ### 🐛 Bug fixes
 
+
 - Invalid condition on getting next livechat agent over REST API endpoint ([#13360](https://github.com/RocketChat/Rocket.Chat/pull/13360))
+
 - "Test Desktop Notifications" not triggering a notification ([#13457](https://github.com/RocketChat/Rocket.Chat/pull/13457))
+
 - Translated and incorrect i18n variables ([#13463](https://github.com/RocketChat/Rocket.Chat/pull/13463) by [@leonboot](https://github.com/leonboot))
+
 - Properly escape custom emoji names for pattern matching ([#13408](https://github.com/RocketChat/Rocket.Chat/pull/13408))
+
 - Not translated emails ([#13452](https://github.com/RocketChat/Rocket.Chat/pull/13452))
+
 - XML-decryption module not found ([#13437](https://github.com/RocketChat/Rocket.Chat/pull/13437) by [@Hudell](https://github.com/Hudell))
+
 - Update Russian localization ([#13244](https://github.com/RocketChat/Rocket.Chat/pull/13244) by [@BehindLoader](https://github.com/BehindLoader))
+
 - Several Problems on HipChat Importer ([#13336](https://github.com/RocketChat/Rocket.Chat/pull/13336) by [@Hudell](https://github.com/Hudell))
+
 - Invalid push gateway configuration, requires the uniqueId ([#13423](https://github.com/RocketChat/Rocket.Chat/pull/13423))
+
 - Notify private settings changes even on public settings changed ([#13369](https://github.com/RocketChat/Rocket.Chat/pull/13369))
+
 - Misaligned upload progress bar "cancel" button ([#13407](https://github.com/RocketChat/Rocket.Chat/pull/13407))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.74.3 ([#13474](https://github.com/RocketChat/Rocket.Chat/pull/13474) by [@BehindLoader](https://github.com/BehindLoader) & [@Hudell](https://github.com/Hudell) & [@leonboot](https://github.com/leonboot))
+
 - Room loading improvements ([#13471](https://github.com/RocketChat/Rocket.Chat/pull/13471))
+
 - Regression: Remove console.log on email translations ([#13456](https://github.com/RocketChat/Rocket.Chat/pull/13456))
 
 </details>
@@ -2710,12 +3992,16 @@
 
 ### 🚀 Improvements
 
+
 - Send `uniqueID` to all clients so Jitsi rooms can be created correctly ([#13342](https://github.com/RocketChat/Rocket.Chat/pull/13342))
 
 ### 🐛 Bug fixes
 
+
 - Rate Limiter was limiting communication between instances ([#13326](https://github.com/RocketChat/Rocket.Chat/pull/13326))
+
 - Setup wizard calling 'saveSetting' for each field/setting ([#13349](https://github.com/RocketChat/Rocket.Chat/pull/13349))
+
 - Pass token for cloud register ([#13350](https://github.com/RocketChat/Rocket.Chat/pull/13350))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -2735,24 +4021,36 @@
 
 ### 🎉 New features
 
+
 - Limit all DDP/Websocket requests (configurable via admin panel) ([#13311](https://github.com/RocketChat/Rocket.Chat/pull/13311))
+
 - REST endpoint to forward livechat rooms ([#13308](https://github.com/RocketChat/Rocket.Chat/pull/13308))
+
 - Collect data for Monthly/Daily Active Users for a future dashboard ([#11525](https://github.com/RocketChat/Rocket.Chat/pull/11525))
+
 - Add parseUrls field to the apps message converter ([#13248](https://github.com/RocketChat/Rocket.Chat/pull/13248))
 
 ### 🐛 Bug fixes
 
+
 - Mobile view and re-enable E2E tests ([#13322](https://github.com/RocketChat/Rocket.Chat/pull/13322))
+
 - Hipchat Enterprise Importer not generating subscriptions ([#13293](https://github.com/RocketChat/Rocket.Chat/pull/13293) by [@Hudell](https://github.com/Hudell))
+
 - Message updating by Apps ([#13294](https://github.com/RocketChat/Rocket.Chat/pull/13294))
+
 - REST endpoint for creating custom emojis ([#13306](https://github.com/RocketChat/Rocket.Chat/pull/13306))
+
 - Preview of image uploads were not working when apps framework is enable ([#13303](https://github.com/RocketChat/Rocket.Chat/pull/13303))
+
 - HipChat Enterprise importer fails when importing a large amount of messages (millions) ([#13221](https://github.com/RocketChat/Rocket.Chat/pull/13221) by [@Hudell](https://github.com/Hudell))
+
 - Fix bug when user try recreate channel or group with same name and remove room from cache when user leaves room ([#12341](https://github.com/RocketChat/Rocket.Chat/pull/12341))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Fix: Missing export in cloud package ([#13282](https://github.com/RocketChat/Rocket.Chat/pull/13282))
 
 </details>
@@ -2781,91 +4079,167 @@
 
 ### 🎉 New features
 
+
 - SAML: Adds possibility to decrypt encrypted assertions ([#12153](https://github.com/RocketChat/Rocket.Chat/pull/12153) by [@gerbsen](https://github.com/gerbsen))
+
 - Add rate limiter to REST endpoints ([#11251](https://github.com/RocketChat/Rocket.Chat/pull/11251))
+
 - Added an option to disable email when activate and deactivate users ([#13183](https://github.com/RocketChat/Rocket.Chat/pull/13183))
+
 - Add create, update and delete endpoint for custom emojis ([#13160](https://github.com/RocketChat/Rocket.Chat/pull/13160))
+
 - Added endpoint to update timeout of the jitsi video conference ([#13167](https://github.com/RocketChat/Rocket.Chat/pull/13167))
+
 - Display total number of files and total upload size in admin ([#13184](https://github.com/RocketChat/Rocket.Chat/pull/13184))
+
 - Livechat GDPR compliance ([#12982](https://github.com/RocketChat/Rocket.Chat/pull/12982))
+
 - Added stream to notify when agent status change ([#13076](https://github.com/RocketChat/Rocket.Chat/pull/13076))
+
 - Add new Livechat REST endpoint to update the visitor's status ([#13108](https://github.com/RocketChat/Rocket.Chat/pull/13108))
+
 - Add Allow Methods directive to CORS ([#13073](https://github.com/RocketChat/Rocket.Chat/pull/13073))
 
 ### 🚀 Improvements
 
+
 - Dutch translations ([#12294](https://github.com/RocketChat/Rocket.Chat/pull/12294) by [@Jeroeny](https://github.com/Jeroeny))
+
 - Persian translations ([#13114](https://github.com/RocketChat/Rocket.Chat/pull/13114) by [@behnejad](https://github.com/behnejad))
+
 - Change the way the app detail screen shows support link when it's an email ([#13129](https://github.com/RocketChat/Rocket.Chat/pull/13129))
+
 - Process alerts from update checking ([#13194](https://github.com/RocketChat/Rocket.Chat/pull/13194))
+
 - Add "Apps Engine Version" to Administration > Info ([#13169](https://github.com/RocketChat/Rocket.Chat/pull/13169))
+
 - New Livechat statistics added to statistics collector ([#13168](https://github.com/RocketChat/Rocket.Chat/pull/13168))
+
 - Return room type field on Livechat findRoom method ([#13078](https://github.com/RocketChat/Rocket.Chat/pull/13078))
+
 - Return visitorEmails field on Livechat findGuest method ([#13097](https://github.com/RocketChat/Rocket.Chat/pull/13097))
+
 - Adds the "showConnecting" property to Livechat Config payload ([#13158](https://github.com/RocketChat/Rocket.Chat/pull/13158))
+
 - Adds history log for all Importers and improves HipChat import performance ([#13083](https://github.com/RocketChat/Rocket.Chat/pull/13083) by [@Hudell](https://github.com/Hudell))
+
 - Inject metrics on callbacks ([#13266](https://github.com/RocketChat/Rocket.Chat/pull/13266))
 
 ### 🐛 Bug fixes
 
+
 - Few polish translating ([#13112](https://github.com/RocketChat/Rocket.Chat/pull/13112) by [@theundefined](https://github.com/theundefined))
+
 - Few polish translating ([#13112](https://github.com/RocketChat/Rocket.Chat/pull/13112) by [@theundefined](https://github.com/theundefined))
+
 - Update Message: Does not show edited when message was not edited. ([#13053](https://github.com/RocketChat/Rocket.Chat/pull/13053) by [@Kailash0311](https://github.com/Kailash0311))
+
 - Notifications for mentions not working on large rooms and don't emit desktop notifications for offline users ([#13067](https://github.com/RocketChat/Rocket.Chat/pull/13067))
+
 - Emoticons not displayed in room topic ([#12858](https://github.com/RocketChat/Rocket.Chat/pull/12858) by [@alexbartsch](https://github.com/alexbartsch))
+
 - REST API endpoint `users.getPersonalAccessTokens` error when user has no access tokens ([#13150](https://github.com/RocketChat/Rocket.Chat/pull/13150))
+
 - Remove unused code for Cordova ([#13188](https://github.com/RocketChat/Rocket.Chat/pull/13188))
+
 - Avatars with transparency were being converted to black ([#13181](https://github.com/RocketChat/Rocket.Chat/pull/13181))
+
 - REST api client base url on subdir ([#13180](https://github.com/RocketChat/Rocket.Chat/pull/13180))
+
 - Change webdav creation, due to changes in the npm lib after last update ([#13170](https://github.com/RocketChat/Rocket.Chat/pull/13170))
+
 - Invite command was not accpeting @ in username ([#12927](https://github.com/RocketChat/Rocket.Chat/pull/12927) by [@piotrkochan](https://github.com/piotrkochan))
+
 - Remove ES6 code from Livechat widget script ([#13105](https://github.com/RocketChat/Rocket.Chat/pull/13105))
+
 - User status on header and user info are not translated ([#13096](https://github.com/RocketChat/Rocket.Chat/pull/13096))
+
 - #11692 - Suppress error when drop collection in migration to suit to … ([#13091](https://github.com/RocketChat/Rocket.Chat/pull/13091) by [@Xuhao](https://github.com/Xuhao))
+
 - Change input type of e2e to password ([#13077](https://github.com/RocketChat/Rocket.Chat/pull/13077) by [@supra08](https://github.com/supra08))
+
 - LDAP login of new users overwriting `fname` from all subscriptions ([#13203](https://github.com/RocketChat/Rocket.Chat/pull/13203))
+
 - Snap upgrade add post-refresh hook ([#13153](https://github.com/RocketChat/Rocket.Chat/pull/13153))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.74.0 ([#13270](https://github.com/RocketChat/Rocket.Chat/pull/13270) by [@Xuhao](https://github.com/Xuhao) & [@supra08](https://github.com/supra08))
+
 - Regression: Fix message pinning ([#13213](https://github.com/RocketChat/Rocket.Chat/pull/13213) by [@TkTech](https://github.com/TkTech))
+
 - LingoHub based on develop ([#13201](https://github.com/RocketChat/Rocket.Chat/pull/13201))
+
 - Language: Edit typo "Обновлить" ([#13177](https://github.com/RocketChat/Rocket.Chat/pull/13177) by [@zpavlig](https://github.com/zpavlig))
+
 - Regression: Fix export AudioRecorder ([#13192](https://github.com/RocketChat/Rocket.Chat/pull/13192))
+
 -  Remove dependency of RocketChat namespace and push-notifications ([#13137](https://github.com/RocketChat/Rocket.Chat/pull/13137))
+
 - Remove dependency of RocketChat namespace and custom-sounds ([#13136](https://github.com/RocketChat/Rocket.Chat/pull/13136))
+
 - Remove dependency of RocketChat namespace and logger ([#13135](https://github.com/RocketChat/Rocket.Chat/pull/13135))
+
 - Remove dependency between RocketChat namespace and migrations ([#13133](https://github.com/RocketChat/Rocket.Chat/pull/13133))
+
 - Convert rocketchat:ui to main module structure ([#13132](https://github.com/RocketChat/Rocket.Chat/pull/13132))
+
 - Remove dependency of RocketChat namespace inside rocketchat:ui ([#13131](https://github.com/RocketChat/Rocket.Chat/pull/13131))
+
 - Move some ui function to ui-utils ([#13123](https://github.com/RocketChat/Rocket.Chat/pull/13123))
+
 - Regression: fix upload permissions ([#13157](https://github.com/RocketChat/Rocket.Chat/pull/13157))
+
 - Move some function to utils ([#13122](https://github.com/RocketChat/Rocket.Chat/pull/13122))
+
 - Remove directly dependency between rocketchat:lib and emoji ([#13118](https://github.com/RocketChat/Rocket.Chat/pull/13118))
+
 - Convert rocketchat-webrtc to main module structure ([#13117](https://github.com/RocketChat/Rocket.Chat/pull/13117))
+
 - Remove directly dependency between lib and e2e ([#13115](https://github.com/RocketChat/Rocket.Chat/pull/13115))
+
 - Convert rocketchat-ui-master to main module structure ([#13107](https://github.com/RocketChat/Rocket.Chat/pull/13107))
+
 - Regression: fix rooms model's collection name ([#13146](https://github.com/RocketChat/Rocket.Chat/pull/13146))
+
 - Convert rocketchat-ui-sidenav to main module structure ([#13098](https://github.com/RocketChat/Rocket.Chat/pull/13098))
+
 - Convert rocketchat-file-upload to main module structure ([#13094](https://github.com/RocketChat/Rocket.Chat/pull/13094))
+
 - Remove dependency between lib and authz ([#13066](https://github.com/RocketChat/Rocket.Chat/pull/13066))
+
 - Globals/main module custom oauth ([#13037](https://github.com/RocketChat/Rocket.Chat/pull/13037))
+
 - Move UI Collections to rocketchat:models ([#13064](https://github.com/RocketChat/Rocket.Chat/pull/13064))
+
 - Rocketchat mailer ([#13036](https://github.com/RocketChat/Rocket.Chat/pull/13036))
+
 - Move rocketchat promises ([#13039](https://github.com/RocketChat/Rocket.Chat/pull/13039))
+
 - Globals/move rocketchat notifications ([#13035](https://github.com/RocketChat/Rocket.Chat/pull/13035))
+
 - Test only MongoDB with oplog versions 3.2 and 4.0 for PRs ([#13119](https://github.com/RocketChat/Rocket.Chat/pull/13119))
+
 - Move/create rocketchat callbacks ([#13034](https://github.com/RocketChat/Rocket.Chat/pull/13034))
+
 - Move/create rocketchat metrics ([#13032](https://github.com/RocketChat/Rocket.Chat/pull/13032))
+
 - Move rocketchat models ([#13027](https://github.com/RocketChat/Rocket.Chat/pull/13027))
+
 - Move rocketchat settings to specific package ([#13026](https://github.com/RocketChat/Rocket.Chat/pull/13026))
+
 - Remove incorrect pt-BR translation ([#13074](https://github.com/RocketChat/Rocket.Chat/pull/13074))
+
 - Merge master into develop & Set version to 0.74.0-develop ([#13050](https://github.com/RocketChat/Rocket.Chat/pull/13050) by [@Hudell](https://github.com/Hudell) & [@ohmonster](https://github.com/ohmonster) & [@piotrkochan](https://github.com/piotrkochan))
+
 - Regression: Fix audio message upload ([#13224](https://github.com/RocketChat/Rocket.Chat/pull/13224))
+
 - Regression: Fix message pinning ([#13213](https://github.com/RocketChat/Rocket.Chat/pull/13213) by [@TkTech](https://github.com/TkTech))
+
 - Regression: Fix emoji search ([#13207](https://github.com/RocketChat/Rocket.Chat/pull/13207))
+
 - Change apps engine persistence bridge method to updateByAssociations ([#13239](https://github.com/RocketChat/Rocket.Chat/pull/13239))
 
 </details>
@@ -2910,11 +4284,13 @@
 
 ### 🎉 New features
 
+
 - Cloud Integration ([#13013](https://github.com/RocketChat/Rocket.Chat/pull/13013))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.73.2 ([#13086](https://github.com/RocketChat/Rocket.Chat/pull/13086))
 
 </details>
@@ -2935,13 +4311,17 @@
 
 ### 🐛 Bug fixes
 
+
 - Default importer path ([#13045](https://github.com/RocketChat/Rocket.Chat/pull/13045))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.73.1 ([#13052](https://github.com/RocketChat/Rocket.Chat/pull/13052))
+
 - Execute tests with versions 3.2, 3.4, 3.6 and 4.0 of MongoDB ([#13049](https://github.com/RocketChat/Rocket.Chat/pull/13049))
+
 - Regression: Get room's members list not working on MongoDB 3.2 ([#13051](https://github.com/RocketChat/Rocket.Chat/pull/13051))
 
 </details>
@@ -2960,152 +4340,289 @@
 
 ### 🎉 New features
 
+
 - Create new permission.listAll endpoint to be able to use updatedSince parameter ([#12748](https://github.com/RocketChat/Rocket.Chat/pull/12748))
+
 - Mandatory 2fa for role ([#9748](https://github.com/RocketChat/Rocket.Chat/pull/9748) by [@Hudell](https://github.com/Hudell) & [@karlprieb](https://github.com/karlprieb))
+
 - Add query parameter support to emoji-custom endpoint ([#12754](https://github.com/RocketChat/Rocket.Chat/pull/12754))
+
 - Added a link to contributing.md ([#12856](https://github.com/RocketChat/Rocket.Chat/pull/12856) by [@sanketsingh24](https://github.com/sanketsingh24))
+
 - Added chat.getDeletedMessages since specific date ([#13010](https://github.com/RocketChat/Rocket.Chat/pull/13010))
+
 - Download button for each file in fileslist ([#12874](https://github.com/RocketChat/Rocket.Chat/pull/12874) by [@alexbartsch](https://github.com/alexbartsch))
+
 - Syncloud deploy option ([#12867](https://github.com/RocketChat/Rocket.Chat/pull/12867) by [@cyberb](https://github.com/cyberb))
+
 - Config hooks for snap ([#12351](https://github.com/RocketChat/Rocket.Chat/pull/12351))
+
 - Livechat registration form message ([#12597](https://github.com/RocketChat/Rocket.Chat/pull/12597))
+
 - Include message type & id in push notification payload ([#12771](https://github.com/RocketChat/Rocket.Chat/pull/12771) by [@cardoso](https://github.com/cardoso))
 
 ### 🚀 Improvements
 
+
 - Hipchat Enterprise Importer ([#12985](https://github.com/RocketChat/Rocket.Chat/pull/12985) by [@Hudell](https://github.com/Hudell))
+
 - Add missing translation keys. ([#12722](https://github.com/RocketChat/Rocket.Chat/pull/12722) by [@ura14h](https://github.com/ura14h))
+
 - Accept Slash Commands via Action Buttons when `msg_in_chat_window: true` ([#13009](https://github.com/RocketChat/Rocket.Chat/pull/13009))
+
 - Allow transfer Livechats to online agents only ([#13008](https://github.com/RocketChat/Rocket.Chat/pull/13008))
+
 - Adding debugging instructions in README ([#12989](https://github.com/RocketChat/Rocket.Chat/pull/12989) by [@hypery2k](https://github.com/hypery2k))
+
 - Do not emit settings if there are no changes ([#12904](https://github.com/RocketChat/Rocket.Chat/pull/12904))
+
 - Returning an open room object in the Livechat config endpoint ([#12865](https://github.com/RocketChat/Rocket.Chat/pull/12865))
+
 - Use MongoBD aggregation to get users from a room ([#12566](https://github.com/RocketChat/Rocket.Chat/pull/12566))
+
 - Username suggestion logic ([#12779](https://github.com/RocketChat/Rocket.Chat/pull/12779))
 
 ### 🐛 Bug fixes
 
+
 - Avoiding links with highlighted words ([#12123](https://github.com/RocketChat/Rocket.Chat/pull/12123) by [@rssilva](https://github.com/rssilva))
+
 - Pin and unpin message were not checking permissions ([#12739](https://github.com/RocketChat/Rocket.Chat/pull/12739))
+
 - Fix users.setPreferences endpoint, set language correctly ([#12734](https://github.com/RocketChat/Rocket.Chat/pull/12734))
+
 - Fix set avatar http call, to avoid SSL errors ([#12790](https://github.com/RocketChat/Rocket.Chat/pull/12790))
+
 - Webdav integration account settings were being shown even when Webdav was disabled ([#12569](https://github.com/RocketChat/Rocket.Chat/pull/12569) by [@karakayasemi](https://github.com/karakayasemi))
+
 - Provide better Dutch translations 🇳🇱 ([#12792](https://github.com/RocketChat/Rocket.Chat/pull/12792) by [@mathysie](https://github.com/mathysie))
+
 - E2E`s password reaveal text is always `>%S` when language is zh ([#12795](https://github.com/RocketChat/Rocket.Chat/pull/12795) by [@lvyue](https://github.com/lvyue))
+
 - Nested Markdown blocks not parsed properly ([#12998](https://github.com/RocketChat/Rocket.Chat/pull/12998) by [@Hudell](https://github.com/Hudell))
+
 - Change JSON to EJSON.parse query to support type Date ([#12706](https://github.com/RocketChat/Rocket.Chat/pull/12706))
+
 - Inherit font family in message user card ([#13004](https://github.com/RocketChat/Rocket.Chat/pull/13004))
+
 - Some deprecation issues for media recording ([#12948](https://github.com/RocketChat/Rocket.Chat/pull/12948))
+
 - Stop click event propagation on mention link or user card ([#12983](https://github.com/RocketChat/Rocket.Chat/pull/12983))
+
 - Change field checks in RocketChat.saveStreamingOptions ([#12973](https://github.com/RocketChat/Rocket.Chat/pull/12973))
+
 - Remove sharp's deprecation warnings on image upload ([#12980](https://github.com/RocketChat/Rocket.Chat/pull/12980))
+
 - Use web.browser.legacy bundle for Livechat script ([#12975](https://github.com/RocketChat/Rocket.Chat/pull/12975))
+
 - Revert Jitsi external API to an asset ([#12954](https://github.com/RocketChat/Rocket.Chat/pull/12954))
+
 - Exception in getSingleMessage ([#12970](https://github.com/RocketChat/Rocket.Chat/pull/12970) by [@tsukiRep](https://github.com/tsukiRep))
+
 - multiple rooms-changed ([#12940](https://github.com/RocketChat/Rocket.Chat/pull/12940))
+
 - Readable validation on the apps engine environment bridge ([#12994](https://github.com/RocketChat/Rocket.Chat/pull/12994))
+
 - Check for object falsehood before referencing properties in saveRoomSettings ([#12972](https://github.com/RocketChat/Rocket.Chat/pull/12972))
+
 - Spotlight being called while in background ([#12957](https://github.com/RocketChat/Rocket.Chat/pull/12957))
+
 - Padding for message box in embedded layout ([#12556](https://github.com/RocketChat/Rocket.Chat/pull/12556))
+
 - Crowd sync was being stopped when a user was not found ([#12930](https://github.com/RocketChat/Rocket.Chat/pull/12930) by [@piotrkochan](https://github.com/piotrkochan))
+
 - Some icons were missing ([#12913](https://github.com/RocketChat/Rocket.Chat/pull/12913))
+
 - User data download fails when a room has been deleted. ([#12829](https://github.com/RocketChat/Rocket.Chat/pull/12829) by [@Hudell](https://github.com/Hudell))
+
 - CAS Login not working with renamed users ([#12860](https://github.com/RocketChat/Rocket.Chat/pull/12860) by [@Hudell](https://github.com/Hudell))
+
 - Stream of my_message wasn't sending the room information ([#12914](https://github.com/RocketChat/Rocket.Chat/pull/12914))
+
 - cannot reset password ([#12903](https://github.com/RocketChat/Rocket.Chat/pull/12903) by [@Hudell](https://github.com/Hudell))
+
 - Version check update notification ([#12905](https://github.com/RocketChat/Rocket.Chat/pull/12905))
+
 - Data Import not working ([#12866](https://github.com/RocketChat/Rocket.Chat/pull/12866) by [@Hudell](https://github.com/Hudell))
+
 - Incorrect parameter name in Livechat stream ([#12851](https://github.com/RocketChat/Rocket.Chat/pull/12851))
+
 - Autotranslate icon on message action menu ([#12585](https://github.com/RocketChat/Rocket.Chat/pull/12585))
+
 - Google Cloud Storage storage provider ([#12843](https://github.com/RocketChat/Rocket.Chat/pull/12843))
+
 - Download files without extension wasn't possible ([#13033](https://github.com/RocketChat/Rocket.Chat/pull/13033))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - LingoHub based on develop ([#13014](https://github.com/RocketChat/Rocket.Chat/pull/13014))
+
 - Move isFirefox and isChrome functions to rocketchat-utils ([#13011](https://github.com/RocketChat/Rocket.Chat/pull/13011))
+
 - Move tapi18n t and isRtl functions from ui to utils ([#13005](https://github.com/RocketChat/Rocket.Chat/pull/13005))
+
 - Remove /* globals */ wave 4 ([#12999](https://github.com/RocketChat/Rocket.Chat/pull/12999))
+
 - Remove /* globals */ wave 3 ([#12997](https://github.com/RocketChat/Rocket.Chat/pull/12997))
+
 - Convert rocketchat-logger to main module structure and remove Logger from eslintrc ([#12995](https://github.com/RocketChat/Rocket.Chat/pull/12995))
+
 - Remove /* globals */ wave 2 ([#12988](https://github.com/RocketChat/Rocket.Chat/pull/12988))
+
 - Remove /* globals */ from files wave-1 ([#12984](https://github.com/RocketChat/Rocket.Chat/pull/12984))
+
 - Move globals of test to a specific eslintrc file ([#12959](https://github.com/RocketChat/Rocket.Chat/pull/12959))
+
 - Remove global ServiceConfiguration ([#12960](https://github.com/RocketChat/Rocket.Chat/pull/12960))
+
 - Remove global toastr ([#12961](https://github.com/RocketChat/Rocket.Chat/pull/12961))
+
 - Convert rocketchat-livechat to main module structure ([#12942](https://github.com/RocketChat/Rocket.Chat/pull/12942))
+
 - changed maxRoomsOpen ([#12949](https://github.com/RocketChat/Rocket.Chat/pull/12949))
+
 - Revert imports of css, reAdd them to the addFiles function ([#12934](https://github.com/RocketChat/Rocket.Chat/pull/12934))
+
 - Convert rocketchat-theme to main module structure ([#12896](https://github.com/RocketChat/Rocket.Chat/pull/12896))
+
 - Convert rocketchat-katex to main module structure ([#12895](https://github.com/RocketChat/Rocket.Chat/pull/12895))
+
 - Convert rocketchat-webdav to main module structure ([#12886](https://github.com/RocketChat/Rocket.Chat/pull/12886))
+
 - Convert rocketchat-ui-message to main module structure ([#12871](https://github.com/RocketChat/Rocket.Chat/pull/12871))
+
 - Convert rocketchat-videobridge to main module structure ([#12881](https://github.com/RocketChat/Rocket.Chat/pull/12881))
+
 -  Convert rocketchat-reactions to main module structure ([#12888](https://github.com/RocketChat/Rocket.Chat/pull/12888))
+
 - Convert rocketchat-wordpress to main module structure ([#12887](https://github.com/RocketChat/Rocket.Chat/pull/12887))
+
 - Fix: snap push from ci ([#12883](https://github.com/RocketChat/Rocket.Chat/pull/12883))
+
 - Convert rocketchat-version-check to main module structure ([#12879](https://github.com/RocketChat/Rocket.Chat/pull/12879))
+
 - Convert rocketchat-user-data-dowload to main module structure ([#12877](https://github.com/RocketChat/Rocket.Chat/pull/12877))
+
 - Convert rocketchat-ui-vrecord to main module structure ([#12875](https://github.com/RocketChat/Rocket.Chat/pull/12875))
+
 - Convert rocketchat-ui-login to main module structure ([#12861](https://github.com/RocketChat/Rocket.Chat/pull/12861))
+
 -  Convert rocketchat-ui-flextab to main module structure ([#12859](https://github.com/RocketChat/Rocket.Chat/pull/12859))
+
 - German translation typo fix for Reacted_with ([#12761](https://github.com/RocketChat/Rocket.Chat/pull/12761) by [@localguru](https://github.com/localguru))
+
 -  Convert rocketchat-ui-account to main module structure ([#12842](https://github.com/RocketChat/Rocket.Chat/pull/12842))
+
 - Convert rocketchat-ui-clean-history to main module structure ([#12846](https://github.com/RocketChat/Rocket.Chat/pull/12846))
+
 - Convert rocketchat-ui-admin to main module structure ([#12844](https://github.com/RocketChat/Rocket.Chat/pull/12844))
+
 - Convert rocketchat-tokenpass to main module structure ([#12838](https://github.com/RocketChat/Rocket.Chat/pull/12838))
+
 - Remove rocketchat-tutum package ([#12840](https://github.com/RocketChat/Rocket.Chat/pull/12840))
+
 - Convert rocketchat-tooltip to main module structure ([#12839](https://github.com/RocketChat/Rocket.Chat/pull/12839))
+
 - Convert rocketchat-token-login to main module structure ([#12837](https://github.com/RocketChat/Rocket.Chat/pull/12837))
+
 - Convert rocketchat-statistics to main module structure ([#12833](https://github.com/RocketChat/Rocket.Chat/pull/12833))
+
 - Convert rocketchat-spotify to main module structure ([#12832](https://github.com/RocketChat/Rocket.Chat/pull/12832))
+
 - Convert rocketchat-sms to main module structure ([#12831](https://github.com/RocketChat/Rocket.Chat/pull/12831))
+
 - Convert rocketchat-search to main module structure ([#12801](https://github.com/RocketChat/Rocket.Chat/pull/12801))
+
 - Convert rocketchat-message-pin to main module structure ([#12767](https://github.com/RocketChat/Rocket.Chat/pull/12767))
+
 - Convert rocketchat-message-star to main module structure ([#12770](https://github.com/RocketChat/Rocket.Chat/pull/12770))
+
 - Convert rocketchat-slashcommands-msg to main module structure ([#12823](https://github.com/RocketChat/Rocket.Chat/pull/12823))
+
 - Convert rocketchat-smarsh-connector to main module structure ([#12830](https://github.com/RocketChat/Rocket.Chat/pull/12830))
+
 - Convert rocketchat-slider to main module structure ([#12828](https://github.com/RocketChat/Rocket.Chat/pull/12828))
+
 - Convert rocketchat-slashcommands-unarchiveroom to main module structure ([#12827](https://github.com/RocketChat/Rocket.Chat/pull/12827))
+
 - Dependencies update ([#12624](https://github.com/RocketChat/Rocket.Chat/pull/12624))
+
 - Convert rocketchat-slashcommands-topic to main module structure ([#12826](https://github.com/RocketChat/Rocket.Chat/pull/12826))
+
 - Convert rocketchat-slashcommands-open to main module structure ([#12825](https://github.com/RocketChat/Rocket.Chat/pull/12825))
+
 - Convert rocketchat-slashcommands-mute to main module structure ([#12824](https://github.com/RocketChat/Rocket.Chat/pull/12824))
+
 - Convert rocketchat-slashcommands-me to main module structure ([#12822](https://github.com/RocketChat/Rocket.Chat/pull/12822))
+
 - Convert rocketchat-slashcommands-leave to main module structure ([#12821](https://github.com/RocketChat/Rocket.Chat/pull/12821))
+
 - Convert rocketchat-slashcommands-kick to main module structure ([#12817](https://github.com/RocketChat/Rocket.Chat/pull/12817))
+
 - Convert rocketchat-slashcommands-join to main module structure ([#12816](https://github.com/RocketChat/Rocket.Chat/pull/12816))
+
 - Convert rocketchat-slashcommands-inviteall to main module structure ([#12815](https://github.com/RocketChat/Rocket.Chat/pull/12815))
+
 - Convert rocketchat-slashcommands-invite to main module structure ([#12814](https://github.com/RocketChat/Rocket.Chat/pull/12814))
+
 - Convert rocketchat-slashcommands-hide to main module structure ([#12813](https://github.com/RocketChat/Rocket.Chat/pull/12813))
+
 - Convert rocketchat-slashcommands-help to main module structure ([#12812](https://github.com/RocketChat/Rocket.Chat/pull/12812))
+
 - Convert rocketchat-slashcommands-create to main module structure ([#12811](https://github.com/RocketChat/Rocket.Chat/pull/12811))
+
 - Convert rocketchat-slashcomands-archiveroom to main module structure ([#12810](https://github.com/RocketChat/Rocket.Chat/pull/12810))
+
 - Convert rocketchat-slashcommands-asciiarts to main module structure ([#12808](https://github.com/RocketChat/Rocket.Chat/pull/12808))
+
 - Convert rocketchat-slackbridge to main module structure ([#12807](https://github.com/RocketChat/Rocket.Chat/pull/12807))
+
 - Convert rocketchat-setup-wizard to main module structure ([#12806](https://github.com/RocketChat/Rocket.Chat/pull/12806))
+
 - Convert rocketchat-sandstorm to main module structure ([#12799](https://github.com/RocketChat/Rocket.Chat/pull/12799))
+
 - Convert rocketchat-oauth2-server-config to main module structure ([#12773](https://github.com/RocketChat/Rocket.Chat/pull/12773))
+
 - Convert rocketchat-message-snippet to main module structure ([#12768](https://github.com/RocketChat/Rocket.Chat/pull/12768))
+
 - Fix CI deploy job ([#12803](https://github.com/RocketChat/Rocket.Chat/pull/12803))
+
 - Convert rocketchat-retention-policy to main module structure ([#12797](https://github.com/RocketChat/Rocket.Chat/pull/12797))
+
 - Convert rocketchat-push-notifications to main module structure ([#12778](https://github.com/RocketChat/Rocket.Chat/pull/12778))
+
 - Convert rocketchat-otr to main module structure ([#12777](https://github.com/RocketChat/Rocket.Chat/pull/12777))
+
 - Convert rocketchat-oembed to main module structure ([#12775](https://github.com/RocketChat/Rocket.Chat/pull/12775))
+
 - Convert rocketchat-migrations to main-module structure ([#12772](https://github.com/RocketChat/Rocket.Chat/pull/12772))
+
 - Convert rocketchat-message-mark-as-unread to main module structure ([#12766](https://github.com/RocketChat/Rocket.Chat/pull/12766))
+
 - Remove conventional changelog cli, we are using our own cli now (Houston) ([#12798](https://github.com/RocketChat/Rocket.Chat/pull/12798))
+
 - Convert rocketchat-message-attachments to main module structure ([#12760](https://github.com/RocketChat/Rocket.Chat/pull/12760))
+
 - Convert rocketchat-message-action to main module structure ([#12759](https://github.com/RocketChat/Rocket.Chat/pull/12759))
+
 -  Convert rocketchat-mentions-flextab to main module structure ([#12757](https://github.com/RocketChat/Rocket.Chat/pull/12757))
+
 - Convert rocketchat-mentions to main module structure ([#12756](https://github.com/RocketChat/Rocket.Chat/pull/12756))
+
 - Convert rocketchat-markdown to main module structure ([#12755](https://github.com/RocketChat/Rocket.Chat/pull/12755))
+
 - Convert rocketchat-mapview to main module structure ([#12701](https://github.com/RocketChat/Rocket.Chat/pull/12701))
+
 - Add check to make sure releases was updated ([#12791](https://github.com/RocketChat/Rocket.Chat/pull/12791))
+
 - Merge master into develop & Set version to 0.73.0-develop ([#12776](https://github.com/RocketChat/Rocket.Chat/pull/12776))
+
 - Change `chat.getDeletedMessages` to get messages after informed date and return only message's _id ([#13021](https://github.com/RocketChat/Rocket.Chat/pull/13021))
+
 - Improve Importer code quality ([#13020](https://github.com/RocketChat/Rocket.Chat/pull/13020) by [@Hudell](https://github.com/Hudell))
+
 - Regression: List of custom emojis wasn't working ([#13031](https://github.com/RocketChat/Rocket.Chat/pull/13031))
 
 </details>
@@ -3148,6 +4665,7 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.72.3 ([#12932](https://github.com/RocketChat/Rocket.Chat/pull/12932) by [@Hudell](https://github.com/Hudell) & [@piotrkochan](https://github.com/piotrkochan))
 
 </details>
@@ -3168,12 +4686,15 @@
 
 ### 🐛 Bug fixes
 
+
 - line-height for unread bar buttons (jump to first and mark as read) ([#12900](https://github.com/RocketChat/Rocket.Chat/pull/12900))
+
 - PDF view loading indicator ([#12882](https://github.com/RocketChat/Rocket.Chat/pull/12882))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.72.2 ([#12901](https://github.com/RocketChat/Rocket.Chat/pull/12901))
 
 </details>
@@ -3188,16 +4709,23 @@
 
 ### 🐛 Bug fixes
 
+
 - Change spread operator to Array.from for Edge browser ([#12818](https://github.com/RocketChat/Rocket.Chat/pull/12818) by [@ohmonster](https://github.com/ohmonster))
+
 - API users.info returns caller rooms and not requested user ones ([#12727](https://github.com/RocketChat/Rocket.Chat/pull/12727) by [@piotrkochan](https://github.com/piotrkochan))
+
 - Missing HipChat Enterprise Importer ([#12847](https://github.com/RocketChat/Rocket.Chat/pull/12847) by [@Hudell](https://github.com/Hudell))
+
 - Emoji as avatar ([#12805](https://github.com/RocketChat/Rocket.Chat/pull/12805))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.72.1 ([#12850](https://github.com/RocketChat/Rocket.Chat/pull/12850) by [@Hudell](https://github.com/Hudell) & [@ohmonster](https://github.com/ohmonster) & [@piotrkochan](https://github.com/piotrkochan))
+
 - Bump Apps-Engine version ([#12848](https://github.com/RocketChat/Rocket.Chat/pull/12848))
+
 - Change file order in rocketchat-cors ([#12804](https://github.com/RocketChat/Rocket.Chat/pull/12804))
 
 </details>
@@ -3221,143 +4749,268 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Support for Cordova (Rocket.Chat Legacy app) has reached End-of-life, support has been discontinued
+
 - Update to Meteor to 1.8 ([#12468](https://github.com/RocketChat/Rocket.Chat/pull/12468))
 
 ### 🎉 New features
 
+
 - Add permission to enable personal access token to specific roles ([#12309](https://github.com/RocketChat/Rocket.Chat/pull/12309))
+
 - Option to reset e2e key ([#12483](https://github.com/RocketChat/Rocket.Chat/pull/12483) by [@Hudell](https://github.com/Hudell))
+
 - /api/v1/spotlight: return joinCodeRequired field for rooms ([#12651](https://github.com/RocketChat/Rocket.Chat/pull/12651) by [@cardoso](https://github.com/cardoso))
+
 - New API Endpoints for the new version of JS SDK ([#12623](https://github.com/RocketChat/Rocket.Chat/pull/12623))
+
 - Setting to configure robots.txt content ([#12547](https://github.com/RocketChat/Rocket.Chat/pull/12547) by [@Hudell](https://github.com/Hudell))
+
 - Make Livechat's widget draggable ([#12378](https://github.com/RocketChat/Rocket.Chat/pull/12378))
 
 ### 🚀 Improvements
 
+
 - Improve unreads and unreadsFrom response, prevent it to be equal null ([#12563](https://github.com/RocketChat/Rocket.Chat/pull/12563))
+
 - Add rooms property in user object, if the user has the permission, with rooms roles ([#12105](https://github.com/RocketChat/Rocket.Chat/pull/12105))
+
 - border-radius to use --border-radius ([#12675](https://github.com/RocketChat/Rocket.Chat/pull/12675))
+
 - Update the 'keyboard shortcuts' documentation ([#12564](https://github.com/RocketChat/Rocket.Chat/pull/12564) by [@nicolasbock](https://github.com/nicolasbock))
+
 - Add new acceptable header for Livechat REST requests ([#12561](https://github.com/RocketChat/Rocket.Chat/pull/12561))
+
 - Atlassian Crowd settings and option to sync user data ([#12616](https://github.com/RocketChat/Rocket.Chat/pull/12616))
+
 - CircleCI to use MongoDB 4.0 for testing ([#12618](https://github.com/RocketChat/Rocket.Chat/pull/12618))
+
 - Japanese translations ([#12382](https://github.com/RocketChat/Rocket.Chat/pull/12382) by [@ura14h](https://github.com/ura14h))
+
 - Add CTRL modifier for keyboard shortcut ([#12525](https://github.com/RocketChat/Rocket.Chat/pull/12525) by [@nicolasbock](https://github.com/nicolasbock))
+
 - Ignore non-existent Livechat custom fields on Livechat API ([#12522](https://github.com/RocketChat/Rocket.Chat/pull/12522))
+
 - Emoji search on messageBox behaving like emojiPicker's search (#9607) ([#12452](https://github.com/RocketChat/Rocket.Chat/pull/12452) by [@vinade](https://github.com/vinade))
+
 - German translations ([#12471](https://github.com/RocketChat/Rocket.Chat/pull/12471) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Limit the number of typing users shown (#8722) ([#12400](https://github.com/RocketChat/Rocket.Chat/pull/12400) by [@vinade](https://github.com/vinade))
+
 - Allow apps to update persistence by association ([#12714](https://github.com/RocketChat/Rocket.Chat/pull/12714))
+
 - Add more methods to deal with rooms via Rocket.Chat.Apps ([#12680](https://github.com/RocketChat/Rocket.Chat/pull/12680))
+
 - Better query for finding subscriptions that need a new E2E Key ([#12692](https://github.com/RocketChat/Rocket.Chat/pull/12692) by [@Hudell](https://github.com/Hudell))
 
 ### 🐛 Bug fixes
 
+
 - Fixed Anonymous Registration ([#12633](https://github.com/RocketChat/Rocket.Chat/pull/12633) by [@wreiske](https://github.com/wreiske))
+
 - high cpu usage ~ svg icon ([#12677](https://github.com/RocketChat/Rocket.Chat/pull/12677) by [@ph1p](https://github.com/ph1p))
+
 - Fix favico error ([#12643](https://github.com/RocketChat/Rocket.Chat/pull/12643))
+
 - Condition to not render PDF preview ([#12632](https://github.com/RocketChat/Rocket.Chat/pull/12632))
+
 - Admin styles ([#12614](https://github.com/RocketChat/Rocket.Chat/pull/12614))
+
 - Admin styles ([#12602](https://github.com/RocketChat/Rocket.Chat/pull/12602))
+
 - Change registration message when user need to confirm email ([#9336](https://github.com/RocketChat/Rocket.Chat/pull/9336) by [@karlprieb](https://github.com/karlprieb))
+
 - Import missed file in rocketchat-authorization ([#12570](https://github.com/RocketChat/Rocket.Chat/pull/12570))
+
 - Prevent subscriptions and calls to rooms events that the user is not participating ([#12558](https://github.com/RocketChat/Rocket.Chat/pull/12558))
+
 - Wrong test case for `users.setAvatar` endpoint ([#12539](https://github.com/RocketChat/Rocket.Chat/pull/12539))
+
 - Spotlight method being called multiple times ([#12536](https://github.com/RocketChat/Rocket.Chat/pull/12536))
+
 - German translation for for API_EmbedIgnoredHosts label ([#12518](https://github.com/RocketChat/Rocket.Chat/pull/12518) by [@mbrodala](https://github.com/mbrodala))
+
 - Handle all events for enter key in message box ([#12507](https://github.com/RocketChat/Rocket.Chat/pull/12507))
+
 - Fix wrong parameter in chat.delete endpoint and add some test cases ([#12408](https://github.com/RocketChat/Rocket.Chat/pull/12408))
+
 - Manage own integrations permissions check ([#12397](https://github.com/RocketChat/Rocket.Chat/pull/12397))
+
 - stream room-changed ([#12411](https://github.com/RocketChat/Rocket.Chat/pull/12411))
+
 - Emoji picker is not in viewport on small screens ([#12457](https://github.com/RocketChat/Rocket.Chat/pull/12457) by [@ramrami](https://github.com/ramrami))
+
 - `Disabled` word translation to Spanish ([#12406](https://github.com/RocketChat/Rocket.Chat/pull/12406) by [@Ismaw34](https://github.com/Ismaw34))
+
 - `Disabled` word translation to Chinese ([#12260](https://github.com/RocketChat/Rocket.Chat/pull/12260) by [@AndreamApp](https://github.com/AndreamApp))
+
 - Correct roomName value in Mail Messages (#12363) ([#12453](https://github.com/RocketChat/Rocket.Chat/pull/12453) by [@vinade](https://github.com/vinade))
+
 - Update caret position on insert a new line in message box ([#12713](https://github.com/RocketChat/Rocket.Chat/pull/12713))
+
 - DE translation for idle-time-limit ([#12637](https://github.com/RocketChat/Rocket.Chat/pull/12637) by [@pfuender](https://github.com/pfuender))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - LingoHub based on develop ([#12684](https://github.com/RocketChat/Rocket.Chat/pull/12684))
+
 - Convert rocketchat-mail-messages to main module structure ([#12682](https://github.com/RocketChat/Rocket.Chat/pull/12682))
+
 -  Convert rocketchat-livestream to main module structure ([#12679](https://github.com/RocketChat/Rocket.Chat/pull/12679))
+
 - Added "npm install" to quick start for developers ([#12374](https://github.com/RocketChat/Rocket.Chat/pull/12374) by [@wreiske](https://github.com/wreiske))
+
 - Convert rocketchat-ldap to main module structure ([#12678](https://github.com/RocketChat/Rocket.Chat/pull/12678))
+
 - Convert rocketchat-issuelinks to main module structure ([#12674](https://github.com/RocketChat/Rocket.Chat/pull/12674))
+
 - Convert rocketchat-integrations to main module structure ([#12670](https://github.com/RocketChat/Rocket.Chat/pull/12670))
+
 - Convert rocketchat-irc to main module structure ([#12672](https://github.com/RocketChat/Rocket.Chat/pull/12672))
+
 - Convert rocketchat-internal-hubot to main module structure ([#12671](https://github.com/RocketChat/Rocket.Chat/pull/12671))
+
 - Convert rocketchat-importer-hipchat-enterprise to main module structure ([#12665](https://github.com/RocketChat/Rocket.Chat/pull/12665))
+
 - Convert rocketchat-importer-slack-users to main module structure ([#12669](https://github.com/RocketChat/Rocket.Chat/pull/12669))
+
 -  Convert rocketchat-importer-slack to main module structure ([#12666](https://github.com/RocketChat/Rocket.Chat/pull/12666))
+
 - Convert rocketchat-iframe-login to main module structure ([#12661](https://github.com/RocketChat/Rocket.Chat/pull/12661))
+
 - Convert rocketchat-importer to main module structure ([#12662](https://github.com/RocketChat/Rocket.Chat/pull/12662))
+
 - Convert rocketchat-importer-csv to main module structure ([#12663](https://github.com/RocketChat/Rocket.Chat/pull/12663))
+
 - Convert rocketchat-importer-hipchat to main module structure ([#12664](https://github.com/RocketChat/Rocket.Chat/pull/12664))
+
 - Convert rocketchat-highlight-words to main module structure ([#12659](https://github.com/RocketChat/Rocket.Chat/pull/12659))
+
 - Convert rocketchat-grant to main module structure ([#12657](https://github.com/RocketChat/Rocket.Chat/pull/12657))
+
 - Convert rocketchat-graphql to main module structure ([#12658](https://github.com/RocketChat/Rocket.Chat/pull/12658))
+
 - Convert rocketchat-google-vision to main module structure ([#12649](https://github.com/RocketChat/Rocket.Chat/pull/12649))
+
 - Removed RocketChatFile from globals ([#12650](https://github.com/RocketChat/Rocket.Chat/pull/12650))
+
 - Added imports for global variables in rocketchat-google-natural-language package ([#12647](https://github.com/RocketChat/Rocket.Chat/pull/12647))
+
 - Convert rocketchat-gitlab to main module structure ([#12646](https://github.com/RocketChat/Rocket.Chat/pull/12646))
+
 - Convert rocketchat-file to main module structure ([#12644](https://github.com/RocketChat/Rocket.Chat/pull/12644))
+
 - Convert rocketchat-github-enterprise to main module structure ([#12642](https://github.com/RocketChat/Rocket.Chat/pull/12642))
+
 - Fix: Add email dependency in package.js ([#12645](https://github.com/RocketChat/Rocket.Chat/pull/12645))
+
 - Convert rocketchat-custom-sounds to main module structure ([#12599](https://github.com/RocketChat/Rocket.Chat/pull/12599))
+
 - Fix crowd error with import of SyncedCron ([#12641](https://github.com/RocketChat/Rocket.Chat/pull/12641))
+
 - Convert emoji-emojione to main module structure ([#12605](https://github.com/RocketChat/Rocket.Chat/pull/12605))
+
 - Convert rocketchat-favico to main module structure ([#12607](https://github.com/RocketChat/Rocket.Chat/pull/12607))
+
 -  Convert rocketchat-emoji-custom to main module structure ([#12604](https://github.com/RocketChat/Rocket.Chat/pull/12604))
+
 - Convert rocketchat-error-handler to main module structure ([#12606](https://github.com/RocketChat/Rocket.Chat/pull/12606))
+
 - Convert rocketchat-drupal to main module structure ([#12601](https://github.com/RocketChat/Rocket.Chat/pull/12601))
+
 - Convert rocketchat-crowd to main module structure ([#12596](https://github.com/RocketChat/Rocket.Chat/pull/12596))
+
 - Convert rocketchat-emoji to main module structure ([#12603](https://github.com/RocketChat/Rocket.Chat/pull/12603))
+
 - Fix users.setAvatar endpoint tests and logic ([#12625](https://github.com/RocketChat/Rocket.Chat/pull/12625))
+
 - [DOCS] Remove Cordova links, include F-Droid download button and few other adjustments ([#12583](https://github.com/RocketChat/Rocket.Chat/pull/12583) by [@rafaelks](https://github.com/rafaelks))
+
 - Convert rocketchat-dolphin to main module structure ([#12600](https://github.com/RocketChat/Rocket.Chat/pull/12600))
+
 -  Convert rocketchat-channel-settings to main module structure ([#12594](https://github.com/RocketChat/Rocket.Chat/pull/12594))
+
 - Convert rocketchat-cors to main module structure ([#12595](https://github.com/RocketChat/Rocket.Chat/pull/12595))
+
 - Convert rocketchat-autotranslate to main module structure ([#12530](https://github.com/RocketChat/Rocket.Chat/pull/12530))
+
 - Convert rocketchat-channel-settings-mail-messages to main module structure ([#12537](https://github.com/RocketChat/Rocket.Chat/pull/12537))
+
 - Convert rocketchat-colors to main module structure ([#12538](https://github.com/RocketChat/Rocket.Chat/pull/12538))
+
 - Convert rocketchat-cas to main module structure ([#12532](https://github.com/RocketChat/Rocket.Chat/pull/12532))
+
 - Convert rocketchat-bot-helpers to main module structure ([#12531](https://github.com/RocketChat/Rocket.Chat/pull/12531))
+
 - Convert rocketchat-autolinker to main module structure ([#12529](https://github.com/RocketChat/Rocket.Chat/pull/12529))
+
 - Convert rocketchat-authorization to main module structure ([#12523](https://github.com/RocketChat/Rocket.Chat/pull/12523))
+
 - Fix CSS import order ([#12524](https://github.com/RocketChat/Rocket.Chat/pull/12524))
+
 - Remove template for feature requests as issues ([#12426](https://github.com/RocketChat/Rocket.Chat/pull/12426))
+
 - Fix punctuation, spelling, and grammar ([#12451](https://github.com/RocketChat/Rocket.Chat/pull/12451) by [@imronras](https://github.com/imronras))
+
 - Convert rocketchat-assets to main module structure ([#12521](https://github.com/RocketChat/Rocket.Chat/pull/12521))
+
 - Convert rocketchat-api to main module structure ([#12510](https://github.com/RocketChat/Rocket.Chat/pull/12510))
+
 - Convert rocketchat-analytics to main module structure ([#12506](https://github.com/RocketChat/Rocket.Chat/pull/12506))
+
 - Convert rocketchat-action-links to main module structure ([#12503](https://github.com/RocketChat/Rocket.Chat/pull/12503))
+
 - Convert rocketchat-2fa to main module structure ([#12501](https://github.com/RocketChat/Rocket.Chat/pull/12501))
+
 - Convert meteor-timesync to main module structure ([#12495](https://github.com/RocketChat/Rocket.Chat/pull/12495))
+
 - Convert meteor-autocomplete package to main module structure ([#12491](https://github.com/RocketChat/Rocket.Chat/pull/12491))
+
 - Convert meteor-accounts-saml to main module structure ([#12486](https://github.com/RocketChat/Rocket.Chat/pull/12486))
+
 - Convert chatpal search package to modular structure ([#12485](https://github.com/RocketChat/Rocket.Chat/pull/12485))
+
 - Removal of TAPi18n and TAPi18next global variables ([#12467](https://github.com/RocketChat/Rocket.Chat/pull/12467))
+
 - Removal of Template, Blaze, BlazeLayout, FlowRouter, DDPRateLimiter, Session, UAParser, Promise, Reload and CryptoJS global variables ([#12433](https://github.com/RocketChat/Rocket.Chat/pull/12433))
+
 - Removal of Match, check, moment, Tracker and Mongo global variables ([#12410](https://github.com/RocketChat/Rocket.Chat/pull/12410))
+
 - Removal of EJSON, Accounts, Email, HTTP, Random, ReactiveDict, ReactiveVar, SHA256 and WebApp global variables ([#12377](https://github.com/RocketChat/Rocket.Chat/pull/12377))
+
 - Removal of Meteor global variable ([#12371](https://github.com/RocketChat/Rocket.Chat/pull/12371))
+
 - Fix ES translation ([#12509](https://github.com/RocketChat/Rocket.Chat/pull/12509))
+
 - LingoHub based on develop ([#12470](https://github.com/RocketChat/Rocket.Chat/pull/12470))
+
 - Update npm dependencies ([#12465](https://github.com/RocketChat/Rocket.Chat/pull/12465))
+
 - Fix: Developers not being able to debug root files in VSCode ([#12440](https://github.com/RocketChat/Rocket.Chat/pull/12440) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Merge master into develop & Set version to 0.72.0-develop ([#12460](https://github.com/RocketChat/Rocket.Chat/pull/12460) by [@Hudell](https://github.com/Hudell))
+
 - Fix some Ukrainian translations ([#12712](https://github.com/RocketChat/Rocket.Chat/pull/12712) by [@zdumitru](https://github.com/zdumitru))
+
 - Improve: Add missing translation keys. ([#12708](https://github.com/RocketChat/Rocket.Chat/pull/12708) by [@ura14h](https://github.com/ura14h))
+
 - Bump Apps Engine to 1.3.0 ([#12705](https://github.com/RocketChat/Rocket.Chat/pull/12705))
+
 - Fix: Exception when registering a user with gravatar ([#12699](https://github.com/RocketChat/Rocket.Chat/pull/12699))
+
 - Fix: Fix tests by increasing window size ([#12707](https://github.com/RocketChat/Rocket.Chat/pull/12707))
+
 - Update Apps Engine to 1.3.1 ([#12741](https://github.com/RocketChat/Rocket.Chat/pull/12741))
+
 - Regression: Expand Administration sections by toggling section title ([#12736](https://github.com/RocketChat/Rocket.Chat/pull/12736))
+
 - Regression: Fix Safari detection in PDF previewing ([#12737](https://github.com/RocketChat/Rocket.Chat/pull/12737))
+
 - Regression: Account pages layout ([#12735](https://github.com/RocketChat/Rocket.Chat/pull/12735))
+
 - Regression: Inherit font-family for message box ([#12729](https://github.com/RocketChat/Rocket.Chat/pull/12729))
 
 </details>
@@ -3409,11 +5062,13 @@
 
 ### 🐛 Bug fixes
 
+
 - Email sending with GDPR user data ([#12487](https://github.com/RocketChat/Rocket.Chat/pull/12487))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.71.1 ([#12499](https://github.com/RocketChat/Rocket.Chat/pull/12499))
 
 </details>
@@ -3431,59 +5086,100 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Update `lastMessage` rooms property and convert the "starred" property, to the same format ([#12266](https://github.com/RocketChat/Rocket.Chat/pull/12266))
+
 - Add expiration to API login tokens and fix duplicate login tokens created by LDAP ([#12186](https://github.com/RocketChat/Rocket.Chat/pull/12186))
 
 ### 🎉 New features
 
+
 - Add delete channel mutation to GraphQL API ([#11860](https://github.com/RocketChat/Rocket.Chat/pull/11860))
+
 - sidenav size on large screens ([#12372](https://github.com/RocketChat/Rocket.Chat/pull/12372))
+
 - Ability to disable user presence monitor ([#12353](https://github.com/RocketChat/Rocket.Chat/pull/12353))
+
 - PDF message attachment preview (client side rendering) ([#10519](https://github.com/RocketChat/Rocket.Chat/pull/10519) by [@kb0304](https://github.com/kb0304))
+
 - Add "help wanted" section to Readme ([#12432](https://github.com/RocketChat/Rocket.Chat/pull/12432) by [@isabellarussell](https://github.com/isabellarussell))
 
 ### 🚀 Improvements
 
+
 - Livechat room closure endpoints ([#12360](https://github.com/RocketChat/Rocket.Chat/pull/12360))
+
 - Set Livechat department before register guest ([#12161](https://github.com/RocketChat/Rocket.Chat/pull/12161))
+
 - Add missing livechat i18n keys ([#12330](https://github.com/RocketChat/Rocket.Chat/pull/12330) by [@MarcosEllys](https://github.com/MarcosEllys))
+
 - Avoid unnecessary calls to Meteor.user() on client ([#11212](https://github.com/RocketChat/Rocket.Chat/pull/11212))
+
 - Allow the imports to accept any file type ([#12425](https://github.com/RocketChat/Rocket.Chat/pull/12425))
 
 ### 🐛 Bug fixes
 
+
 - Add image dimensions to attachment even when no reorientation is required ([#11521](https://github.com/RocketChat/Rocket.Chat/pull/11521))
+
 - iframe login token not checked ([#12158](https://github.com/RocketChat/Rocket.Chat/pull/12158) by [@nimetu](https://github.com/nimetu))
+
 - REST `users.setAvatar` endpoint wasn't allowing update the avatar of other users even with correct permissions ([#11431](https://github.com/RocketChat/Rocket.Chat/pull/11431))
+
 - Slack importer: image previews not showing ([#11875](https://github.com/RocketChat/Rocket.Chat/pull/11875) by [@Hudell](https://github.com/Hudell) & [@madguy02](https://github.com/madguy02))
+
 - Edit room name with uppercase letters ([#12235](https://github.com/RocketChat/Rocket.Chat/pull/12235) by [@nikeee](https://github.com/nikeee))
+
 - Custom OAuth Configuration can't be removed ([#12256](https://github.com/RocketChat/Rocket.Chat/pull/12256) by [@Hudell](https://github.com/Hudell))
+
 - Remove e2e from users endpoint responses ([#12344](https://github.com/RocketChat/Rocket.Chat/pull/12344))
+
 - email api TAPi18n is undefined ([#12373](https://github.com/RocketChat/Rocket.Chat/pull/12373))
+
 - Blockstack errors in IE 11 ([#12338](https://github.com/RocketChat/Rocket.Chat/pull/12338))
+
 - avatar?_dc=undefined ([#12365](https://github.com/RocketChat/Rocket.Chat/pull/12365))
+
 - users.register endpoint to not create an user if username already being used ([#12297](https://github.com/RocketChat/Rocket.Chat/pull/12297))
+
 - Date range check on livechat analytics ([#12345](https://github.com/RocketChat/Rocket.Chat/pull/12345) by [@teresy](https://github.com/teresy))
+
 - Cast env var setting to int based on option type ([#12194](https://github.com/RocketChat/Rocket.Chat/pull/12194) by [@crazy-max](https://github.com/crazy-max))
+
 - Links in home layout ([#12355](https://github.com/RocketChat/Rocket.Chat/pull/12355) by [@upiksaleh](https://github.com/upiksaleh))
+
 - Last message not updating after message delete if show deleted status is on ([#12350](https://github.com/RocketChat/Rocket.Chat/pull/12350))
+
 - Invalid destructuring on Livechat API endpoint ([#12354](https://github.com/RocketChat/Rocket.Chat/pull/12354))
+
 - E2E: Decrypting UTF-8 encoded messages ([#12398](https://github.com/RocketChat/Rocket.Chat/pull/12398) by [@pmmaga](https://github.com/pmmaga))
+
 - Ignore errors when creating image preview for uploads ([#12424](https://github.com/RocketChat/Rocket.Chat/pull/12424))
+
 - Attachment actions not being collapsable ([#12436](https://github.com/RocketChat/Rocket.Chat/pull/12436))
+
 - Attachment timestamp from and to Apps system not working ([#12445](https://github.com/RocketChat/Rocket.Chat/pull/12445))
+
 - Apps not being able to state how the action buttons are aligned ([#12391](https://github.com/RocketChat/Rocket.Chat/pull/12391))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Fix: wrong saveUser permission validations ([#12384](https://github.com/RocketChat/Rocket.Chat/pull/12384))
+
 - Regression: do not render pdf preview on safari <= 12 ([#12375](https://github.com/RocketChat/Rocket.Chat/pull/12375))
+
 - Improve: Drop database between running tests on CI ([#12358](https://github.com/RocketChat/Rocket.Chat/pull/12358))
+
 - Fix: update check on err.details ([#12346](https://github.com/RocketChat/Rocket.Chat/pull/12346) by [@teresy](https://github.com/teresy))
+
 - Update Apps Framework to version 1.2.1 ([#12442](https://github.com/RocketChat/Rocket.Chat/pull/12442))
+
 - Regression: Change `starred` message property from object to array ([#12405](https://github.com/RocketChat/Rocket.Chat/pull/12405))
+
 - Apps: Room’s usernames was not working ([#12409](https://github.com/RocketChat/Rocket.Chat/pull/12409))
+
 - Regression: Fix email headers not being used ([#12392](https://github.com/RocketChat/Rocket.Chat/pull/12392))
 
 </details>
@@ -3523,6 +5219,7 @@
 
 ### 🐛 Bug fixes
 
+
 - Reset password email ([#12898](https://github.com/RocketChat/Rocket.Chat/pull/12898))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -3538,12 +5235,15 @@
 
 ### 🐛 Bug fixes
 
+
 - Modal confirm on enter ([#12283](https://github.com/RocketChat/Rocket.Chat/pull/12283))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.70.4 ([#12299](https://github.com/RocketChat/Rocket.Chat/pull/12299))
+
 - Fix: Add wizard opt-in fields ([#12298](https://github.com/RocketChat/Rocket.Chat/pull/12298))
 
 </details>
@@ -3561,12 +5261,15 @@
 
 ### 🐛 Bug fixes
 
+
 - E2E alert shows up when encryption is disabled ([#12272](https://github.com/RocketChat/Rocket.Chat/pull/12272) by [@Hudell](https://github.com/Hudell))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.70.3 ([#12281](https://github.com/RocketChat/Rocket.Chat/pull/12281))
+
 - Release 0.70.2 ([#12276](https://github.com/RocketChat/Rocket.Chat/pull/12276) by [@Hudell](https://github.com/Hudell))
 
 </details>
@@ -3588,22 +5291,35 @@
 
 ### 🐛 Bug fixes
 
+
 - E2E data not cleared on logout ([#12254](https://github.com/RocketChat/Rocket.Chat/pull/12254) by [@Hudell](https://github.com/Hudell))
+
 - E2E password request not closing after entering password ([#12232](https://github.com/RocketChat/Rocket.Chat/pull/12232) by [@Hudell](https://github.com/Hudell))
+
 - Message editing was duplicating reply quotes ([#12263](https://github.com/RocketChat/Rocket.Chat/pull/12263))
+
 - Livechat integration with RDStation ([#12257](https://github.com/RocketChat/Rocket.Chat/pull/12257))
+
 - Livechat triggers being registered twice after setting department via API ([#12255](https://github.com/RocketChat/Rocket.Chat/pull/12255) by [@edzluhan](https://github.com/edzluhan))
+
 - Livechat CRM integration running when disabled  ([#12242](https://github.com/RocketChat/Rocket.Chat/pull/12242))
+
 - Emails' logo and links ([#12241](https://github.com/RocketChat/Rocket.Chat/pull/12241))
+
 - Set default action for Setup Wizard form submit ([#12240](https://github.com/RocketChat/Rocket.Chat/pull/12240))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.70.1 ([#12270](https://github.com/RocketChat/Rocket.Chat/pull/12270) by [@Hudell](https://github.com/Hudell) & [@edzluhan](https://github.com/edzluhan))
+
 - Merge master into develop & Set version to 0.71.0-develop ([#12264](https://github.com/RocketChat/Rocket.Chat/pull/12264) by [@cardoso](https://github.com/cardoso) & [@kaiiiiiiiii](https://github.com/kaiiiiiiiii) & [@timkinnane](https://github.com/timkinnane))
+
 - Regression: fix modal submit ([#12233](https://github.com/RocketChat/Rocket.Chat/pull/12233))
+
 - Add reetp to the issues' bot whitelist ([#12227](https://github.com/RocketChat/Rocket.Chat/pull/12227))
+
 - Fix: Remove semver satisfies from Apps details that is already done my marketplace ([#12268](https://github.com/RocketChat/Rocket.Chat/pull/12268))
 
 </details>
@@ -3634,93 +5350,168 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Update the default port of the Prometheus exporter ([#11351](https://github.com/RocketChat/Rocket.Chat/pull/11351) by [@thaiphv](https://github.com/thaiphv))
+
 - [IMPROVE] New emails design ([#12009](https://github.com/RocketChat/Rocket.Chat/pull/12009))
 
 ### 🎉 New features
 
+
 - Allow multiple subcommands in MIGRATION_VERSION env variable ([#11184](https://github.com/RocketChat/Rocket.Chat/pull/11184) by [@arch119](https://github.com/arch119))
+
 - Support for end to end encryption ([#10094](https://github.com/RocketChat/Rocket.Chat/pull/10094) by [@mrinaldhar](https://github.com/mrinaldhar))
+
 - Livechat Analytics and Reports ([#11238](https://github.com/RocketChat/Rocket.Chat/pull/11238) by [@pkgodara](https://github.com/pkgodara))
+
 - Apps: Add handlers for message updates ([#11993](https://github.com/RocketChat/Rocket.Chat/pull/11993) by [@cardoso](https://github.com/cardoso))
+
 - Livechat notifications on new incoming inquiries for guest-pool ([#10588](https://github.com/RocketChat/Rocket.Chat/pull/10588) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Customizable default directory view ([#11965](https://github.com/RocketChat/Rocket.Chat/pull/11965) by [@ohmonster](https://github.com/ohmonster))
+
 - Blockstack as decentralized auth provider ([#12047](https://github.com/RocketChat/Rocket.Chat/pull/12047) by [@timkinnane](https://github.com/timkinnane))
+
 - Livechat REST endpoints ([#11900](https://github.com/RocketChat/Rocket.Chat/pull/11900))
+
 - REST endpoints to get moderators from groups and channels ([#11909](https://github.com/RocketChat/Rocket.Chat/pull/11909))
+
 - User preference for 24- or 12-hour clock ([#11169](https://github.com/RocketChat/Rocket.Chat/pull/11169) by [@vynmera](https://github.com/vynmera))
+
 - REST endpoint to set groups' announcement ([#11905](https://github.com/RocketChat/Rocket.Chat/pull/11905))
+
 - Livechat trigger option to run only once ([#12068](https://github.com/RocketChat/Rocket.Chat/pull/12068) by [@edzluhan](https://github.com/edzluhan))
+
 - REST endpoints to create roles and assign roles to users ([#11855](https://github.com/RocketChat/Rocket.Chat/pull/11855) by [@aferreira44](https://github.com/aferreira44))
+
 - Informal German translations ([#9984](https://github.com/RocketChat/Rocket.Chat/pull/9984) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Apps: API provider ([#11938](https://github.com/RocketChat/Rocket.Chat/pull/11938))
+
 - Apps are enabled by default now ([#12189](https://github.com/RocketChat/Rocket.Chat/pull/12189))
+
 - Add Livechat Analytics permission ([#12184](https://github.com/RocketChat/Rocket.Chat/pull/12184))
+
 - WebDAV Integration (User file provider) ([#11679](https://github.com/RocketChat/Rocket.Chat/pull/11679) by [@karakayasemi](https://github.com/karakayasemi))
 
 ### 🚀 Improvements
 
+
 - Cache livechat get agent trigger call ([#12083](https://github.com/RocketChat/Rocket.Chat/pull/12083))
+
 - BigBlueButton joinViaHtml5 and video icon on sidebar ([#12107](https://github.com/RocketChat/Rocket.Chat/pull/12107))
+
 - Use eslint-config package ([#12044](https://github.com/RocketChat/Rocket.Chat/pull/12044))
 
 ### 🐛 Bug fixes
 
+
 - Livechat agent joining on pick from guest pool ([#12097](https://github.com/RocketChat/Rocket.Chat/pull/12097) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Apps: Add missing reactions and actions properties to app message object ([#11780](https://github.com/RocketChat/Rocket.Chat/pull/11780))
+
 - Broken slack compatible webhook ([#11742](https://github.com/RocketChat/Rocket.Chat/pull/11742))
+
 - Changing Mentions.userMentionRegex pattern to include <br> tag ([#12043](https://github.com/RocketChat/Rocket.Chat/pull/12043) by [@rssilva](https://github.com/rssilva))
+
 - Double output of message actions ([#11902](https://github.com/RocketChat/Rocket.Chat/pull/11902) by [@timkinnane](https://github.com/timkinnane))
+
 - Login error message not obvious if user not activated ([#11785](https://github.com/RocketChat/Rocket.Chat/pull/11785) by [@crazy-max](https://github.com/crazy-max))
+
 - Adding scroll bar to read receipts modal ([#11919](https://github.com/RocketChat/Rocket.Chat/pull/11919) by [@rssilva](https://github.com/rssilva))
+
 - Fixing translation on 'yesterday' word when calling timeAgo function ([#11946](https://github.com/RocketChat/Rocket.Chat/pull/11946) by [@rssilva](https://github.com/rssilva))
+
 - Fixing spacement between tags and words on some labels ([#12018](https://github.com/RocketChat/Rocket.Chat/pull/12018) by [@rssilva](https://github.com/rssilva))
+
 - video message recording, issue #11651 ([#12031](https://github.com/RocketChat/Rocket.Chat/pull/12031) by [@flaviogrossi](https://github.com/flaviogrossi))
+
 - Prevent form submission in Files List search ([#11999](https://github.com/RocketChat/Rocket.Chat/pull/11999))
+
 - Re-add the eye-off icon ([#12079](https://github.com/RocketChat/Rocket.Chat/pull/12079) by [@MIKI785](https://github.com/MIKI785))
+
 - Internal error when cross-origin with CORS is disabled ([#11953](https://github.com/RocketChat/Rocket.Chat/pull/11953))
+
 - Message reaction in GraphQL API ([#11967](https://github.com/RocketChat/Rocket.Chat/pull/11967))
+
 - Direct messages leaking into logs ([#11863](https://github.com/RocketChat/Rocket.Chat/pull/11863) by [@Hudell](https://github.com/Hudell))
+
 - Wrong build path in install.sh ([#11879](https://github.com/RocketChat/Rocket.Chat/pull/11879))
+
 - Permission check on joinRoom for private room ([#11857](https://github.com/RocketChat/Rocket.Chat/pull/11857) by [@timkinnane](https://github.com/timkinnane))
+
 - Close popover on shortcuts and writing ([#11562](https://github.com/RocketChat/Rocket.Chat/pull/11562))
+
 - Typo in a configuration key for SlackBridge excluded bot names ([#11872](https://github.com/RocketChat/Rocket.Chat/pull/11872) by [@TobiasKappe](https://github.com/TobiasKappe))
+
 - Real Name on Direct Messages  ([#12154](https://github.com/RocketChat/Rocket.Chat/pull/12154))
+
 - Position of popover component on mobile ([#12038](https://github.com/RocketChat/Rocket.Chat/pull/12038))
+
 - Duplicate email and auto-join on mentions ([#12168](https://github.com/RocketChat/Rocket.Chat/pull/12168))
+
 - Horizontal scroll on user info tab ([#12102](https://github.com/RocketChat/Rocket.Chat/pull/12102) by [@rssilva](https://github.com/rssilva))
+
 - Markdown ampersand escape on links ([#12140](https://github.com/RocketChat/Rocket.Chat/pull/12140) by [@rssilva](https://github.com/rssilva))
+
 - Saving user preferences ([#12170](https://github.com/RocketChat/Rocket.Chat/pull/12170))
+
 - Apps being able to see hidden settings ([#12159](https://github.com/RocketChat/Rocket.Chat/pull/12159))
+
 - Allow user with "bulk-register-user" permission to send invitations ([#12112](https://github.com/RocketChat/Rocket.Chat/pull/12112) by [@mrsimpson](https://github.com/mrsimpson))
+
 - IRC Federation no longer working ([#11906](https://github.com/RocketChat/Rocket.Chat/pull/11906) by [@Hudell](https://github.com/Hudell))
+
 - Files list missing from popover menu when owner of room ([#11565](https://github.com/RocketChat/Rocket.Chat/pull/11565))
+
 - Not able to set per-channel retention policies if no global policy is set for this channel type ([#11927](https://github.com/RocketChat/Rocket.Chat/pull/11927) by [@vynmera](https://github.com/vynmera))
+
 - app engine verbose log typo ([#12126](https://github.com/RocketChat/Rocket.Chat/pull/12126) by [@williamriancho](https://github.com/williamriancho))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.69.2 ([#12026](https://github.com/RocketChat/Rocket.Chat/pull/12026) by [@cardoso](https://github.com/cardoso) & [@kaiiiiiiiii](https://github.com/kaiiiiiiiii) & [@timkinnane](https://github.com/timkinnane))
+
 - LingoHub based on develop ([#11936](https://github.com/RocketChat/Rocket.Chat/pull/11936))
+
 - Better organize package.json ([#12115](https://github.com/RocketChat/Rocket.Chat/pull/12115))
+
 - Fix using wrong variable ([#12114](https://github.com/RocketChat/Rocket.Chat/pull/12114))
+
 - Fix the style lint ([#11991](https://github.com/RocketChat/Rocket.Chat/pull/11991))
+
 - Merge master into develop & Set version to 0.70.0-develop ([#11921](https://github.com/RocketChat/Rocket.Chat/pull/11921) by [@Hudell](https://github.com/Hudell) & [@c0dzilla](https://github.com/c0dzilla) & [@rndmh3ro](https://github.com/rndmh3ro) & [@ubarsaiyan](https://github.com/ubarsaiyan) & [@vynmera](https://github.com/vynmera))
+
 - Release 0.69.2 ([#12026](https://github.com/RocketChat/Rocket.Chat/pull/12026) by [@cardoso](https://github.com/cardoso) & [@kaiiiiiiiii](https://github.com/kaiiiiiiiii) & [@timkinnane](https://github.com/timkinnane))
+
 - Regression: fix message box autogrow ([#12138](https://github.com/RocketChat/Rocket.Chat/pull/12138))
+
 - Regression: Modal height ([#12122](https://github.com/RocketChat/Rocket.Chat/pull/12122))
+
 - Fix: Change wording on e2e to make a little more clear ([#12124](https://github.com/RocketChat/Rocket.Chat/pull/12124))
+
 - Improve: Moved the e2e password request to an alert instead of a popup ([#12172](https://github.com/RocketChat/Rocket.Chat/pull/12172) by [@Hudell](https://github.com/Hudell))
+
 - New: Option to change E2E key ([#12169](https://github.com/RocketChat/Rocket.Chat/pull/12169) by [@Hudell](https://github.com/Hudell))
+
 - Improve: Decrypt last message ([#12173](https://github.com/RocketChat/Rocket.Chat/pull/12173))
+
 - Fix: e2e password visible on always-on alert message. ([#12139](https://github.com/RocketChat/Rocket.Chat/pull/12139) by [@Hudell](https://github.com/Hudell))
+
 - Improve: Expose apps enable setting at `General > Apps` ([#12196](https://github.com/RocketChat/Rocket.Chat/pull/12196))
+
 - Fix: Message changing order when been edited with apps enabled ([#12188](https://github.com/RocketChat/Rocket.Chat/pull/12188))
+
 - Improve: E2E setting description and alert ([#12191](https://github.com/RocketChat/Rocket.Chat/pull/12191))
+
 - Improve: Do not start E2E Encryption when accessing admin as embedded ([#12192](https://github.com/RocketChat/Rocket.Chat/pull/12192))
+
 - Fix: Add e2e doc to the alert ([#12187](https://github.com/RocketChat/Rocket.Chat/pull/12187))
+
 - Improve: Switch e2e doc to target _blank ([#12195](https://github.com/RocketChat/Rocket.Chat/pull/12195))
+
 - Improve: Rename E2E methods ([#12175](https://github.com/RocketChat/Rocket.Chat/pull/12175) by [@Hudell](https://github.com/Hudell))
 
 </details>
@@ -3773,13 +5564,18 @@
 
 ### 🎉 New features
 
+
 - Include room name in stream for bots ([#11812](https://github.com/RocketChat/Rocket.Chat/pull/11812) by [@timkinnane](https://github.com/timkinnane))
 
 ### 🐛 Bug fixes
 
+
 - Reset password link error if already logged in ([#12022](https://github.com/RocketChat/Rocket.Chat/pull/12022))
+
 - Apps: setting with 'code' type only saving last line ([#11992](https://github.com/RocketChat/Rocket.Chat/pull/11992) by [@cardoso](https://github.com/cardoso))
+
 - Update user information not possible by admin if disabled to users ([#11955](https://github.com/RocketChat/Rocket.Chat/pull/11955) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
+
 - Hidden admin sidenav on embedded layout ([#12025](https://github.com/RocketChat/Rocket.Chat/pull/12025))
 
 ### 👩‍💻👨‍💻 Contributors 😍
@@ -3803,9 +5599,13 @@
 
 ### 🐛 Bug fixes
 
+
 - Hipchat import was failing when importing messages from a non existent user ([#11892](https://github.com/RocketChat/Rocket.Chat/pull/11892))
+
 - Hipchat importer was not importing users without emails and uploaded files ([#11910](https://github.com/RocketChat/Rocket.Chat/pull/11910))
+
 - App updates were not being shown correctly ([#11893](https://github.com/RocketChat/Rocket.Chat/pull/11893))
+
 - Duplicated message buttons ([#11853](https://github.com/RocketChat/Rocket.Chat/pull/11853) by [@ubarsaiyan](https://github.com/ubarsaiyan))
 
 ### 👩‍💻👨‍💻 Contributors 😍
@@ -3825,81 +5625,147 @@
 
 ### 🎉 New features
 
+
 - Beta support for Big Blue Button video conferencing system ([#11837](https://github.com/RocketChat/Rocket.Chat/pull/11837))
+
 - Slackbridge: send attachment notifications ([#10269](https://github.com/RocketChat/Rocket.Chat/pull/10269) by [@Hudell](https://github.com/Hudell) & [@kable-wilmoth](https://github.com/kable-wilmoth))
+
 - Personal access tokens for users to create API tokens ([#11638](https://github.com/RocketChat/Rocket.Chat/pull/11638))
+
 - REST endpoint to manage server assets ([#11697](https://github.com/RocketChat/Rocket.Chat/pull/11697))
+
 - Setting to enable/disable slack bridge reactions ([#10217](https://github.com/RocketChat/Rocket.Chat/pull/10217) by [@Hudell](https://github.com/Hudell) & [@kable-wilmoth](https://github.com/kable-wilmoth))
+
 - Rich message text and image buttons ([#11473](https://github.com/RocketChat/Rocket.Chat/pull/11473) by [@ubarsaiyan](https://github.com/ubarsaiyan))
+
 - Setting to block unauthenticated access to avatars ([#9749](https://github.com/RocketChat/Rocket.Chat/pull/9749) by [@Hudell](https://github.com/Hudell))
+
 - Setting to set a JS/CSS CDN ([#11779](https://github.com/RocketChat/Rocket.Chat/pull/11779))
+
 - Make font of unread items bolder for better contrast ([#8602](https://github.com/RocketChat/Rocket.Chat/pull/8602) by [@ausminternet](https://github.com/ausminternet))
+
 - Internal marketplace for apps ([#11864](https://github.com/RocketChat/Rocket.Chat/pull/11864) by [@gdelavald](https://github.com/gdelavald) & [@rssilva](https://github.com/rssilva))
 
 ### 🚀 Improvements
 
+
 - Start storing Livechat department within rooms ([#11733](https://github.com/RocketChat/Rocket.Chat/pull/11733))
+
 - Escape parameters before send them to email template ([#11644](https://github.com/RocketChat/Rocket.Chat/pull/11644))
+
 - Warn about push settings that need server restart ([#11784](https://github.com/RocketChat/Rocket.Chat/pull/11784))
+
 - Role tag UI ([#11674](https://github.com/RocketChat/Rocket.Chat/pull/11674) by [@timkinnane](https://github.com/timkinnane))
+
 - Messagebox fix performance ([#11686](https://github.com/RocketChat/Rocket.Chat/pull/11686))
+
 - Add template tag #{userdn} to filter LDAP group member format ([#11662](https://github.com/RocketChat/Rocket.Chat/pull/11662) by [@crazy-max](https://github.com/crazy-max))
+
 - Add nyan rocket on Rocket.Chat preview Docker image ([#11684](https://github.com/RocketChat/Rocket.Chat/pull/11684))
+
 - Reducing `saveUser` code complexity ([#11645](https://github.com/RocketChat/Rocket.Chat/pull/11645) by [@Hudell](https://github.com/Hudell))
 
 ### 🐛 Bug fixes
 
+
 - Delete removed user's subscriptions ([#10700](https://github.com/RocketChat/Rocket.Chat/pull/10700) by [@Hudell](https://github.com/Hudell))
+
 - LiveChat switch department not working ([#11011](https://github.com/RocketChat/Rocket.Chat/pull/11011))
+
 - Some assets were pointing to nonexistent path ([#11796](https://github.com/RocketChat/Rocket.Chat/pull/11796))
+
 - Revoked `view-d-room` permission logics ([#11522](https://github.com/RocketChat/Rocket.Chat/pull/11522) by [@Hudell](https://github.com/Hudell))
+
 - REST `im.members` endpoint not working without sort parameter ([#11821](https://github.com/RocketChat/Rocket.Chat/pull/11821))
+
 - Livechat rooms starting with two unread message counter ([#11834](https://github.com/RocketChat/Rocket.Chat/pull/11834))
+
 - Results pagination on /directory REST endpoint ([#11551](https://github.com/RocketChat/Rocket.Chat/pull/11551))
+
 - re-adding margin to menu icon on header ([#11778](https://github.com/RocketChat/Rocket.Chat/pull/11778) by [@rssilva](https://github.com/rssilva))
+
 - minor fixes in hungarian i18n  ([#11797](https://github.com/RocketChat/Rocket.Chat/pull/11797) by [@Atisom](https://github.com/Atisom))
+
 - permissions name no break ([#11836](https://github.com/RocketChat/Rocket.Chat/pull/11836))
+
 - Searching by `undefined` via REST when using `query` param ([#11657](https://github.com/RocketChat/Rocket.Chat/pull/11657))
+
 - Fix permalink of message when running system with subdir ([#11781](https://github.com/RocketChat/Rocket.Chat/pull/11781) by [@ura14h](https://github.com/ura14h))
+
 - Fix links in `onTableItemClick` of the directroy page ([#11543](https://github.com/RocketChat/Rocket.Chat/pull/11543) by [@ura14h](https://github.com/ura14h))
+
 - App's i18nAlert is only being displayed as "i18nAlert" ([#11802](https://github.com/RocketChat/Rocket.Chat/pull/11802))
+
 - Removed hardcoded values. ([#11627](https://github.com/RocketChat/Rocket.Chat/pull/11627) by [@Hudell](https://github.com/Hudell))
+
 - SAML is flooding logfile ([#11643](https://github.com/RocketChat/Rocket.Chat/pull/11643) by [@Hudell](https://github.com/Hudell))
+
 - directory search table not clickable lines ([#11809](https://github.com/RocketChat/Rocket.Chat/pull/11809))
+
 - REST endpoints to update user not respecting some settings ([#11474](https://github.com/RocketChat/Rocket.Chat/pull/11474))
+
 - Apply Cordova fix in lazy-loaded images sources ([#11807](https://github.com/RocketChat/Rocket.Chat/pull/11807))
+
 - Cannot set property 'input' of undefined ([#11775](https://github.com/RocketChat/Rocket.Chat/pull/11775))
+
 - Missing twitter:image and og:image tags ([#11687](https://github.com/RocketChat/Rocket.Chat/pull/11687))
+
 - Return room ID for groups where user joined ([#11703](https://github.com/RocketChat/Rocket.Chat/pull/11703) by [@timkinnane](https://github.com/timkinnane))
+
 - "User is typing" not working in new Livechat session ([#11670](https://github.com/RocketChat/Rocket.Chat/pull/11670))
+
 - wrong create date of channels and users on directory view ([#11682](https://github.com/RocketChat/Rocket.Chat/pull/11682) by [@gsperezb](https://github.com/gsperezb))
+
 - Escape meta data before inject in head tag ([#11730](https://github.com/RocketChat/Rocket.Chat/pull/11730))
+
 - minor fixes in i18n ([#11761](https://github.com/RocketChat/Rocket.Chat/pull/11761) by [@Atisom](https://github.com/Atisom))
+
 - Code tag duplicating characters ([#11467](https://github.com/RocketChat/Rocket.Chat/pull/11467) by [@vynmera](https://github.com/vynmera))
+
 - Custom sound uploader not working in Firefox and IE ([#11139](https://github.com/RocketChat/Rocket.Chat/pull/11139) by [@vynmera](https://github.com/vynmera))
+
 - Fixing timeAgo function on directory ([#11728](https://github.com/RocketChat/Rocket.Chat/pull/11728) by [@rssilva](https://github.com/rssilva))
+
 - Render Attachment Pretext When Markdown Specified ([#11578](https://github.com/RocketChat/Rocket.Chat/pull/11578) by [@glstewart17](https://github.com/glstewart17))
+
 - Message attachments was not respecting sort and lost spacing ([#11740](https://github.com/RocketChat/Rocket.Chat/pull/11740))
+
 - Closed connections being storing on db ([#11709](https://github.com/RocketChat/Rocket.Chat/pull/11709))
+
 - Login logo now centered on small screens ([#11626](https://github.com/RocketChat/Rocket.Chat/pull/11626) by [@wreiske](https://github.com/wreiske))
+
 - Push notifications stuck after db failure ([#11667](https://github.com/RocketChat/Rocket.Chat/pull/11667))
+
 - Translations were not unique per app allowing conflicts among apps ([#11878](https://github.com/RocketChat/Rocket.Chat/pull/11878))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.68.5 ([#11852](https://github.com/RocketChat/Rocket.Chat/pull/11852))
+
 - Release 0.68.5 ([#11852](https://github.com/RocketChat/Rocket.Chat/pull/11852))
+
 - Fixed deutsch message pruning translations ([#11691](https://github.com/RocketChat/Rocket.Chat/pull/11691) by [@TheReal1604](https://github.com/TheReal1604))
+
 - Fixed the Finnish translation and removed some profanities ([#11794](https://github.com/RocketChat/Rocket.Chat/pull/11794) by [@jukper](https://github.com/jukper))
+
 - LingoHub based on develop ([#11838](https://github.com/RocketChat/Rocket.Chat/pull/11838))
+
 - Regression: Fix livechat code issues after new lint rules ([#11814](https://github.com/RocketChat/Rocket.Chat/pull/11814))
+
 - Do not remove package-lock.json of livechat package ([#11816](https://github.com/RocketChat/Rocket.Chat/pull/11816))
+
 - Run eslint and unit tests on pre-push hook ([#11815](https://github.com/RocketChat/Rocket.Chat/pull/11815))
+
 - Additional eslint rules  ([#11804](https://github.com/RocketChat/Rocket.Chat/pull/11804))
+
 - Add new eslint rules (automatically fixed) ([#11800](https://github.com/RocketChat/Rocket.Chat/pull/11800))
+
 - Merge master into develop & Set version to 0.69.0-develop ([#11606](https://github.com/RocketChat/Rocket.Chat/pull/11606))
+
 - App engine merge ([#11835](https://github.com/RocketChat/Rocket.Chat/pull/11835))
+
 - Regression: role tag background, unread item font and message box autogrow ([#11861](https://github.com/RocketChat/Rocket.Chat/pull/11861))
 
 </details>
@@ -3944,6 +5810,7 @@
 
 ### 🐛 Bug fixes
 
+
 - Livechat open room method ([#11830](https://github.com/RocketChat/Rocket.Chat/pull/11830))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -3959,8 +5826,11 @@
 
 ### 🐛 Bug fixes
 
+
 - Default server language not being applied ([#11719](https://github.com/RocketChat/Rocket.Chat/pull/11719))
+
 - Broken logo on setup wizard ([#11708](https://github.com/RocketChat/Rocket.Chat/pull/11708))
+
 - Regression in prune by user, and update lastMessage ([#11646](https://github.com/RocketChat/Rocket.Chat/pull/11646) by [@vynmera](https://github.com/vynmera))
 
 ### 👩‍💻👨‍💻 Contributors 😍
@@ -3981,15 +5851,21 @@
 
 ### 🐛 Bug fixes
 
+
 - Missing chat history for users without permission `preview-c-room` ([#11639](https://github.com/RocketChat/Rocket.Chat/pull/11639) by [@Hudell](https://github.com/Hudell))
+
 - User info APIs not returning customFields correctly ([#11625](https://github.com/RocketChat/Rocket.Chat/pull/11625))
+
 - Prune translations in German ([#11631](https://github.com/RocketChat/Rocket.Chat/pull/11631) by [@rndmh3ro](https://github.com/rndmh3ro))
+
 - Prune translation on room info panel ([#11635](https://github.com/RocketChat/Rocket.Chat/pull/11635))
+
 - SAML login not working when user has multiple emails ([#11642](https://github.com/RocketChat/Rocket.Chat/pull/11642) by [@Hudell](https://github.com/Hudell))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.68.3 ([#11650](https://github.com/RocketChat/Rocket.Chat/pull/11650) by [@Hudell](https://github.com/Hudell) & [@rndmh3ro](https://github.com/rndmh3ro))
 
 </details>
@@ -4013,11 +5889,13 @@
 
 ### 🐛 Bug fixes
 
+
 - Incorrect migration version in v130.js ([#11544](https://github.com/RocketChat/Rocket.Chat/pull/11544) by [@c0dzilla](https://github.com/c0dzilla))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.68.2 ([#11630](https://github.com/RocketChat/Rocket.Chat/pull/11630) by [@c0dzilla](https://github.com/c0dzilla))
 
 </details>
@@ -4039,12 +5917,15 @@
 
 ### 🐛 Bug fixes
 
+
 - `Jump to message` search result action ([#11613](https://github.com/RocketChat/Rocket.Chat/pull/11613))
+
 - HipChat importer wasn’t compatible with latest exports ([#11597](https://github.com/RocketChat/Rocket.Chat/pull/11597))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.68.1 ([#11616](https://github.com/RocketChat/Rocket.Chat/pull/11616))
 
 </details>
@@ -4065,69 +5946,120 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Remove deprecated /user.roles endpoint ([#11493](https://github.com/RocketChat/Rocket.Chat/pull/11493))
+
 - Update GraphQL dependencies ([#11430](https://github.com/RocketChat/Rocket.Chat/pull/11430))
 
 ### 🎉 New features
 
+
 - Setting to disable 2FA globally ([#11328](https://github.com/RocketChat/Rocket.Chat/pull/11328) by [@Hudell](https://github.com/Hudell))
+
 - Add /users.deleteOwnAccount REST endpoint to an user delete his own account ([#11488](https://github.com/RocketChat/Rocket.Chat/pull/11488))
+
 - Add /roles.list REST endpoint to retrieve all server roles ([#11500](https://github.com/RocketChat/Rocket.Chat/pull/11500))
+
 - Message retention policy and pruning ([#11236](https://github.com/RocketChat/Rocket.Chat/pull/11236) by [@vynmera](https://github.com/vynmera))
+
 - Send user status to client ([#11303](https://github.com/RocketChat/Rocket.Chat/pull/11303) by [@HappyTobi](https://github.com/HappyTobi))
+
 - Room files search form ([#11486](https://github.com/RocketChat/Rocket.Chat/pull/11486))
+
 - search only default tone emoji Popup search ([#10017](https://github.com/RocketChat/Rocket.Chat/pull/10017) by [@Joe-mcgee](https://github.com/Joe-mcgee))
+
 - Privacy for custom user fields ([#11332](https://github.com/RocketChat/Rocket.Chat/pull/11332) by [@vynmera](https://github.com/vynmera))
+
 - Replaced old logo with the new ones ([#11491](https://github.com/RocketChat/Rocket.Chat/pull/11491))
+
 - Sorting channels by number of users in directory ([#9972](https://github.com/RocketChat/Rocket.Chat/pull/9972) by [@arungalva](https://github.com/arungalva))
+
 - Make WebRTC not enabled by default ([#11489](https://github.com/RocketChat/Rocket.Chat/pull/11489))
+
 - Accept resumeToken as query param to log in ([#11443](https://github.com/RocketChat/Rocket.Chat/pull/11443))
+
 - Livechat File Upload ([#10514](https://github.com/RocketChat/Rocket.Chat/pull/10514))
 
 ### 🚀 Improvements
 
+
 - Set default max upload size to 100mb ([#11327](https://github.com/RocketChat/Rocket.Chat/pull/11327) by [@cardoso](https://github.com/cardoso))
+
 - Typing indicators now use Real Names ([#11164](https://github.com/RocketChat/Rocket.Chat/pull/11164) by [@vynmera](https://github.com/vynmera))
+
 - Allow markdown in room topic, announcement, and description including single quotes ([#11408](https://github.com/RocketChat/Rocket.Chat/pull/11408))
 
 ### 🐛 Bug fixes
 
+
 - New favicons size too small ([#11524](https://github.com/RocketChat/Rocket.Chat/pull/11524))
+
 - Render reply preview with message as a common message ([#11534](https://github.com/RocketChat/Rocket.Chat/pull/11534))
+
 - Unreads counter for new rooms on /channels.counters REST endpoint ([#11531](https://github.com/RocketChat/Rocket.Chat/pull/11531))
+
 - Marked parser breaking announcements and mentions at the start of messages ([#11357](https://github.com/RocketChat/Rocket.Chat/pull/11357) by [@vynmera](https://github.com/vynmera))
+
 - Send Livechat back to Guest Pool ([#10731](https://github.com/RocketChat/Rocket.Chat/pull/10731))
+
 - Add customFields property to /me REST endpoint response ([#11496](https://github.com/RocketChat/Rocket.Chat/pull/11496))
+
 - Invalid permalink URLs for Direct Messages ([#11507](https://github.com/RocketChat/Rocket.Chat/pull/11507) by [@Hudell](https://github.com/Hudell))
+
 - Unlimited upload file size not working ([#11471](https://github.com/RocketChat/Rocket.Chat/pull/11471) by [@Hudell](https://github.com/Hudell))
+
 - Mixed case channel slugs ([#9449](https://github.com/RocketChat/Rocket.Chat/pull/9449) by [@soundstorm](https://github.com/soundstorm))
+
 - SAML issues ([#11135](https://github.com/RocketChat/Rocket.Chat/pull/11135) by [@Hudell](https://github.com/Hudell) & [@arminfelder](https://github.com/arminfelder))
+
 - Loading and setting fixes for i18n and RTL ([#11363](https://github.com/RocketChat/Rocket.Chat/pull/11363))
+
 - Check for channels property on message object before parsing mentions ([#11527](https://github.com/RocketChat/Rocket.Chat/pull/11527))
+
 - empty blockquote ([#11526](https://github.com/RocketChat/Rocket.Chat/pull/11526))
+
 - Snap font issue for sharp ([#11514](https://github.com/RocketChat/Rocket.Chat/pull/11514))
+
 - RocketChat.settings.get causing memory leak (sometimes) ([#11487](https://github.com/RocketChat/Rocket.Chat/pull/11487))
+
 - Refinements in message popup mentions ([#11441](https://github.com/RocketChat/Rocket.Chat/pull/11441))
+
 - Decrease room leader bar z-index ([#11450](https://github.com/RocketChat/Rocket.Chat/pull/11450))
+
 - Remove title attribute from sidebar items ([#11298](https://github.com/RocketChat/Rocket.Chat/pull/11298))
+
 - Only escape HTML from details in toast error messages ([#11459](https://github.com/RocketChat/Rocket.Chat/pull/11459))
+
 - broadcast channel reply ([#11462](https://github.com/RocketChat/Rocket.Chat/pull/11462))
+
 - Fixed svg for older chrome browsers bug #11414 ([#11416](https://github.com/RocketChat/Rocket.Chat/pull/11416) by [@tpDBL](https://github.com/tpDBL))
+
 - Wrap custom fields in user profile to new line ([#10119](https://github.com/RocketChat/Rocket.Chat/pull/10119) by [@PhpXp](https://github.com/PhpXp) & [@karlprieb](https://github.com/karlprieb))
+
 - Record popup ([#11349](https://github.com/RocketChat/Rocket.Chat/pull/11349))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Revert: Mixed case channel slugs #9449 ([#11537](https://github.com/RocketChat/Rocket.Chat/pull/11537))
+
 - Merge master into develop & Set version to 0.68.0-develop ([#11536](https://github.com/RocketChat/Rocket.Chat/pull/11536))
+
 - Regression: Add missing LiveChat permission to allow removing closed rooms ([#11423](https://github.com/RocketChat/Rocket.Chat/pull/11423))
+
 - Update release issue template to use Houston CLI ([#11499](https://github.com/RocketChat/Rocket.Chat/pull/11499))
+
 - Regression: Remove safe area margins from logos ([#11508](https://github.com/RocketChat/Rocket.Chat/pull/11508))
+
 - Regression: Update cachedCollection version ([#11561](https://github.com/RocketChat/Rocket.Chat/pull/11561))
+
 - Regression: nonReactive to nonreactive ([#11550](https://github.com/RocketChat/Rocket.Chat/pull/11550))
+
 - LingoHub based on develop ([#11587](https://github.com/RocketChat/Rocket.Chat/pull/11587))
+
 - Regression: Make message popup user mentions reactive again ([#11567](https://github.com/RocketChat/Rocket.Chat/pull/11567))
+
 - Regression: Fix purge message's translations ([#11590](https://github.com/RocketChat/Rocket.Chat/pull/11590))
 
 </details>
@@ -4168,32 +6100,46 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Remove cache layer and internal calculated property `room.usernames` ([#10749](https://github.com/RocketChat/Rocket.Chat/pull/10749))
 
 ### 🎉 New features
 
+
 - Additional Livechat iFrame API's ([#10918](https://github.com/RocketChat/Rocket.Chat/pull/10918))
 
 ### 🚀 Improvements
 
+
 - Stop sort callbacks on run ([#11330](https://github.com/RocketChat/Rocket.Chat/pull/11330))
 
 ### 🐛 Bug fixes
 
+
 - sort fname sidenav ([#11358](https://github.com/RocketChat/Rocket.Chat/pull/11358))
+
 - SVG icons code ([#11319](https://github.com/RocketChat/Rocket.Chat/pull/11319))
+
 - Message popup responsiveness in slash commands ([#11313](https://github.com/RocketChat/Rocket.Chat/pull/11313))
+
 - web app manifest errors as reported by Chrome DevTools ([#9991](https://github.com/RocketChat/Rocket.Chat/pull/9991) by [@justinribeiro](https://github.com/justinribeiro))
+
 - Message attachment's fields with different sizes ([#11342](https://github.com/RocketChat/Rocket.Chat/pull/11342))
+
 - Parse inline code without space before initial backtick ([#9754](https://github.com/RocketChat/Rocket.Chat/pull/9754) by [@c0dzilla](https://github.com/c0dzilla) & [@gdelavald](https://github.com/gdelavald))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Fix dependency issue in redhat image ([#11497](https://github.com/RocketChat/Rocket.Chat/pull/11497))
+
 - Merge master into develop & Set version to 0.67.0-develop ([#11417](https://github.com/RocketChat/Rocket.Chat/pull/11417))
+
 - Merge master into develop & Set version to 0.67.0-develop ([#11399](https://github.com/RocketChat/Rocket.Chat/pull/11399))
+
 - Merge master into develop & Set version to 0.67.0-develop ([#11348](https://github.com/RocketChat/Rocket.Chat/pull/11348) by [@Hudell](https://github.com/Hudell) & [@gdelavald](https://github.com/gdelavald))
+
 - Merge master into develop & Set version to 0.67.0-develop ([#11290](https://github.com/RocketChat/Rocket.Chat/pull/11290))
 
 </details>
@@ -4224,7 +6170,9 @@
 
 ### 🐛 Bug fixes
 
+
 - All messages notifications via email were sent as mention alert ([#11398](https://github.com/RocketChat/Rocket.Chat/pull/11398))
+
 - Livechat taking inquiry leading to 404 page ([#11406](https://github.com/RocketChat/Rocket.Chat/pull/11406))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -4241,13 +6189,17 @@
 
 ### 🐛 Bug fixes
 
+
 - Remove file snap store doesn't like ([#11365](https://github.com/RocketChat/Rocket.Chat/pull/11365))
+
 - Livechat not sending desktop notifications ([#11266](https://github.com/RocketChat/Rocket.Chat/pull/11266))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Send setting Allow_Marketing_Emails to statistics collector ([#11359](https://github.com/RocketChat/Rocket.Chat/pull/11359))
+
 - Regression: Fix migration 125 checking for settings field ([#11364](https://github.com/RocketChat/Rocket.Chat/pull/11364))
 
 </details>
@@ -4268,14 +6220,20 @@
 
 ### 🚀 Improvements
 
+
 - Setup Wizard username validation, step progress and optin/optout ([#11254](https://github.com/RocketChat/Rocket.Chat/pull/11254))
 
 ### 🐛 Bug fixes
 
+
 - Some updates were returning errors when based on queries with position operators ([#11335](https://github.com/RocketChat/Rocket.Chat/pull/11335))
+
 - SAML attributes with periods are not properly read. ([#11315](https://github.com/RocketChat/Rocket.Chat/pull/11315) by [@Hudell](https://github.com/Hudell))
+
 - Outgoing integrations were stopping the oplog tailing sometimes ([#11333](https://github.com/RocketChat/Rocket.Chat/pull/11333))
+
 - Livestream muted when audio only option was enabled ([#11267](https://github.com/RocketChat/Rocket.Chat/pull/11267) by [@gdelavald](https://github.com/gdelavald))
+
 - Notification preferences being lost when switching view mode ([#11295](https://github.com/RocketChat/Rocket.Chat/pull/11295))
 
 ### 👩‍💻👨‍💻 Contributors 😍
@@ -4299,147 +6257,276 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Always remove the field `services` from user data responses in REST API ([#10799](https://github.com/RocketChat/Rocket.Chat/pull/10799))
 
 ### 🎉 New features
 
+
 - Youtube Broadcasting ([#10127](https://github.com/RocketChat/Rocket.Chat/pull/10127) by [@gdelavald](https://github.com/gdelavald))
+
 - REST API endpoints `permissions.list` and `permissions.update`. Deprecated endpoint `permissions` ([#10975](https://github.com/RocketChat/Rocket.Chat/pull/10975) by [@vynmera](https://github.com/vynmera))
+
 - REST API endpoint `channels.setDefault` ([#10941](https://github.com/RocketChat/Rocket.Chat/pull/10941) by [@vynmera](https://github.com/vynmera))
+
 - Set Document Domain property in IFrame ([#9751](https://github.com/RocketChat/Rocket.Chat/pull/9751) by [@kb0304](https://github.com/kb0304))
+
 - Custom login wallpapers ([#11025](https://github.com/RocketChat/Rocket.Chat/pull/11025) by [@vynmera](https://github.com/vynmera))
+
 - Support for dynamic slack and rocket.chat channels ([#10205](https://github.com/RocketChat/Rocket.Chat/pull/10205) by [@Hudell](https://github.com/Hudell) & [@kable-wilmoth](https://github.com/kable-wilmoth))
+
 - Add prometheus port config ([#11115](https://github.com/RocketChat/Rocket.Chat/pull/11115) by [@brylie](https://github.com/brylie) & [@stuartpb](https://github.com/stuartpb) & [@thaiphv](https://github.com/thaiphv))
+
 - Button to remove closed LiveChat rooms ([#10301](https://github.com/RocketChat/Rocket.Chat/pull/10301))
+
 - Update katex to v0.9.0 ([#8402](https://github.com/RocketChat/Rocket.Chat/pull/8402) by [@pitamar](https://github.com/pitamar))
+
 - WebDAV(Nextcloud/ownCloud) Storage Server Option ([#11027](https://github.com/RocketChat/Rocket.Chat/pull/11027) by [@karakayasemi](https://github.com/karakayasemi))
+
 - Don't ask me again checkbox on hide room modal ([#10973](https://github.com/RocketChat/Rocket.Chat/pull/10973) by [@karlprieb](https://github.com/karlprieb))
+
 - Add input to set time for avatar cache control ([#10958](https://github.com/RocketChat/Rocket.Chat/pull/10958))
+
 - Command /hide to hide channels ([#10727](https://github.com/RocketChat/Rocket.Chat/pull/10727) by [@mikaelmello](https://github.com/mikaelmello))
+
 - Do not wait method calls response on websocket before next method call ([#11087](https://github.com/RocketChat/Rocket.Chat/pull/11087))
+
 - Disconnect users from websocket when away from the login screen for 10min ([#11086](https://github.com/RocketChat/Rocket.Chat/pull/11086))
+
 - Reduce the amount of DDP API calls on login screen ([#11083](https://github.com/RocketChat/Rocket.Chat/pull/11083))
+
 - Option to trace Methods and Subscription calls ([#11085](https://github.com/RocketChat/Rocket.Chat/pull/11085))
+
 - Replace variable 'mergeChannels' with 'groupByType'. ([#10954](https://github.com/RocketChat/Rocket.Chat/pull/10954) by [@mikaelmello](https://github.com/mikaelmello))
+
 - Send LiveChat visitor navigation history as messages ([#10091](https://github.com/RocketChat/Rocket.Chat/pull/10091))
+
 - Make supplying an AWS access key and secret optional for S3 uploads ([#10673](https://github.com/RocketChat/Rocket.Chat/pull/10673) by [@saplla](https://github.com/saplla))
+
 - Direct Reply: separate Reply-To email from account username field ([#10988](https://github.com/RocketChat/Rocket.Chat/pull/10988) by [@pkgodara](https://github.com/pkgodara))
+
 - Changes all 'mergeChannels' to 'groupByType'. ([#10055](https://github.com/RocketChat/Rocket.Chat/pull/10055) by [@mikaelmello](https://github.com/mikaelmello))
+
 - Update WeDeploy deployment ([#10841](https://github.com/RocketChat/Rocket.Chat/pull/10841) by [@jonnilundy](https://github.com/jonnilundy))
 
 ### 🚀 Improvements
 
+
 - Listing of apps in the admin page ([#11166](https://github.com/RocketChat/Rocket.Chat/pull/11166) by [@gdelavald](https://github.com/gdelavald) & [@karlprieb](https://github.com/karlprieb))
+
 - UI design for Tables and tabs component on Directory ([#11026](https://github.com/RocketChat/Rocket.Chat/pull/11026) by [@karlprieb](https://github.com/karlprieb))
+
 - User mentions ([#11001](https://github.com/RocketChat/Rocket.Chat/pull/11001) by [@vynmera](https://github.com/vynmera))
 
 ### 🐛 Bug fixes
 
+
 - Wordpress oauth configuration not loading properly ([#11187](https://github.com/RocketChat/Rocket.Chat/pull/11187) by [@Hudell](https://github.com/Hudell))
+
 - REST API: Add more test cases for `/login` ([#10999](https://github.com/RocketChat/Rocket.Chat/pull/10999))
+
 - Wrong font-family order ([#11191](https://github.com/RocketChat/Rocket.Chat/pull/11191) by [@Hudell](https://github.com/Hudell) & [@myfonj](https://github.com/myfonj))
+
 - REST endpoint `users.updateOwnBasicInfo` was not returning errors for invalid names and trying to save custom fields when empty ([#11204](https://github.com/RocketChat/Rocket.Chat/pull/11204))
+
 - Livechat visitor not being prompted for transcript when himself is closing the chat ([#10767](https://github.com/RocketChat/Rocket.Chat/pull/10767))
+
 - HipChat Cloud import fails to import rooms ([#11188](https://github.com/RocketChat/Rocket.Chat/pull/11188) by [@Hudell](https://github.com/Hudell))
+
 - Failure to download user data ([#11190](https://github.com/RocketChat/Rocket.Chat/pull/11190) by [@Hudell](https://github.com/Hudell))
+
 - Add parameter to REST chat.react endpoint, to make it work like a setter ([#10447](https://github.com/RocketChat/Rocket.Chat/pull/10447))
+
 - Default selected language ([#11150](https://github.com/RocketChat/Rocket.Chat/pull/11150))
+
 - Rendering of emails and mentions in messages ([#11165](https://github.com/RocketChat/Rocket.Chat/pull/11165))
+
 - Livechat icon with status ([#11177](https://github.com/RocketChat/Rocket.Chat/pull/11177))
+
 - remove sidebar on embedded view ([#11183](https://github.com/RocketChat/Rocket.Chat/pull/11183))
+
 - Missing language constants ([#11173](https://github.com/RocketChat/Rocket.Chat/pull/11173) by [@rw4lll](https://github.com/rw4lll))
+
 - Room creation error due absence of subscriptions ([#11178](https://github.com/RocketChat/Rocket.Chat/pull/11178))
+
 - Remove failed upload messages when switching rooms ([#11132](https://github.com/RocketChat/Rocket.Chat/pull/11132))
+
 - Wordpress OAuth not providing enough info to log in  ([#11152](https://github.com/RocketChat/Rocket.Chat/pull/11152) by [@Hudell](https://github.com/Hudell))
+
 - /groups.invite not allow a user to invite even with permission ([#11010](https://github.com/RocketChat/Rocket.Chat/pull/11010) by [@Hudell](https://github.com/Hudell))
+
 - Various lang fixes [RU] ([#10095](https://github.com/RocketChat/Rocket.Chat/pull/10095) by [@rw4lll](https://github.com/rw4lll))
+
 - set-toolbar-items postMessage ([#11109](https://github.com/RocketChat/Rocket.Chat/pull/11109))
+
 - title and value attachments are optionals on sendMessage method ([#11021](https://github.com/RocketChat/Rocket.Chat/pull/11021))
+
 - Some typos in the error message names ([#11136](https://github.com/RocketChat/Rocket.Chat/pull/11136) by [@vynmera](https://github.com/vynmera))
+
 - open conversation from room info ([#11050](https://github.com/RocketChat/Rocket.Chat/pull/11050))
+
 - Users model was not receiving options ([#11129](https://github.com/RocketChat/Rocket.Chat/pull/11129))
+
 - Popover position ([#11113](https://github.com/RocketChat/Rocket.Chat/pull/11113))
+
 - Generated random password visible to the user ([#11096](https://github.com/RocketChat/Rocket.Chat/pull/11096))
+
 - LiveChat appearance changes not being saved ([#11111](https://github.com/RocketChat/Rocket.Chat/pull/11111))
+
 - Confirm password on set new password user profile ([#11095](https://github.com/RocketChat/Rocket.Chat/pull/11095))
+
 - Message_AllowedMaxSize fails for emoji sequences ([#10431](https://github.com/RocketChat/Rocket.Chat/pull/10431) by [@c0dzilla](https://github.com/c0dzilla))
+
 - Can't access the `/account/profile` ([#11089](https://github.com/RocketChat/Rocket.Chat/pull/11089))
+
 - Idle time limit wasn’t working as expected ([#11084](https://github.com/RocketChat/Rocket.Chat/pull/11084))
+
 - Rooms list sorting by activity multiple re-renders and case sensitive sorting alphabetically ([#9959](https://github.com/RocketChat/Rocket.Chat/pull/9959) by [@JoseRenan](https://github.com/JoseRenan) & [@karlprieb](https://github.com/karlprieb))
+
 - Notification not working for group mentions and not respecting ignored users ([#11024](https://github.com/RocketChat/Rocket.Chat/pull/11024))
+
 - Overlapping of search text and cancel search icon (X) ([#10294](https://github.com/RocketChat/Rocket.Chat/pull/10294) by [@taeven](https://github.com/taeven))
+
 - Link previews not being removed from messages after removed on editing ([#11063](https://github.com/RocketChat/Rocket.Chat/pull/11063))
+
 - avoid send presence without login ([#11074](https://github.com/RocketChat/Rocket.Chat/pull/11074))
+
 - Exception in metrics generation ([#11072](https://github.com/RocketChat/Rocket.Chat/pull/11072))
+
 - Build for Sandstorm missing dependence for capnp ([#11056](https://github.com/RocketChat/Rocket.Chat/pull/11056) by [@peterlee0127](https://github.com/peterlee0127))
+
 - flex-tab icons missing ([#11049](https://github.com/RocketChat/Rocket.Chat/pull/11049))
+
 - Update ja.i18n.json ([#11020](https://github.com/RocketChat/Rocket.Chat/pull/11020) by [@Hudell](https://github.com/Hudell) & [@noobbbbb](https://github.com/noobbbbb))
+
 - Strange msg when setting room announcement, topic or description to be empty ([#11012](https://github.com/RocketChat/Rocket.Chat/pull/11012) by [@vynmera](https://github.com/vynmera))
+
 - Exception thrown on avatar validation ([#11009](https://github.com/RocketChat/Rocket.Chat/pull/11009) by [@Hudell](https://github.com/Hudell))
+
 - Preview of large images not resizing to fit the area and having scrollbars ([#10998](https://github.com/RocketChat/Rocket.Chat/pull/10998) by [@vynmera](https://github.com/vynmera))
+
 - Allow inviting livechat managers to the same LiveChat room ([#10956](https://github.com/RocketChat/Rocket.Chat/pull/10956))
+
 - Cannot read property 'debug' of undefined when trying to use REST API ([#10805](https://github.com/RocketChat/Rocket.Chat/pull/10805) by [@haffla](https://github.com/haffla))
+
 - Icons svg xml structure ([#10771](https://github.com/RocketChat/Rocket.Chat/pull/10771) by [@timkinnane](https://github.com/timkinnane))
+
 - Remove outdated 2FA warning for mobile clients ([#10916](https://github.com/RocketChat/Rocket.Chat/pull/10916) by [@cardoso](https://github.com/cardoso))
+
 - Update Sandstorm build config ([#10867](https://github.com/RocketChat/Rocket.Chat/pull/10867) by [@ocdtrekkie](https://github.com/ocdtrekkie))
+
 - "blank messages" on iOS < 11 ([#11221](https://github.com/RocketChat/Rocket.Chat/pull/11221))
+
 - "blank" screen on iOS < 11 ([#11199](https://github.com/RocketChat/Rocket.Chat/pull/11199))
+
 - The process was freezing in some cases when HTTP calls exceeds timeout on integrations ([#11253](https://github.com/RocketChat/Rocket.Chat/pull/11253))
+
 - LDAP was accepting login with empty passwords for certain AD configurations ([#11264](https://github.com/RocketChat/Rocket.Chat/pull/11264))
+
 - Update capnproto dependence for Sandstorm Build ([#11263](https://github.com/RocketChat/Rocket.Chat/pull/11263) by [@peterlee0127](https://github.com/peterlee0127))
+
 - Internal Server Error on first login with CAS integration ([#11257](https://github.com/RocketChat/Rocket.Chat/pull/11257) by [@Hudell](https://github.com/Hudell))
+
 - Armhf snap build ([#11268](https://github.com/RocketChat/Rocket.Chat/pull/11268))
+
 - Reaction Toggle was not working when omitting the last parameter from the API (DDP and REST) ([#11276](https://github.com/RocketChat/Rocket.Chat/pull/11276) by [@Hudell](https://github.com/Hudell))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Merge master into develop & Set version to 0.66.0-develop ([#11277](https://github.com/RocketChat/Rocket.Chat/pull/11277) by [@Hudell](https://github.com/Hudell) & [@brylie](https://github.com/brylie) & [@stuartpb](https://github.com/stuartpb))
+
 - Regression: Directory css ([#11206](https://github.com/RocketChat/Rocket.Chat/pull/11206) by [@karlprieb](https://github.com/karlprieb))
+
 - LingoHub based on develop ([#11208](https://github.com/RocketChat/Rocket.Chat/pull/11208))
+
 - IRC Federation: RFC2813 implementation (ngIRCd) ([#10113](https://github.com/RocketChat/Rocket.Chat/pull/10113) by [@Hudell](https://github.com/Hudell) & [@cpitman](https://github.com/cpitman) & [@lindoelio](https://github.com/lindoelio))
+
 - Add verification to make sure the user exists in REST  insert object helper ([#11008](https://github.com/RocketChat/Rocket.Chat/pull/11008))
+
 - Regression: Directory user table infinite scroll doesn't working ([#11200](https://github.com/RocketChat/Rocket.Chat/pull/11200) by [@karlprieb](https://github.com/karlprieb))
+
 - [FIX Readme] Nodejs + Python version spicifications ([#11181](https://github.com/RocketChat/Rocket.Chat/pull/11181) by [@mahdiyari](https://github.com/mahdiyari))
+
 - Regression: sorting direct message by asc on favorites group ([#11090](https://github.com/RocketChat/Rocket.Chat/pull/11090))
+
 - Fix PR Docker image creation by splitting in two build jobs ([#11107](https://github.com/RocketChat/Rocket.Chat/pull/11107))
+
 - Update v126.js ([#11103](https://github.com/RocketChat/Rocket.Chat/pull/11103))
+
 - Speed up the build time by removing JSON Minify from i18n package ([#11097](https://github.com/RocketChat/Rocket.Chat/pull/11097))
+
 - Fix Docker image for develop commits ([#11093](https://github.com/RocketChat/Rocket.Chat/pull/11093))
+
 - Build Docker image on CI ([#11076](https://github.com/RocketChat/Rocket.Chat/pull/11076))
+
 - Update issue templates ([#11070](https://github.com/RocketChat/Rocket.Chat/pull/11070))
+
 - LingoHub based on develop ([#11062](https://github.com/RocketChat/Rocket.Chat/pull/11062))
+
 - LingoHub based on develop ([#11054](https://github.com/RocketChat/Rocket.Chat/pull/11054))
+
 - LingoHub based on develop ([#11053](https://github.com/RocketChat/Rocket.Chat/pull/11053))
+
 - LingoHub based on develop ([#11051](https://github.com/RocketChat/Rocket.Chat/pull/11051))
+
 - LingoHub based on develop ([#11045](https://github.com/RocketChat/Rocket.Chat/pull/11045))
+
 - LingoHub based on develop ([#11044](https://github.com/RocketChat/Rocket.Chat/pull/11044))
+
 - LingoHub based on develop ([#11043](https://github.com/RocketChat/Rocket.Chat/pull/11043))
+
 - LingoHub based on develop ([#11042](https://github.com/RocketChat/Rocket.Chat/pull/11042))
+
 - Changed 'confirm password' placeholder text on user registration form ([#9969](https://github.com/RocketChat/Rocket.Chat/pull/9969) by [@kumarnitj](https://github.com/kumarnitj))
+
 - LingoHub based on develop ([#11039](https://github.com/RocketChat/Rocket.Chat/pull/11039))
+
 - LingoHub based on develop ([#11035](https://github.com/RocketChat/Rocket.Chat/pull/11035))
+
 - Update Documentation: README.md ([#10207](https://github.com/RocketChat/Rocket.Chat/pull/10207) by [@rakhi2104](https://github.com/rakhi2104))
+
 - NPM Dependencies Update ([#10913](https://github.com/RocketChat/Rocket.Chat/pull/10913))
+
 - update meteor to 1.6.1 for sandstorm build ([#10131](https://github.com/RocketChat/Rocket.Chat/pull/10131) by [@peterlee0127](https://github.com/peterlee0127))
+
 - Renaming username.username to username.value for clarity ([#10986](https://github.com/RocketChat/Rocket.Chat/pull/10986))
+
 - Fix readme typo ([#5](https://github.com/RocketChat/Rocket.Chat/pull/5) by [@filipealva](https://github.com/filipealva))
+
 - Remove wrong and not needed time unit ([#10807](https://github.com/RocketChat/Rocket.Chat/pull/10807) by [@cliffparnitzky](https://github.com/cliffparnitzky))
+
 - Develop sync commits ([#10909](https://github.com/RocketChat/Rocket.Chat/pull/10909) by [@nsuchy](https://github.com/nsuchy) & [@rafaelks](https://github.com/rafaelks))
+
 - Develop sync2 ([#10908](https://github.com/RocketChat/Rocket.Chat/pull/10908) by [@nsuchy](https://github.com/nsuchy) & [@rafaelks](https://github.com/rafaelks))
+
 - Merge master into develop & Set version to 0.66.0-develop ([#10903](https://github.com/RocketChat/Rocket.Chat/pull/10903) by [@nsuchy](https://github.com/nsuchy) & [@rafaelks](https://github.com/rafaelks))
+
 - Regression: Fix directory table loading ([#11223](https://github.com/RocketChat/Rocket.Chat/pull/11223) by [@karlprieb](https://github.com/karlprieb))
+
 - Regression: Fix latest and release-candidate docker images building ([#11215](https://github.com/RocketChat/Rocket.Chat/pull/11215))
+
 - Regression: check username or usersCount on browseChannels ([#11216](https://github.com/RocketChat/Rocket.Chat/pull/11216))
+
 - Regression: Sending message with a mention is not showing to sender ([#11211](https://github.com/RocketChat/Rocket.Chat/pull/11211))
+
 - Regression: Prometheus was not being enabled in some cases ([#11249](https://github.com/RocketChat/Rocket.Chat/pull/11249))
+
 - Regression: Skip operations if no actions on livechat migration ([#11232](https://github.com/RocketChat/Rocket.Chat/pull/11232))
+
 - Regression: Directory sort users, fix null results, text for empty results ([#11224](https://github.com/RocketChat/Rocket.Chat/pull/11224))
+
 - LingoHub based on develop ([#11246](https://github.com/RocketChat/Rocket.Chat/pull/11246))
+
 - Update Meteor to 1.6.1.3 ([#11247](https://github.com/RocketChat/Rocket.Chat/pull/11247))
+
 - New history source format & add Node and NPM versions ([#11237](https://github.com/RocketChat/Rocket.Chat/pull/11237))
+
 - Add Dockerfile with MongoDB ([#10971](https://github.com/RocketChat/Rocket.Chat/pull/10971))
+
 - Regression: sidebar sorting was being wrong in some cases where the rooms records were returned before the subscriptions ([#11273](https://github.com/RocketChat/Rocket.Chat/pull/11273))
+
 - Fix Docker image build on tags ([#11271](https://github.com/RocketChat/Rocket.Chat/pull/11271))
 
 </details>
@@ -4504,11 +6591,13 @@
 
 ### 🐛 Bug fixes
 
+
 - i18n - add semantic markup ([#9534](https://github.com/RocketChat/Rocket.Chat/pull/9534) by [@brylie](https://github.com/brylie))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.65.1 ([#10947](https://github.com/RocketChat/Rocket.Chat/pull/10947))
 
 </details>
@@ -4532,10 +6621,15 @@
 
 ### 🐛 Bug fixes
 
+
 - Livechat not loading ([#10940](https://github.com/RocketChat/Rocket.Chat/pull/10940))
+
 - Application crashing on startup when trying to log errors to `exceptions` channel ([#10934](https://github.com/RocketChat/Rocket.Chat/pull/10934))
+
 - Incomplete email notification link ([#10928](https://github.com/RocketChat/Rocket.Chat/pull/10928))
+
 - Image lazy load was breaking attachments ([#10904](https://github.com/RocketChat/Rocket.Chat/pull/10904))
+
 - Leave room wasn't working as expected ([#10851](https://github.com/RocketChat/Rocket.Chat/pull/10851))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -4553,56 +6647,100 @@
 
 ### 🎉 New features
 
+
 - Implement a local password policy ([#9857](https://github.com/RocketChat/Rocket.Chat/pull/9857))
+
 - Options to enable/disable each Livechat registration form field ([#10584](https://github.com/RocketChat/Rocket.Chat/pull/10584))
+
 - Return the result of the `/me` endpoint within the result of the `/login` endpoint ([#10677](https://github.com/RocketChat/Rocket.Chat/pull/10677))
+
 - Lazy load image attachments ([#10608](https://github.com/RocketChat/Rocket.Chat/pull/10608) by [@karlprieb](https://github.com/karlprieb))
+
 - View pinned message's attachment ([#10214](https://github.com/RocketChat/Rocket.Chat/pull/10214) by [@c0dzilla](https://github.com/c0dzilla) & [@karlprieb](https://github.com/karlprieb))
+
 - Add REST API endpoint `users.getUsernameSuggestion` to get username suggestion ([#10702](https://github.com/RocketChat/Rocket.Chat/pull/10702))
+
 - REST API endpoint `settings` now allow set colors and trigger actions ([#10488](https://github.com/RocketChat/Rocket.Chat/pull/10488) by [@ThomasRoehl](https://github.com/ThomasRoehl))
+
 - Add REST endpoint `subscriptions.unread` to mark messages as unread ([#10778](https://github.com/RocketChat/Rocket.Chat/pull/10778))
+
 - REST API endpoint `/me` now returns all the settings, including the default values ([#10662](https://github.com/RocketChat/Rocket.Chat/pull/10662))
+
 - Now is possible to access files using header authorization (`x-user-id` and `x-auth-token`) ([#10741](https://github.com/RocketChat/Rocket.Chat/pull/10741))
+
 - Add REST API endpoints `channels.counters`, `groups.counters and `im.counters` ([#9679](https://github.com/RocketChat/Rocket.Chat/pull/9679) by [@xbolshe](https://github.com/xbolshe))
+
 - Add REST API endpoints `channels.setCustomFields` and `groups.setCustomFields` ([#9733](https://github.com/RocketChat/Rocket.Chat/pull/9733) by [@xbolshe](https://github.com/xbolshe))
+
 - Add permission `view-broadcast-member-list` ([#10753](https://github.com/RocketChat/Rocket.Chat/pull/10753) by [@cardoso](https://github.com/cardoso))
 
 ### 🐛 Bug fixes
 
+
 - Livechat managers were not being able to send messages in some cases ([#10663](https://github.com/RocketChat/Rocket.Chat/pull/10663))
+
 - Livechat settings not appearing correctly ([#10612](https://github.com/RocketChat/Rocket.Chat/pull/10612))
+
 - Enabling `Collapse Embedded Media by Default` was hiding replies and quotes ([#10427](https://github.com/RocketChat/Rocket.Chat/pull/10427) by [@c0dzilla](https://github.com/c0dzilla))
+
 - Missing option to disable/enable System Messages ([#10704](https://github.com/RocketChat/Rocket.Chat/pull/10704))
+
 - Remove outdated translations of Internal Hubot's description of Scripts to Load that were pointing to a non existent address ([#10448](https://github.com/RocketChat/Rocket.Chat/pull/10448) by [@Hudell](https://github.com/Hudell))
+
 - UI was not disabling the actions when users has had no permissions to create channels or add users to rooms ([#10564](https://github.com/RocketChat/Rocket.Chat/pull/10564) by [@cfunkles](https://github.com/cfunkles) & [@chuckAtCataworx](https://github.com/chuckAtCataworx))
+
 - Private settings were not being cleared from client cache in some cases ([#10625](https://github.com/RocketChat/Rocket.Chat/pull/10625) by [@Hudell](https://github.com/Hudell))
+
 - Internal Error when requesting user data download ([#10837](https://github.com/RocketChat/Rocket.Chat/pull/10837) by [@Hudell](https://github.com/Hudell))
+
 - Broadcast channels were showing reply button for deleted messages and generating wrong reply links some times ([#10835](https://github.com/RocketChat/Rocket.Chat/pull/10835))
+
 - User's preference `Unread on Top` wasn't working for LiveChat rooms ([#10734](https://github.com/RocketChat/Rocket.Chat/pull/10734))
+
 - Cancel button wasn't working while uploading file ([#10715](https://github.com/RocketChat/Rocket.Chat/pull/10715) by [@Mr-Gryphon](https://github.com/Mr-Gryphon) & [@karlprieb](https://github.com/karlprieb))
+
 - Missing pagination fields in the response of REST /directory endpoint ([#10840](https://github.com/RocketChat/Rocket.Chat/pull/10840))
+
 - Layout badge cutting on unread messages for long names ([#10846](https://github.com/RocketChat/Rocket.Chat/pull/10846) by [@kos4live](https://github.com/kos4live))
+
 - Slack-Bridge bug when migrating to 0.64.1 ([#10875](https://github.com/RocketChat/Rocket.Chat/pull/10875))
+
 - Horizontally align items in preview message ([#10883](https://github.com/RocketChat/Rocket.Chat/pull/10883) by [@gdelavald](https://github.com/gdelavald))
+
 - The first users was not set as admin some times ([#10878](https://github.com/RocketChat/Rocket.Chat/pull/10878))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.65.0 ([#10893](https://github.com/RocketChat/Rocket.Chat/pull/10893) by [@Hudell](https://github.com/Hudell) & [@Sameesunkaria](https://github.com/Sameesunkaria) & [@cardoso](https://github.com/cardoso) & [@erhan-](https://github.com/erhan-) & [@gdelavald](https://github.com/gdelavald) & [@karlprieb](https://github.com/karlprieb) & [@peccu](https://github.com/peccu) & [@winterstefan](https://github.com/winterstefan))
+
 - Apps: Command Previews, Message and Room Removal Events ([#10822](https://github.com/RocketChat/Rocket.Chat/pull/10822))
+
 - Develop sync ([#10815](https://github.com/RocketChat/Rocket.Chat/pull/10815) by [@nsuchy](https://github.com/nsuchy) & [@rafaelks](https://github.com/rafaelks))
+
 - Major dependencies update ([#10661](https://github.com/RocketChat/Rocket.Chat/pull/10661))
+
 - Prevent setup wizard redirects ([#10811](https://github.com/RocketChat/Rocket.Chat/pull/10811))
+
 - Fix: Regression in REST API endpoint `/me`  ([#10833](https://github.com/RocketChat/Rocket.Chat/pull/10833))
+
 - Regression: Fix email notification preference not showing correct selected value ([#10847](https://github.com/RocketChat/Rocket.Chat/pull/10847))
+
 - Apps: Command previews are clickable & Apps Framework is controlled via a setting ([#10853](https://github.com/RocketChat/Rocket.Chat/pull/10853))
+
 - Regression: Make settings `Site_Name` and `Language` public again ([#10848](https://github.com/RocketChat/Rocket.Chat/pull/10848))
+
 - Fix: Clarify the wording of the release issue template ([#10520](https://github.com/RocketChat/Rocket.Chat/pull/10520))
+
 - Fix: Regression on users avatar in admin pages ([#10836](https://github.com/RocketChat/Rocket.Chat/pull/10836))
+
 - Fix: Manage apps layout was a bit confuse ([#10882](https://github.com/RocketChat/Rocket.Chat/pull/10882) by [@gdelavald](https://github.com/gdelavald))
+
 - LingoHub based on develop ([#10886](https://github.com/RocketChat/Rocket.Chat/pull/10886))
+
 - Fix: Regression Lazyload fix shuffle avatars ([#10887](https://github.com/RocketChat/Rocket.Chat/pull/10887))
+
 - Fix: typo on error message for push token API ([#10857](https://github.com/RocketChat/Rocket.Chat/pull/10857) by [@rafaelks](https://github.com/rafaelks))
 
 </details>
@@ -4647,67 +6785,122 @@
 
 ### 🎉 New features
 
+
 - Add REST endpoints `channels.roles` & `groups.roles` ([#10607](https://github.com/RocketChat/Rocket.Chat/pull/10607) by [@cardoso](https://github.com/cardoso) & [@rafaelks](https://github.com/rafaelks))
+
 - Add more options for Wordpress OAuth configuration ([#10724](https://github.com/RocketChat/Rocket.Chat/pull/10724) by [@Hudell](https://github.com/Hudell))
+
 - Setup Wizard ([#10523](https://github.com/RocketChat/Rocket.Chat/pull/10523) by [@karlprieb](https://github.com/karlprieb))
+
 - Improvements to notifications logic ([#10686](https://github.com/RocketChat/Rocket.Chat/pull/10686))
+
 - Add REST endpoints `channels.roles` & `groups.roles` ([#10607](https://github.com/RocketChat/Rocket.Chat/pull/10607) by [@cardoso](https://github.com/cardoso) & [@rafaelks](https://github.com/rafaelks))
+
 - Add more options for Wordpress OAuth configuration ([#10724](https://github.com/RocketChat/Rocket.Chat/pull/10724) by [@Hudell](https://github.com/Hudell))
+
 - Setup Wizard ([#10523](https://github.com/RocketChat/Rocket.Chat/pull/10523) by [@karlprieb](https://github.com/karlprieb))
+
 - Improvements to notifications logic ([#10686](https://github.com/RocketChat/Rocket.Chat/pull/10686))
 
 ### 🐛 Bug fixes
 
+
 - Not escaping special chars on mentions ([#10793](https://github.com/RocketChat/Rocket.Chat/pull/10793) by [@erhan-](https://github.com/erhan-))
+
 - Send a message when muted returns inconsistent result in chat.sendMessage ([#10720](https://github.com/RocketChat/Rocket.Chat/pull/10720))
+
 - Regression: Empty content on announcement modal ([#10733](https://github.com/RocketChat/Rocket.Chat/pull/10733) by [@gdelavald](https://github.com/gdelavald))
+
 - Missing attachment description when Rocket.Chat Apps were enabled ([#10705](https://github.com/RocketChat/Rocket.Chat/pull/10705) by [@Hudell](https://github.com/Hudell))
+
 - Improve desktop notification formatting ([#10445](https://github.com/RocketChat/Rocket.Chat/pull/10445) by [@Sameesunkaria](https://github.com/Sameesunkaria))
+
 - Message box emoji icon was flickering when typing a text ([#10678](https://github.com/RocketChat/Rocket.Chat/pull/10678) by [@gdelavald](https://github.com/gdelavald))
+
 - Channel owner was being set as muted when creating a read-only channel ([#10665](https://github.com/RocketChat/Rocket.Chat/pull/10665))
+
 - SAML wasn't working correctly when running multiple instances ([#10681](https://github.com/RocketChat/Rocket.Chat/pull/10681) by [@Hudell](https://github.com/Hudell))
+
 - Send a message when muted returns inconsistent result in chat.sendMessage ([#10720](https://github.com/RocketChat/Rocket.Chat/pull/10720))
+
 - Regression: Empty content on announcement modal ([#10733](https://github.com/RocketChat/Rocket.Chat/pull/10733) by [@gdelavald](https://github.com/gdelavald))
+
 - Missing attachment description when Rocket.Chat Apps were enabled ([#10705](https://github.com/RocketChat/Rocket.Chat/pull/10705) by [@Hudell](https://github.com/Hudell))
+
 - Improve desktop notification formatting ([#10445](https://github.com/RocketChat/Rocket.Chat/pull/10445) by [@Sameesunkaria](https://github.com/Sameesunkaria))
+
 - Message box emoji icon was flickering when typing a text ([#10678](https://github.com/RocketChat/Rocket.Chat/pull/10678) by [@gdelavald](https://github.com/gdelavald))
+
 - Channel owner was being set as muted when creating a read-only channel ([#10665](https://github.com/RocketChat/Rocket.Chat/pull/10665))
+
 - SAML wasn't working correctly when running multiple instances ([#10681](https://github.com/RocketChat/Rocket.Chat/pull/10681) by [@Hudell](https://github.com/Hudell))
+
 - Not escaping special chars on mentions ([#10793](https://github.com/RocketChat/Rocket.Chat/pull/10793) by [@erhan-](https://github.com/erhan-))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.64.2 ([#10812](https://github.com/RocketChat/Rocket.Chat/pull/10812) by [@Hudell](https://github.com/Hudell) & [@Sameesunkaria](https://github.com/Sameesunkaria) & [@cardoso](https://github.com/cardoso) & [@erhan-](https://github.com/erhan-) & [@gdelavald](https://github.com/gdelavald) & [@karlprieb](https://github.com/karlprieb) & [@peccu](https://github.com/peccu) & [@winterstefan](https://github.com/winterstefan))
+
 - Prometheus: Add metric to track hooks time ([#10798](https://github.com/RocketChat/Rocket.Chat/pull/10798))
+
 - Regression: Autorun of wizard was not destroyed after completion ([#10802](https://github.com/RocketChat/Rocket.Chat/pull/10802))
+
 - Prometheus: Fix notification metric ([#10803](https://github.com/RocketChat/Rocket.Chat/pull/10803))
+
 - Regression: Fix wrong wizard field name ([#10804](https://github.com/RocketChat/Rocket.Chat/pull/10804))
+
 - Prometheus: Improve metric names ([#10789](https://github.com/RocketChat/Rocket.Chat/pull/10789))
+
 - Improvement to push notifications on direct messages ([#10788](https://github.com/RocketChat/Rocket.Chat/pull/10788))
+
 - Better metric for notifications ([#10786](https://github.com/RocketChat/Rocket.Chat/pull/10786))
+
 - Add badge back to push notifications ([#10779](https://github.com/RocketChat/Rocket.Chat/pull/10779))
+
 - Wizard improvements ([#10776](https://github.com/RocketChat/Rocket.Chat/pull/10776))
+
 - Add setting and expose prometheus on port 9100 ([#10766](https://github.com/RocketChat/Rocket.Chat/pull/10766))
+
 - Regression: Fix notifications for direct messages ([#10760](https://github.com/RocketChat/Rocket.Chat/pull/10760))
+
 - More improvements on send notifications logic ([#10736](https://github.com/RocketChat/Rocket.Chat/pull/10736))
+
 - LingoHub based on develop ([#10691](https://github.com/RocketChat/Rocket.Chat/pull/10691))
+
 - Add `npm run postinstall` into example build script ([#10524](https://github.com/RocketChat/Rocket.Chat/pull/10524) by [@peccu](https://github.com/peccu))
+
 - Correct links in README file ([#10674](https://github.com/RocketChat/Rocket.Chat/pull/10674) by [@winterstefan](https://github.com/winterstefan))
+
 - More improvements on send notifications logic ([#10736](https://github.com/RocketChat/Rocket.Chat/pull/10736))
+
 - LingoHub based on develop ([#10691](https://github.com/RocketChat/Rocket.Chat/pull/10691))
+
 - Add `npm run postinstall` into example build script ([#10524](https://github.com/RocketChat/Rocket.Chat/pull/10524) by [@peccu](https://github.com/peccu))
+
 - Correct links in README file ([#10674](https://github.com/RocketChat/Rocket.Chat/pull/10674) by [@winterstefan](https://github.com/winterstefan))
+
 - Prometheus: Improve metric names ([#10789](https://github.com/RocketChat/Rocket.Chat/pull/10789))
+
 - Improvement to push notifications on direct messages ([#10788](https://github.com/RocketChat/Rocket.Chat/pull/10788))
+
 - Better metric for notifications ([#10786](https://github.com/RocketChat/Rocket.Chat/pull/10786))
+
 - Add badge back to push notifications ([#10779](https://github.com/RocketChat/Rocket.Chat/pull/10779))
+
 - Wizard improvements ([#10776](https://github.com/RocketChat/Rocket.Chat/pull/10776))
+
 - Add setting and expose prometheus on port 9100 ([#10766](https://github.com/RocketChat/Rocket.Chat/pull/10766))
+
 - Regression: Fix notifications for direct messages ([#10760](https://github.com/RocketChat/Rocket.Chat/pull/10760))
+
 - Prometheus: Add metric to track hooks time ([#10798](https://github.com/RocketChat/Rocket.Chat/pull/10798))
+
 - Regression: Autorun of wizard was not destroyed after completion ([#10802](https://github.com/RocketChat/Rocket.Chat/pull/10802))
+
 - Prometheus: Fix notification metric ([#10803](https://github.com/RocketChat/Rocket.Chat/pull/10803))
+
 - Regression: Fix wrong wizard field name ([#10804](https://github.com/RocketChat/Rocket.Chat/pull/10804))
 
 </details>
@@ -4740,19 +6933,26 @@
 
 ### 🎉 New features
 
+
 - Store the last sent message to show bellow the room's name by default ([#10597](https://github.com/RocketChat/Rocket.Chat/pull/10597))
 
 ### 🐛 Bug fixes
 
+
 - E-mails were hidden some information ([#10615](https://github.com/RocketChat/Rocket.Chat/pull/10615))
+
 - Regression on 0.64.0 was freezing the application when posting some URLs ([#10627](https://github.com/RocketChat/Rocket.Chat/pull/10627))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.64.1 ([#10660](https://github.com/RocketChat/Rocket.Chat/pull/10660) by [@saplla](https://github.com/saplla))
+
 - Support passing extra connection options to the Mongo driver ([#10529](https://github.com/RocketChat/Rocket.Chat/pull/10529) by [@saplla](https://github.com/saplla))
+
 - Regression: Updating an App on multi-instance servers wasn't working ([#10611](https://github.com/RocketChat/Rocket.Chat/pull/10611))
+
 - Dependencies update ([#10648](https://github.com/RocketChat/Rocket.Chat/pull/10648))
 
 </details>
@@ -4777,110 +6977,205 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Validate incoming message schema ([#9922](https://github.com/RocketChat/Rocket.Chat/pull/9922))
+
 - The property "settings" is no longer available to regular users via rest api ([#10411](https://github.com/RocketChat/Rocket.Chat/pull/10411))
 
 ### 🎉 New features
 
+
 - Option to mute group mentions (@all and @here) ([#10502](https://github.com/RocketChat/Rocket.Chat/pull/10502) by [@Hudell](https://github.com/Hudell))
+
 - GDPR - Right to access and Data Portability ([#9906](https://github.com/RocketChat/Rocket.Chat/pull/9906) by [@Hudell](https://github.com/Hudell))
+
 - Broadcast Channels ([#9950](https://github.com/RocketChat/Rocket.Chat/pull/9950))
+
 - Option to ignore users on channels ([#10517](https://github.com/RocketChat/Rocket.Chat/pull/10517) by [@gdelavald](https://github.com/gdelavald) & [@karlprieb](https://github.com/karlprieb))
+
 - Search Provider Framework ([#10110](https://github.com/RocketChat/Rocket.Chat/pull/10110) by [@tkurz](https://github.com/tkurz))
+
 - REST API endpoint `/directory` ([#10442](https://github.com/RocketChat/Rocket.Chat/pull/10442))
+
 - Body of the payload on an incoming webhook is included on the request object ([#10259](https://github.com/RocketChat/Rocket.Chat/pull/10259) by [@Hudell](https://github.com/Hudell))
+
 - REST endpoint to recover forgotten password ([#10371](https://github.com/RocketChat/Rocket.Chat/pull/10371))
+
 - REST endpoint to report messages ([#10354](https://github.com/RocketChat/Rocket.Chat/pull/10354))
+
 - Livechat setting to customize ended conversation message ([#10108](https://github.com/RocketChat/Rocket.Chat/pull/10108))
+
 - Twilio MMS support for LiveChat integration ([#7964](https://github.com/RocketChat/Rocket.Chat/pull/7964) by [@t3hchipmunk](https://github.com/t3hchipmunk))
+
 - REST API endpoint `rooms.favorite` to favorite and unfavorite rooms ([#10342](https://github.com/RocketChat/Rocket.Chat/pull/10342))
+
 - Add internal API to handle room announcements ([#10396](https://github.com/RocketChat/Rocket.Chat/pull/10396) by [@gdelavald](https://github.com/gdelavald))
+
 - Add message preview when quoting another message ([#10437](https://github.com/RocketChat/Rocket.Chat/pull/10437) by [@gdelavald](https://github.com/gdelavald))
+
 - Prevent the browser to autocomplete some setting fields ([#10439](https://github.com/RocketChat/Rocket.Chat/pull/10439) by [@gdelavald](https://github.com/gdelavald))
+
 - Shows user's real name on autocomplete popup ([#10444](https://github.com/RocketChat/Rocket.Chat/pull/10444) by [@gdelavald](https://github.com/gdelavald))
+
 - Automatically trigger Redhat registry build when tagging new release ([#10414](https://github.com/RocketChat/Rocket.Chat/pull/10414))
+
 - Add information regarding Zapier and Bots to the integrations page ([#10574](https://github.com/RocketChat/Rocket.Chat/pull/10574))
 
 ### 🐛 Bug fixes
 
+
 - Missing "Administration" menu for users with some administration permissions ([#10551](https://github.com/RocketChat/Rocket.Chat/pull/10551) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
+
 - Member list search with no results ([#10599](https://github.com/RocketChat/Rocket.Chat/pull/10599))
+
 - Integrations with room data not having the usernames filled in ([#10576](https://github.com/RocketChat/Rocket.Chat/pull/10576))
+
 - Add user object to responses in /*.files Rest endpoints ([#10480](https://github.com/RocketChat/Rocket.Chat/pull/10480))
+
 - Missing user data on files uploaded through the API ([#10473](https://github.com/RocketChat/Rocket.Chat/pull/10473) by [@Hudell](https://github.com/Hudell))
+
 - Rename method to clean history of messages ([#10498](https://github.com/RocketChat/Rocket.Chat/pull/10498))
+
 - REST spotlight API wasn't allowing searches with # and @ ([#10410](https://github.com/RocketChat/Rocket.Chat/pull/10410))
+
 - Dropdown elements were using old styles ([#10482](https://github.com/RocketChat/Rocket.Chat/pull/10482) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
+
 - Directory sort and column sizes were wrong ([#10403](https://github.com/RocketChat/Rocket.Chat/pull/10403) by [@karlprieb](https://github.com/karlprieb))
+
 - REST API OAuth services endpoint were missing fields and flag to indicate custom services ([#10299](https://github.com/RocketChat/Rocket.Chat/pull/10299))
+
 - Error messages weren't been displayed when email verification fails ([#10446](https://github.com/RocketChat/Rocket.Chat/pull/10446) by [@Hudell](https://github.com/Hudell) & [@karlprieb](https://github.com/karlprieb))
+
 - Wrong column positions in the directory search for users ([#10454](https://github.com/RocketChat/Rocket.Chat/pull/10454) by [@karlprieb](https://github.com/karlprieb) & [@lunaticmonk](https://github.com/lunaticmonk))
+
 - Custom fields was misaligned in registration form ([#10463](https://github.com/RocketChat/Rocket.Chat/pull/10463) by [@dschuan](https://github.com/dschuan))
+
 - Unique identifier file not really being unique ([#10341](https://github.com/RocketChat/Rocket.Chat/pull/10341) by [@abernix](https://github.com/abernix))
+
 - Empty panel after changing a user's username ([#10404](https://github.com/RocketChat/Rocket.Chat/pull/10404) by [@Hudell](https://github.com/Hudell))
+
 - Russian translation of "False" ([#10418](https://github.com/RocketChat/Rocket.Chat/pull/10418) by [@strangerintheq](https://github.com/strangerintheq))
+
 - Links being embedded inside of blockquotes ([#10496](https://github.com/RocketChat/Rocket.Chat/pull/10496) by [@gdelavald](https://github.com/gdelavald))
+
 - The 'channel.messages' REST API Endpoint error ([#10485](https://github.com/RocketChat/Rocket.Chat/pull/10485) by [@rafaelks](https://github.com/rafaelks))
+
 - Button on user info contextual bar scrolling with the content ([#10358](https://github.com/RocketChat/Rocket.Chat/pull/10358) by [@karlprieb](https://github.com/karlprieb) & [@okaybroda](https://github.com/okaybroda))
+
 - "Idle Time Limit" using milliseconds instead of seconds ([#9824](https://github.com/RocketChat/Rocket.Chat/pull/9824) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
+
 - Missing i18n translation key for "Unread" ([#10387](https://github.com/RocketChat/Rocket.Chat/pull/10387) by [@Hudell](https://github.com/Hudell))
+
 - Owner unable to delete channel or group from APIs ([#9729](https://github.com/RocketChat/Rocket.Chat/pull/9729) by [@c0dzilla](https://github.com/c0dzilla))
+
 - Livechat translation files being ignored ([#10369](https://github.com/RocketChat/Rocket.Chat/pull/10369))
+
 - Missing page "not found" ([#6673](https://github.com/RocketChat/Rocket.Chat/pull/6673) by [@Prakharsvnit](https://github.com/Prakharsvnit) & [@karlprieb](https://github.com/karlprieb))
+
 - "Highlight Words" wasn't working with more than one word ([#10083](https://github.com/RocketChat/Rocket.Chat/pull/10083) by [@gdelavald](https://github.com/gdelavald) & [@nemaniarjun](https://github.com/nemaniarjun))
+
 - Missing "Administration" menu for user with manage-emoji permission ([#10171](https://github.com/RocketChat/Rocket.Chat/pull/10171) by [@c0dzilla](https://github.com/c0dzilla) & [@karlprieb](https://github.com/karlprieb))
+
 - Message view mode setting was missing at user's preferences  ([#10395](https://github.com/RocketChat/Rocket.Chat/pull/10395) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii) & [@karlprieb](https://github.com/karlprieb))
+
 - Profile image was not being shown in user's directory search ([#10399](https://github.com/RocketChat/Rocket.Chat/pull/10399) by [@karlprieb](https://github.com/karlprieb) & [@lunaticmonk](https://github.com/lunaticmonk))
+
 - Wrong positioning of popover when using RTL languages ([#10428](https://github.com/RocketChat/Rocket.Chat/pull/10428) by [@karlprieb](https://github.com/karlprieb))
+
 - Messages was grouping wrong some times when server is slow ([#10472](https://github.com/RocketChat/Rocket.Chat/pull/10472) by [@gdelavald](https://github.com/gdelavald) & [@karlprieb](https://github.com/karlprieb))
+
 - GitLab authentication scope was too open, reduced to read only access ([#10225](https://github.com/RocketChat/Rocket.Chat/pull/10225) by [@rafaelks](https://github.com/rafaelks))
+
 - Renaming agent's username within Livechat's department ([#10344](https://github.com/RocketChat/Rocket.Chat/pull/10344))
+
 - Missing RocketApps input types ([#10394](https://github.com/RocketChat/Rocket.Chat/pull/10394) by [@karlprieb](https://github.com/karlprieb))
+
 - Livechat desktop notifications not being displayed ([#10221](https://github.com/RocketChat/Rocket.Chat/pull/10221))
+
 - Autocomplete list when inviting a user was partial hidden ([#10409](https://github.com/RocketChat/Rocket.Chat/pull/10409) by [@karlprieb](https://github.com/karlprieb))
+
 - Remove a user from the user's list when creating a new channel removes the wrong user ([#10423](https://github.com/RocketChat/Rocket.Chat/pull/10423) by [@gdelavald](https://github.com/gdelavald) & [@karlprieb](https://github.com/karlprieb))
+
 - Room's name was cutting instead of having ellipses on sidebar ([#10430](https://github.com/RocketChat/Rocket.Chat/pull/10430))
+
 - Button to delete rooms by the owners wasn't appearing ([#10438](https://github.com/RocketChat/Rocket.Chat/pull/10438) by [@karlprieb](https://github.com/karlprieb))
+
 - Updated OpenShift Template to take an Image as a Param ([#9946](https://github.com/RocketChat/Rocket.Chat/pull/9946) by [@christianh814](https://github.com/christianh814))
+
 - Incoming integrations being able to trigger an empty message with a GET ([#9576](https://github.com/RocketChat/Rocket.Chat/pull/9576))
+
 - Snaps installations are breaking on avatar requests ([#10390](https://github.com/RocketChat/Rocket.Chat/pull/10390))
+
 - Wordpress oAuth authentication wasn't behaving correctly ([#10550](https://github.com/RocketChat/Rocket.Chat/pull/10550) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
+
 - Switch buttons were cutting in RTL mode ([#10558](https://github.com/RocketChat/Rocket.Chat/pull/10558))
+
 - Stop Firefox announcement overflowing viewport ([#10503](https://github.com/RocketChat/Rocket.Chat/pull/10503) by [@brendangadd](https://github.com/brendangadd))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.64.0 ([#10613](https://github.com/RocketChat/Rocket.Chat/pull/10613) by [@TwizzyDizzy](https://github.com/TwizzyDizzy) & [@christianh814](https://github.com/christianh814) & [@gdelavald](https://github.com/gdelavald) & [@tttt-conan](https://github.com/tttt-conan))
+
 - Regression: Various search provider fixes ([#10591](https://github.com/RocketChat/Rocket.Chat/pull/10591) by [@tkurz](https://github.com/tkurz))
+
 - Regression: /api/v1/settings.oauth not sending needed info for SAML & CAS ([#10596](https://github.com/RocketChat/Rocket.Chat/pull/10596) by [@cardoso](https://github.com/cardoso))
+
 - Regression: Apps and Livechats not getting along well with each other ([#10598](https://github.com/RocketChat/Rocket.Chat/pull/10598))
+
 - Development: Add Visual Studio Code debugging configuration ([#10586](https://github.com/RocketChat/Rocket.Chat/pull/10586))
+
 - Included missing lib for migrations ([#10532](https://github.com/RocketChat/Rocket.Chat/pull/10532) by [@Hudell](https://github.com/Hudell))
+
 - Develop sync ([#10505](https://github.com/RocketChat/Rocket.Chat/pull/10505) by [@nsuchy](https://github.com/nsuchy) & [@rafaelks](https://github.com/rafaelks))
+
 - Fix: Remove "secret" from REST endpoint /settings.oauth response ([#10513](https://github.com/RocketChat/Rocket.Chat/pull/10513))
+
 - [OTHER] More Listeners for Apps & Utilize Promises inside Apps ([#10335](https://github.com/RocketChat/Rocket.Chat/pull/10335))
+
 - [OTHER] Develop sync ([#10487](https://github.com/RocketChat/Rocket.Chat/pull/10487))
+
 - Change Docker-Compose to use mmapv1 storage engine for mongo ([#10336](https://github.com/RocketChat/Rocket.Chat/pull/10336))
+
 - Add some missing translations ([#10435](https://github.com/RocketChat/Rocket.Chat/pull/10435) by [@gdelavald](https://github.com/gdelavald))
+
 - [OTHER] Removed the developer warning on the rest api ([#10441](https://github.com/RocketChat/Rocket.Chat/pull/10441))
+
 - Fix and improve vietnamese translation ([#10397](https://github.com/RocketChat/Rocket.Chat/pull/10397) by [@TDiNguyen](https://github.com/TDiNguyen) & [@tttt-conan](https://github.com/tttt-conan))
+
 - Use Node 8.9 for CI build ([#10405](https://github.com/RocketChat/Rocket.Chat/pull/10405))
+
 - Update allowed labels for bot ([#10360](https://github.com/RocketChat/Rocket.Chat/pull/10360) by [@TwizzyDizzy](https://github.com/TwizzyDizzy))
+
 - Remove @core team mention from Pull Request template ([#10384](https://github.com/RocketChat/Rocket.Chat/pull/10384))
+
 - New issue template for *Release Process* ([#10234](https://github.com/RocketChat/Rocket.Chat/pull/10234))
+
 - Master into Develop Branch Sync ([#10376](https://github.com/RocketChat/Rocket.Chat/pull/10376))
+
 - LingoHub based on develop ([#10545](https://github.com/RocketChat/Rocket.Chat/pull/10545))
+
 - Regression: Revert announcement structure ([#10544](https://github.com/RocketChat/Rocket.Chat/pull/10544) by [@gdelavald](https://github.com/gdelavald))
+
 - Regression: Upload was not working ([#10543](https://github.com/RocketChat/Rocket.Chat/pull/10543))
+
 - Deps update ([#10549](https://github.com/RocketChat/Rocket.Chat/pull/10549))
+
 - Regression: /api/v1/settings.oauth not returning clientId for Twitter ([#10560](https://github.com/RocketChat/Rocket.Chat/pull/10560) by [@cardoso](https://github.com/cardoso))
+
 - Regression: Webhooks breaking due to restricted test ([#10555](https://github.com/RocketChat/Rocket.Chat/pull/10555))
+
 - Regression: Rooms and Apps weren't playing nice with each other ([#10559](https://github.com/RocketChat/Rocket.Chat/pull/10559))
+
 - Regression: Fix announcement bar being displayed without content ([#10554](https://github.com/RocketChat/Rocket.Chat/pull/10554) by [@gdelavald](https://github.com/gdelavald))
+
 - Regression: Inconsistent response of settings.oauth endpoint ([#10553](https://github.com/RocketChat/Rocket.Chat/pull/10553))
+
 - Regression: Remove added mentions on quote/reply ([#10571](https://github.com/RocketChat/Rocket.Chat/pull/10571) by [@gdelavald](https://github.com/gdelavald))
+
 - Regression: Attachments and fields incorrectly failing on validation ([#10573](https://github.com/RocketChat/Rocket.Chat/pull/10573))
+
 - Regression: Rocket.Chat App author link opens in same window ([#10575](https://github.com/RocketChat/Rocket.Chat/pull/10575) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
 
 </details>
@@ -4931,6 +7226,7 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.63.3 ([#10504](https://github.com/RocketChat/Rocket.Chat/pull/10504) by [@rafaelks](https://github.com/rafaelks))
 
 </details>
@@ -4953,7 +7249,9 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.63.2 ([#10476](https://github.com/RocketChat/Rocket.Chat/pull/10476))
+
 - add redhat dockerfile to master ([#10408](https://github.com/RocketChat/Rocket.Chat/pull/10408))
 
 </details>
@@ -4973,6 +7271,7 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.63.1 ([#10374](https://github.com/RocketChat/Rocket.Chat/pull/10374) by [@TechyPeople](https://github.com/TechyPeople) & [@kaiiiiiiiii](https://github.com/kaiiiiiiiii) & [@tttt-conan](https://github.com/tttt-conan))
 
 </details>
@@ -4999,84 +7298,153 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Removed Private History Route ([#10103](https://github.com/RocketChat/Rocket.Chat/pull/10103) by [@Hudell](https://github.com/Hudell))
 
 ### 🎉 New features
 
+
 - Improve history generation ([#10319](https://github.com/RocketChat/Rocket.Chat/pull/10319))
+
 - Interface to install and manage RocketChat Apps (alpha) ([#10246](https://github.com/RocketChat/Rocket.Chat/pull/10246))
+
 - Livechat messages rest APIs ([#10054](https://github.com/RocketChat/Rocket.Chat/pull/10054) by [@hmagarotto](https://github.com/hmagarotto))
+
 - Endpoint to retrieve message read receipts ([#9907](https://github.com/RocketChat/Rocket.Chat/pull/9907))
+
 - Add option to login via REST using Facebook and Twitter tokens ([#9816](https://github.com/RocketChat/Rocket.Chat/pull/9816))
+
 - Add REST endpoint to get the list of custom emojis ([#9629](https://github.com/RocketChat/Rocket.Chat/pull/9629))
+
 - GDPR Right to be forgotten/erased ([#9947](https://github.com/RocketChat/Rocket.Chat/pull/9947) by [@Hudell](https://github.com/Hudell))
+
 - Added endpoint to retrieve mentions of a channel ([#10105](https://github.com/RocketChat/Rocket.Chat/pull/10105))
+
 - Add leave public channel & leave private channel permissions ([#9584](https://github.com/RocketChat/Rocket.Chat/pull/9584) by [@kb0304](https://github.com/kb0304))
+
 - Added GET/POST channels.notifications ([#10128](https://github.com/RocketChat/Rocket.Chat/pull/10128))
+
 - Reply preview ([#10086](https://github.com/RocketChat/Rocket.Chat/pull/10086) by [@ubarsaiyan](https://github.com/ubarsaiyan))
+
 - Support for agent's phone field ([#10123](https://github.com/RocketChat/Rocket.Chat/pull/10123))
+
 - Added endpoint to get the list of available oauth services ([#10144](https://github.com/RocketChat/Rocket.Chat/pull/10144))
+
 - REST API method to set room's announcement (channels.setAnnouncement) ([#9742](https://github.com/RocketChat/Rocket.Chat/pull/9742) by [@TopHattedCat](https://github.com/TopHattedCat))
+
 - Audio recording as mp3 and better ui for recording ([#9726](https://github.com/RocketChat/Rocket.Chat/pull/9726) by [@kb0304](https://github.com/kb0304))
+
 - Setting to configure max delta for 2fa ([#9732](https://github.com/RocketChat/Rocket.Chat/pull/9732) by [@Hudell](https://github.com/Hudell))
+
 - Livechat webhook request on message ([#9870](https://github.com/RocketChat/Rocket.Chat/pull/9870) by [@hmagarotto](https://github.com/hmagarotto))
+
 - Announcement bar color wasn't using color from theming variables ([#9367](https://github.com/RocketChat/Rocket.Chat/pull/9367) by [@cyclops24](https://github.com/cyclops24) & [@karlprieb](https://github.com/karlprieb))
 
 ### 🐛 Bug fixes
 
+
 - Audio Message UI fixes ([#10303](https://github.com/RocketChat/Rocket.Chat/pull/10303) by [@kb0304](https://github.com/kb0304))
+
 - "View All Members" button inside channel's "User Info" is over sized ([#10012](https://github.com/RocketChat/Rocket.Chat/pull/10012) by [@karlprieb](https://github.com/karlprieb))
+
 - Apostrophe-containing URL misparsed" ([#10242](https://github.com/RocketChat/Rocket.Chat/pull/10242))
+
 - user status on sidenav ([#10222](https://github.com/RocketChat/Rocket.Chat/pull/10222))
+
 - Dynamic CSS script isn't working on older browsers ([#10152](https://github.com/RocketChat/Rocket.Chat/pull/10152) by [@karlprieb](https://github.com/karlprieb))
+
 - Extended view mode on sidebar ([#10160](https://github.com/RocketChat/Rocket.Chat/pull/10160) by [@karlprieb](https://github.com/karlprieb))
+
 - Cannot answer to a livechat as a manager if agent has not answered yet ([#10082](https://github.com/RocketChat/Rocket.Chat/pull/10082) by [@kb0304](https://github.com/kb0304))
+
 - User status missing on user info ([#9866](https://github.com/RocketChat/Rocket.Chat/pull/9866) by [@lunaticmonk](https://github.com/lunaticmonk))
+
 - Name of files in file upload list cuts down at bottom due to overflow ([#9672](https://github.com/RocketChat/Rocket.Chat/pull/9672) by [@lunaticmonk](https://github.com/lunaticmonk))
+
 - No pattern for user's status text capitalization ([#9783](https://github.com/RocketChat/Rocket.Chat/pull/9783) by [@lunaticmonk](https://github.com/lunaticmonk))
+
 - Apostrophe-containing URL misparsed ([#9739](https://github.com/RocketChat/Rocket.Chat/pull/9739) by [@lunaticmonk](https://github.com/lunaticmonk))
+
 - Popover divs don't scroll if they overflow the viewport ([#9860](https://github.com/RocketChat/Rocket.Chat/pull/9860) by [@Joe-mcgee](https://github.com/Joe-mcgee))
+
 - Reactions not working on mobile ([#10104](https://github.com/RocketChat/Rocket.Chat/pull/10104))
+
 - Broken video call accept dialog ([#9872](https://github.com/RocketChat/Rocket.Chat/pull/9872) by [@ramrami](https://github.com/ramrami))
+
 - Wrong switch button border color ([#10081](https://github.com/RocketChat/Rocket.Chat/pull/10081) by [@kb0304](https://github.com/kb0304))
+
 - Nextcloud as custom oauth provider wasn't mapping data correctly ([#10090](https://github.com/RocketChat/Rocket.Chat/pull/10090) by [@pierreozoux](https://github.com/pierreozoux))
+
 - Missing sidebar default options on admin ([#10016](https://github.com/RocketChat/Rocket.Chat/pull/10016) by [@karlprieb](https://github.com/karlprieb))
+
 - Able to react with invalid emoji ([#8667](https://github.com/RocketChat/Rocket.Chat/pull/8667) by [@mutdmour](https://github.com/mutdmour))
+
 - User preferences can't be saved when roles are hidden in admin settings ([#10051](https://github.com/RocketChat/Rocket.Chat/pull/10051) by [@Hudell](https://github.com/Hudell))
+
 - Browser was auto-filling values when editing another user profile ([#9932](https://github.com/RocketChat/Rocket.Chat/pull/9932) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
+
 - Avatar input was accepting not supported image types ([#10011](https://github.com/RocketChat/Rocket.Chat/pull/10011) by [@karlprieb](https://github.com/karlprieb))
+
 - Initial loading feedback was missing ([#10028](https://github.com/RocketChat/Rocket.Chat/pull/10028) by [@karlprieb](https://github.com/karlprieb))
+
 - File had redirect delay when using external storage services and no option to proxy only avatars ([#10272](https://github.com/RocketChat/Rocket.Chat/pull/10272))
+
 - Missing pt-BR translations ([#10262](https://github.com/RocketChat/Rocket.Chat/pull/10262))
+
 - /me REST endpoint was missing user roles and preferences ([#10240](https://github.com/RocketChat/Rocket.Chat/pull/10240))
+
 - Unable to mention after newline in message ([#10078](https://github.com/RocketChat/Rocket.Chat/pull/10078) by [@c0dzilla](https://github.com/c0dzilla))
+
 - Wrong pagination information on /api/v1/channels.members ([#10224](https://github.com/RocketChat/Rocket.Chat/pull/10224))
+
 - Inline code following a url leads to autolinking of code with url ([#10163](https://github.com/RocketChat/Rocket.Chat/pull/10163) by [@c0dzilla](https://github.com/c0dzilla))
+
 - Incoming Webhooks were missing the raw content ([#10258](https://github.com/RocketChat/Rocket.Chat/pull/10258) by [@Hudell](https://github.com/Hudell))
+
 - Missing Translation Key on Reactions ([#10270](https://github.com/RocketChat/Rocket.Chat/pull/10270) by [@bernardoetrevisan](https://github.com/bernardoetrevisan))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.63.0 ([#10324](https://github.com/RocketChat/Rocket.Chat/pull/10324) by [@Hudell](https://github.com/Hudell) & [@Joe-mcgee](https://github.com/Joe-mcgee) & [@TopHattedCat](https://github.com/TopHattedCat) & [@hmagarotto](https://github.com/hmagarotto) & [@kaiiiiiiiii](https://github.com/kaiiiiiiiii) & [@karlprieb](https://github.com/karlprieb) & [@kb0304](https://github.com/kb0304) & [@lunaticmonk](https://github.com/lunaticmonk) & [@ramrami](https://github.com/ramrami))
+
 - Fix: Reaction endpoint/api only working with regular emojis ([#10323](https://github.com/RocketChat/Rocket.Chat/pull/10323))
+
 - Bump snap version to include security fix ([#10313](https://github.com/RocketChat/Rocket.Chat/pull/10313))
+
 - Update Meteor to 1.6.1.1 ([#10314](https://github.com/RocketChat/Rocket.Chat/pull/10314))
+
 - LingoHub based on develop ([#10243](https://github.com/RocketChat/Rocket.Chat/pull/10243))
+
 - Rename migration name on 108 to match file name ([#10237](https://github.com/RocketChat/Rocket.Chat/pull/10237))
+
 - Fix typo for Nextcloud login ([#10159](https://github.com/RocketChat/Rocket.Chat/pull/10159) by [@pierreozoux](https://github.com/pierreozoux))
+
 - Add a few listener supports for the Rocket.Chat Apps ([#10154](https://github.com/RocketChat/Rocket.Chat/pull/10154))
+
 - Add forums as a place to suggest, discuss and upvote features ([#10148](https://github.com/RocketChat/Rocket.Chat/pull/10148) by [@SeanPackham](https://github.com/SeanPackham))
+
 - Fix tests breaking randomly ([#10065](https://github.com/RocketChat/Rocket.Chat/pull/10065))
+
 - [OTHER] Reactivate all tests ([#10036](https://github.com/RocketChat/Rocket.Chat/pull/10036))
+
 - [OTHER] Reactivate API tests ([#9844](https://github.com/RocketChat/Rocket.Chat/pull/9844) by [@karlprieb](https://github.com/karlprieb))
+
 - Start 0.63.0-develop / develop sync from master ([#9985](https://github.com/RocketChat/Rocket.Chat/pull/9985))
+
 - Fix: Renaming channels.notifications Get/Post endpoints ([#10257](https://github.com/RocketChat/Rocket.Chat/pull/10257))
+
 - Fix caddy download link to pull from github ([#10260](https://github.com/RocketChat/Rocket.Chat/pull/10260))
+
 - Fix: possible errors on rocket.chat side of the apps ([#10252](https://github.com/RocketChat/Rocket.Chat/pull/10252))
+
 - Fix snap install. Remove execstack from sharp, and bypass grpc error ([#10015](https://github.com/RocketChat/Rocket.Chat/pull/10015))
+
 - Fix: inputs for rocketchat apps ([#10274](https://github.com/RocketChat/Rocket.Chat/pull/10274))
+
 - Fix: chat.react api not accepting previous emojis ([#10290](https://github.com/RocketChat/Rocket.Chat/pull/10290))
+
 - Fix: Scroll on content page ([#10300](https://github.com/RocketChat/Rocket.Chat/pull/10300))
 
 </details>
@@ -5120,16 +7488,23 @@
 
 ### 🐛 Bug fixes
 
+
 - Slack Import reports `invalid import file type` due to a call to BSON.native() which is now doesn't exist ([#10071](https://github.com/RocketChat/Rocket.Chat/pull/10071) by [@trongthanh](https://github.com/trongthanh))
+
 - Verified property of user is always set to false if not supplied ([#9719](https://github.com/RocketChat/Rocket.Chat/pull/9719))
+
 - Update preferences of users with settings: null was crashing the server ([#10076](https://github.com/RocketChat/Rocket.Chat/pull/10076))
+
 - REST API: Can't list all public channels when user has permission `view-joined-room` ([#10009](https://github.com/RocketChat/Rocket.Chat/pull/10009))
+
 - Message editing is crashing the server when read receipts are enabled ([#10061](https://github.com/RocketChat/Rocket.Chat/pull/10061))
+
 - Download links was duplicating Sub Paths ([#10029](https://github.com/RocketChat/Rocket.Chat/pull/10029))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.62.2 ([#10087](https://github.com/RocketChat/Rocket.Chat/pull/10087))
 
 </details>
@@ -5153,14 +7528,19 @@
 
 ### 🐛 Bug fixes
 
+
 - Delete user without username was removing direct rooms of all users ([#9986](https://github.com/RocketChat/Rocket.Chat/pull/9986))
+
 - New channel page on medium size screens ([#9988](https://github.com/RocketChat/Rocket.Chat/pull/9988) by [@karlprieb](https://github.com/karlprieb))
+
 - Empty sidenav when sorting by activity and there is a subscription without room ([#9960](https://github.com/RocketChat/Rocket.Chat/pull/9960))
+
 - Two factor authentication modal was not showing ([#9982](https://github.com/RocketChat/Rocket.Chat/pull/9982))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.62.1 ([#9989](https://github.com/RocketChat/Rocket.Chat/pull/9989))
 
 </details>
@@ -5184,95 +7564,175 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Remove Graphics/Image Magick support ([#9711](https://github.com/RocketChat/Rocket.Chat/pull/9711))
 
 ### 🎉 New features
 
+
 - Version update check ([#9793](https://github.com/RocketChat/Rocket.Chat/pull/9793))
+
 - General alert banner ([#9778](https://github.com/RocketChat/Rocket.Chat/pull/9778))
+
 - Browse more channels / Directory ([#9642](https://github.com/RocketChat/Rocket.Chat/pull/9642) by [@karlprieb](https://github.com/karlprieb))
+
 - Add user settings / preferences API endpoint ([#9457](https://github.com/RocketChat/Rocket.Chat/pull/9457) by [@jgtoriginal](https://github.com/jgtoriginal))
+
 - New sidebar layout ([#9608](https://github.com/RocketChat/Rocket.Chat/pull/9608) by [@karlprieb](https://github.com/karlprieb))
+
 - Message read receipts ([#9717](https://github.com/RocketChat/Rocket.Chat/pull/9717))
+
 - Alert admins when user requires approval & alert users when the account is approved/activated/deactivated ([#7098](https://github.com/RocketChat/Rocket.Chat/pull/7098) by [@luisfn](https://github.com/luisfn))
+
 - Allow configuration of SAML logout behavior ([#9527](https://github.com/RocketChat/Rocket.Chat/pull/9527) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Internal hubot support for Direct Messages and Private Groups ([#8933](https://github.com/RocketChat/Rocket.Chat/pull/8933) by [@ramrami](https://github.com/ramrami))
+
 - Improved default welcome message ([#9298](https://github.com/RocketChat/Rocket.Chat/pull/9298) by [@HammyHavoc](https://github.com/HammyHavoc))
+
 - Makes shield icon configurable ([#9746](https://github.com/RocketChat/Rocket.Chat/pull/9746) by [@c0dzilla](https://github.com/c0dzilla))
+
 - Global message search (beta: disabled by default) ([#9687](https://github.com/RocketChat/Rocket.Chat/pull/9687) by [@cyberhck](https://github.com/cyberhck) & [@savikko](https://github.com/savikko))
+
 - Allow sounds when conversation is focused ([#9312](https://github.com/RocketChat/Rocket.Chat/pull/9312) by [@RationalCoding](https://github.com/RationalCoding))
+
 - API to fetch permissions & user roles ([#9519](https://github.com/RocketChat/Rocket.Chat/pull/9519) by [@rafaelks](https://github.com/rafaelks))
+
 - REST API to use Spotlight ([#9509](https://github.com/RocketChat/Rocket.Chat/pull/9509) by [@rafaelks](https://github.com/rafaelks))
+
 - Option to proxy files and avatars through the server ([#9699](https://github.com/RocketChat/Rocket.Chat/pull/9699))
+
 - Allow request avatar placeholders as PNG or JPG instead of SVG ([#8193](https://github.com/RocketChat/Rocket.Chat/pull/8193) by [@lindoelio](https://github.com/lindoelio))
+
 - Image preview as 32x32 base64 jpeg ([#9218](https://github.com/RocketChat/Rocket.Chat/pull/9218) by [@jorgeluisrezende](https://github.com/jorgeluisrezende))
+
 - New REST API to mark channel as read ([#9507](https://github.com/RocketChat/Rocket.Chat/pull/9507) by [@rafaelks](https://github.com/rafaelks))
+
 - Add route to get user shield/badge ([#9549](https://github.com/RocketChat/Rocket.Chat/pull/9549) by [@kb0304](https://github.com/kb0304))
+
 - GraphQL API ([#8158](https://github.com/RocketChat/Rocket.Chat/pull/8158) by [@kamilkisiela](https://github.com/kamilkisiela))
+
 - Livestream tab ([#9255](https://github.com/RocketChat/Rocket.Chat/pull/9255) by [@gdelavald](https://github.com/gdelavald))
+
 - Add documentation requirement to PRs ([#9658](https://github.com/RocketChat/Rocket.Chat/pull/9658) by [@SeanPackham](https://github.com/SeanPackham))
+
 - Request mongoDB version in github issue template ([#9807](https://github.com/RocketChat/Rocket.Chat/pull/9807) by [@TwizzyDizzy](https://github.com/TwizzyDizzy))
 
 ### 🐛 Bug fixes
 
+
 - Typo on french translation for "Open" ([#9934](https://github.com/RocketChat/Rocket.Chat/pull/9934) by [@sizrar](https://github.com/sizrar))
+
 - Wrong behavior of rooms info's *Read Only* and *Collaborative* buttons ([#9665](https://github.com/RocketChat/Rocket.Chat/pull/9665) by [@karlprieb](https://github.com/karlprieb))
+
 - Close button on file upload bar was not working ([#9662](https://github.com/RocketChat/Rocket.Chat/pull/9662) by [@karlprieb](https://github.com/karlprieb))
+
 - Chrome 64 breaks jitsi-meet iframe ([#9560](https://github.com/RocketChat/Rocket.Chat/pull/9560) by [@speedy01](https://github.com/speedy01))
+
 - Harmonize channel-related actions ([#9697](https://github.com/RocketChat/Rocket.Chat/pull/9697) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Custom emoji was cropping sometimes ([#9676](https://github.com/RocketChat/Rocket.Chat/pull/9676) by [@anu-007](https://github.com/anu-007))
+
 - Show custom room types icon in channel header ([#9696](https://github.com/RocketChat/Rocket.Chat/pull/9696) by [@mrsimpson](https://github.com/mrsimpson))
+
 - 'Query' support for channels.list.joined, groups.list, groups.listAll, im.list ([#9424](https://github.com/RocketChat/Rocket.Chat/pull/9424) by [@xbolshe](https://github.com/xbolshe))
+
 - DeprecationWarning: prom-client ... when starting Rocket Chat server ([#9747](https://github.com/RocketChat/Rocket.Chat/pull/9747) by [@jgtoriginal](https://github.com/jgtoriginal))
+
 - API to retrive rooms was returning empty objects ([#9737](https://github.com/RocketChat/Rocket.Chat/pull/9737))
+
 - Chat Message Reactions REST API End Point ([#9487](https://github.com/RocketChat/Rocket.Chat/pull/9487) by [@jgtoriginal](https://github.com/jgtoriginal))
+
 - Messages can't be quoted sometimes ([#9720](https://github.com/RocketChat/Rocket.Chat/pull/9720))
+
 - GitLab OAuth does not work when GitLab’s URL ends with slash ([#9716](https://github.com/RocketChat/Rocket.Chat/pull/9716))
+
 - Close Livechat conversation by visitor not working in version 0.61.0 ([#9714](https://github.com/RocketChat/Rocket.Chat/pull/9714))
+
 - Formal pronouns and some small mistakes in German texts ([#9067](https://github.com/RocketChat/Rocket.Chat/pull/9067) by [@AmShaegar13](https://github.com/AmShaegar13))
+
 - Facebook integration in livechat not working on version 0.61.0 ([#9640](https://github.com/RocketChat/Rocket.Chat/pull/9640))
+
 - Weird rendering of emojis at sidebar when `last message` is activated ([#9623](https://github.com/RocketChat/Rocket.Chat/pull/9623))
+
 - Rest API helpers only applying to v1 ([#9520](https://github.com/RocketChat/Rocket.Chat/pull/9520))
+
 - Desktop notification not showing when avatar came from external storage service ([#9639](https://github.com/RocketChat/Rocket.Chat/pull/9639))
+
 - Missing link Site URLs in enrollment e-mails ([#9454](https://github.com/RocketChat/Rocket.Chat/pull/9454) by [@kemitchell](https://github.com/kemitchell))
+
 - Missing string 'Username_already_exist' on the accountProfile page ([#9610](https://github.com/RocketChat/Rocket.Chat/pull/9610) by [@lunaticmonk](https://github.com/lunaticmonk))
+
 - SVG avatars are not been displayed correctly when load in non HTML containers ([#9570](https://github.com/RocketChat/Rocket.Chat/pull/9570) by [@filipedelimabrito](https://github.com/filipedelimabrito))
+
 - Livechat is not working when running in a sub path ([#9599](https://github.com/RocketChat/Rocket.Chat/pull/9599))
+
 - Not receiving sound notifications in rooms created by new LiveChats ([#9802](https://github.com/RocketChat/Rocket.Chat/pull/9802))
+
 - Silence the update check error message ([#9858](https://github.com/RocketChat/Rocket.Chat/pull/9858))
+
 - Parsing messages with multiple markdown matches ignore some tokens ([#9884](https://github.com/RocketChat/Rocket.Chat/pull/9884) by [@c0dzilla](https://github.com/c0dzilla))
+
 - Importers no longer working due to the FileUpload changes ([#9850](https://github.com/RocketChat/Rocket.Chat/pull/9850))
+
 - Misplaced "Save Changes" button in user account panel ([#9888](https://github.com/RocketChat/Rocket.Chat/pull/9888) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
+
 - Snap build was failing ([#9879](https://github.com/RocketChat/Rocket.Chat/pull/9879))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.62.0 ([#9935](https://github.com/RocketChat/Rocket.Chat/pull/9935))
+
 - Regression: Fix livechat queue link ([#9928](https://github.com/RocketChat/Rocket.Chat/pull/9928) by [@karlprieb](https://github.com/karlprieb))
+
 - Regression: Directory now list default channel ([#9931](https://github.com/RocketChat/Rocket.Chat/pull/9931) by [@karlprieb](https://github.com/karlprieb))
+
 - Improve link handling for attachments ([#9908](https://github.com/RocketChat/Rocket.Chat/pull/9908))
+
 - Regression: Misplaced language dropdown in user preferences panel ([#9883](https://github.com/RocketChat/Rocket.Chat/pull/9883) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
+
 - Fix RHCC image path for OpenShift and default to the current namespace. ([#9901](https://github.com/RocketChat/Rocket.Chat/pull/9901) by [@jsm84](https://github.com/jsm84))
+
 - Sync from Master ([#9796](https://github.com/RocketChat/Rocket.Chat/pull/9796) by [@HammyHavoc](https://github.com/HammyHavoc))
+
 - [OTHER] Rocket.Chat Apps ([#9666](https://github.com/RocketChat/Rocket.Chat/pull/9666))
+
 - Move NRR package to inside the project and convert from CoffeeScript ([#9753](https://github.com/RocketChat/Rocket.Chat/pull/9753))
+
 - Update to meteor 1.6.1 ([#9546](https://github.com/RocketChat/Rocket.Chat/pull/9546))
+
 - Regression: Avatar now open account related options ([#9843](https://github.com/RocketChat/Rocket.Chat/pull/9843) by [@karlprieb](https://github.com/karlprieb))
+
 - Regression: Open search using ctrl/cmd + p and ctrl/cmd + k ([#9837](https://github.com/RocketChat/Rocket.Chat/pull/9837) by [@karlprieb](https://github.com/karlprieb))
+
 - Regression: Search bar is now full width ([#9839](https://github.com/RocketChat/Rocket.Chat/pull/9839) by [@karlprieb](https://github.com/karlprieb))
+
 - Dependencies update ([#9811](https://github.com/RocketChat/Rocket.Chat/pull/9811))
+
 - Fix: Custom fields not showing on user info panel ([#9821](https://github.com/RocketChat/Rocket.Chat/pull/9821))
+
 - Regression: Page was not respecting the window height on Firefox ([#9804](https://github.com/RocketChat/Rocket.Chat/pull/9804))
+
 - Update bot-config.yml ([#9784](https://github.com/RocketChat/Rocket.Chat/pull/9784) by [@JSzaszvari](https://github.com/JSzaszvari))
+
 - Develop fix sync from master ([#9797](https://github.com/RocketChat/Rocket.Chat/pull/9797))
+
 - Regression: Change create channel icon ([#9851](https://github.com/RocketChat/Rocket.Chat/pull/9851) by [@karlprieb](https://github.com/karlprieb))
+
 - Regression: Fix channel icons on safari ([#9852](https://github.com/RocketChat/Rocket.Chat/pull/9852) by [@karlprieb](https://github.com/karlprieb))
+
 - Regression: Fix admin/user settings item text ([#9845](https://github.com/RocketChat/Rocket.Chat/pull/9845) by [@karlprieb](https://github.com/karlprieb))
+
 - Regression: Improve sidebar filter ([#9905](https://github.com/RocketChat/Rocket.Chat/pull/9905) by [@karlprieb](https://github.com/karlprieb))
+
 - [OTHER] Fix Apps not working on multi-instance deployments ([#9902](https://github.com/RocketChat/Rocket.Chat/pull/9902))
+
 - [Fix] Not Translated Phrases ([#9877](https://github.com/RocketChat/Rocket.Chat/pull/9877) by [@bernardoetrevisan](https://github.com/bernardoetrevisan))
+
 - Regression: Overlapping header in user profile panel ([#9889](https://github.com/RocketChat/Rocket.Chat/pull/9889) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
+
 - Regression: sort on room's list not working correctly ([#9897](https://github.com/RocketChat/Rocket.Chat/pull/9897))
 
 </details>
@@ -5331,13 +7791,17 @@
 
 ### 🐛 Bug fixes
 
+
 - Livechat issues on external queue and lead capture ([#9750](https://github.com/RocketChat/Rocket.Chat/pull/9750))
+
 - Emoji rendering on last message ([#9776](https://github.com/RocketChat/Rocket.Chat/pull/9776))
+
 - Livechat conversation not receiving messages when start without form ([#9772](https://github.com/RocketChat/Rocket.Chat/pull/9772))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.61.2 ([#9786](https://github.com/RocketChat/Rocket.Chat/pull/9786))
 
 </details>
@@ -5358,6 +7822,7 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.61.1 ([#9721](https://github.com/RocketChat/Rocket.Chat/pull/9721))
 
 </details>
@@ -5375,48 +7840,81 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Decouple livechat visitors from regular users ([#9048](https://github.com/RocketChat/Rocket.Chat/pull/9048))
 
 ### 🎉 New features
 
+
 - Contextual Bar Redesign ([#8411](https://github.com/RocketChat/Rocket.Chat/pull/8411) by [@karlprieb](https://github.com/karlprieb))
+
 - Update documentation: provide example for multiple basedn ([#9442](https://github.com/RocketChat/Rocket.Chat/pull/9442) by [@rndmh3ro](https://github.com/rndmh3ro))
+
 - Sidebar menu option to mark room as unread ([#9216](https://github.com/RocketChat/Rocket.Chat/pull/9216) by [@karlprieb](https://github.com/karlprieb))
+
 - Add mention-here permission #7631 ([#9228](https://github.com/RocketChat/Rocket.Chat/pull/9228) by [@ryjones](https://github.com/ryjones))
+
 - Indicate the Self DM room ([#9234](https://github.com/RocketChat/Rocket.Chat/pull/9234))
+
 - new layout for emojipicker ([#9245](https://github.com/RocketChat/Rocket.Chat/pull/9245) by [@karlprieb](https://github.com/karlprieb))
+
 - add /home link to sidenav footer logo ([#9366](https://github.com/RocketChat/Rocket.Chat/pull/9366) by [@cyclops24](https://github.com/cyclops24))
+
 - Livechat extract lead data from message ([#9135](https://github.com/RocketChat/Rocket.Chat/pull/9135))
+
 - Add impersonate option for livechat triggers ([#9107](https://github.com/RocketChat/Rocket.Chat/pull/9107))
+
 - Add support to external livechat queue service provider ([#9053](https://github.com/RocketChat/Rocket.Chat/pull/9053))
+
 - Contextual bar mail messages ([#9510](https://github.com/RocketChat/Rocket.Chat/pull/9510) by [@karlprieb](https://github.com/karlprieb))
 
 ### 🐛 Bug fixes
 
+
 - [i18n] add room type translation support for room-changed-privacy message ([#9369](https://github.com/RocketChat/Rocket.Chat/pull/9369) by [@cyclops24](https://github.com/cyclops24))
+
 - Fix livechat register form ([#9452](https://github.com/RocketChat/Rocket.Chat/pull/9452))
+
 - Fix livechat build ([#9451](https://github.com/RocketChat/Rocket.Chat/pull/9451))
+
 - Fix closing livechat inquiry ([#9164](https://github.com/RocketChat/Rocket.Chat/pull/9164))
+
 - Slash command 'unarchive' throws exception if the channel does not exist  ([#9435](https://github.com/RocketChat/Rocket.Chat/pull/9435) by [@ramrami](https://github.com/ramrami))
+
 - Slash command 'archive' throws exception if the channel does not exist ([#9428](https://github.com/RocketChat/Rocket.Chat/pull/9428) by [@ramrami](https://github.com/ramrami))
+
 - Subscriptions not removed when removing user ([#9432](https://github.com/RocketChat/Rocket.Chat/pull/9432))
+
 - Highlight setting not working correctly ([#9364](https://github.com/RocketChat/Rocket.Chat/pull/9364) by [@cyclops24](https://github.com/cyclops24))
+
 - File access not working when passing credentials via querystring ([#9264](https://github.com/RocketChat/Rocket.Chat/pull/9264))
+
 - Contextual bar redesign ([#9481](https://github.com/RocketChat/Rocket.Chat/pull/9481) by [@gdelavald](https://github.com/gdelavald) & [@karlprieb](https://github.com/karlprieb))
+
 - mention-here is missing i18n text #9455 ([#9456](https://github.com/RocketChat/Rocket.Chat/pull/9456) by [@ryjones](https://github.com/ryjones))
+
 - Fix livechat visitor edit ([#9506](https://github.com/RocketChat/Rocket.Chat/pull/9506))
+
 - large names on userinfo, and admin user bug on users with no usernames ([#9493](https://github.com/RocketChat/Rocket.Chat/pull/9493) by [@gdelavald](https://github.com/gdelavald))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.61.0 ([#9533](https://github.com/RocketChat/Rocket.Chat/pull/9533) by [@karlprieb](https://github.com/karlprieb) & [@ryjones](https://github.com/ryjones))
+
 - Add community bot ([#9439](https://github.com/RocketChat/Rocket.Chat/pull/9439))
+
 - Use correct version of Mailparser module ([#9356](https://github.com/RocketChat/Rocket.Chat/pull/9356))
+
 - Develop sync - Bump version to 0.61.0-develop ([#9260](https://github.com/RocketChat/Rocket.Chat/pull/9260) by [@cpitman](https://github.com/cpitman) & [@karlprieb](https://github.com/karlprieb))
+
 - [Fix] oauth not working because of email array ([#9173](https://github.com/RocketChat/Rocket.Chat/pull/9173))
+
 - [DOCS] Update the links of our Mobile Apps in Features topic ([#9469](https://github.com/RocketChat/Rocket.Chat/pull/9469) by [@rafaelks](https://github.com/rafaelks))
+
 - Update license ([#9490](https://github.com/RocketChat/Rocket.Chat/pull/9490))
+
 - Prevent NPM package-lock inside livechat ([#9504](https://github.com/RocketChat/Rocket.Chat/pull/9504))
 
 </details>
@@ -5451,16 +7949,23 @@
 
 ### 🐛 Bug fixes
 
+
 - LDAP TLS not working in some cases ([#9343](https://github.com/RocketChat/Rocket.Chat/pull/9343))
+
 - popover on safari for iOS ([#9328](https://github.com/RocketChat/Rocket.Chat/pull/9328) by [@karlprieb](https://github.com/karlprieb))
+
 - announcement hyperlink color ([#9330](https://github.com/RocketChat/Rocket.Chat/pull/9330) by [@karlprieb](https://github.com/karlprieb))
+
 - Deleting message with store last message not removing ([#9335](https://github.com/RocketChat/Rocket.Chat/pull/9335))
+
 - last message cutting on bottom ([#9345](https://github.com/RocketChat/Rocket.Chat/pull/9345) by [@karlprieb](https://github.com/karlprieb))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.60.4 ([#9377](https://github.com/RocketChat/Rocket.Chat/pull/9377))
+
 - Update Marked dependecy to 0.3.9 ([#9346](https://github.com/RocketChat/Rocket.Chat/pull/9346))
 
 </details>
@@ -5483,20 +7988,31 @@
 
 ### 🐛 Bug fixes
 
+
 - custom emoji size on sidebar item ([#9314](https://github.com/RocketChat/Rocket.Chat/pull/9314) by [@karlprieb](https://github.com/karlprieb))
+
 - svg render on firefox ([#9311](https://github.com/RocketChat/Rocket.Chat/pull/9311) by [@karlprieb](https://github.com/karlprieb))
+
 - sidebar footer padding ([#9249](https://github.com/RocketChat/Rocket.Chat/pull/9249) by [@karlprieb](https://github.com/karlprieb))
+
 - LDAP/AD is not importing all users ([#9309](https://github.com/RocketChat/Rocket.Chat/pull/9309))
+
 - Wrong position of notifications alert in accounts preference page ([#9289](https://github.com/RocketChat/Rocket.Chat/pull/9289) by [@HammyHavoc](https://github.com/HammyHavoc))
+
 - English Typos ([#9285](https://github.com/RocketChat/Rocket.Chat/pull/9285) by [@HammyHavoc](https://github.com/HammyHavoc))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.60.3 ([#9320](https://github.com/RocketChat/Rocket.Chat/pull/9320) by [@HammyHavoc](https://github.com/HammyHavoc))
+
 - Fix: English language improvements ([#9299](https://github.com/RocketChat/Rocket.Chat/pull/9299) by [@HammyHavoc](https://github.com/HammyHavoc))
+
 - Fix: Change 'Wordpress' to 'WordPress ([#9291](https://github.com/RocketChat/Rocket.Chat/pull/9291) by [@HammyHavoc](https://github.com/HammyHavoc))
+
 - Fix: Improved README.md ([#9290](https://github.com/RocketChat/Rocket.Chat/pull/9290) by [@HammyHavoc](https://github.com/HammyHavoc))
+
 - Fix: README typo ([#9286](https://github.com/RocketChat/Rocket.Chat/pull/9286) by [@HammyHavoc](https://github.com/HammyHavoc))
 
 </details>
@@ -5519,13 +8035,17 @@
 
 ### 🐛 Bug fixes
 
+
 - Restore translations from other languages ([#9277](https://github.com/RocketChat/Rocket.Chat/pull/9277))
+
 - Remove sweetalert from livechat facebook integration page ([#9274](https://github.com/RocketChat/Rocket.Chat/pull/9274))
+
 - Missing translations ([#9272](https://github.com/RocketChat/Rocket.Chat/pull/9272))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.60.2 ([#9280](https://github.com/RocketChat/Rocket.Chat/pull/9280))
 
 </details>
@@ -5544,6 +8064,7 @@
 
 ### 🐛 Bug fixes
 
+
 - File access not working when passing credentials via querystring ([#9262](https://github.com/RocketChat/Rocket.Chat/pull/9262))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -5559,185 +8080,358 @@
 
 ### 🎉 New features
 
+
 - Allow user's default preferences configuration ([#7285](https://github.com/RocketChat/Rocket.Chat/pull/7285) by [@goiaba](https://github.com/goiaba))
+
 - Add "Favorites" and "Mark as read" options to the room list ([#8915](https://github.com/RocketChat/Rocket.Chat/pull/8915) by [@karlprieb](https://github.com/karlprieb))
+
 - Facebook livechat integration ([#8807](https://github.com/RocketChat/Rocket.Chat/pull/8807))
+
 - Added support for Dataporten's userid-feide scope ([#8902](https://github.com/RocketChat/Rocket.Chat/pull/8902) by [@torgeirl](https://github.com/torgeirl))
+
 - Describe file uploads when notifying by email ([#8924](https://github.com/RocketChat/Rocket.Chat/pull/8924))
+
 - Feature/livechat hide email ([#8149](https://github.com/RocketChat/Rocket.Chat/pull/8149) by [@icosamuel](https://github.com/icosamuel) & [@sarbasamuel](https://github.com/sarbasamuel))
+
 - Sender's name in email notifications. ([#7999](https://github.com/RocketChat/Rocket.Chat/pull/7999) by [@pkgodara](https://github.com/pkgodara))
+
 - Add "real name change" setting ([#8739](https://github.com/RocketChat/Rocket.Chat/pull/8739) by [@AmShaegar13](https://github.com/AmShaegar13))
+
 - Use enter separator rather than comma in highlight preferences + Auto refresh after change highlighted words ([#8433](https://github.com/RocketChat/Rocket.Chat/pull/8433) by [@cyclops24](https://github.com/cyclops24))
+
 - Adds admin option to globally set mobile devices to always be notified regardless of presence status. ([#7641](https://github.com/RocketChat/Rocket.Chat/pull/7641) by [@stalley](https://github.com/stalley))
+
 - Add new API endpoints ([#8947](https://github.com/RocketChat/Rocket.Chat/pull/8947))
+
 - Option to enable/disable auto away and configure timer ([#8029](https://github.com/RocketChat/Rocket.Chat/pull/8029) by [@armand1m](https://github.com/armand1m))
+
 - New Modal component ([#8882](https://github.com/RocketChat/Rocket.Chat/pull/8882) by [@karlprieb](https://github.com/karlprieb))
+
 - Improve room types API and usages ([#9009](https://github.com/RocketChat/Rocket.Chat/pull/9009) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Room counter sidebar preference ([#8866](https://github.com/RocketChat/Rocket.Chat/pull/8866) by [@karlprieb](https://github.com/karlprieb))
+
 - Save room's last message ([#8979](https://github.com/RocketChat/Rocket.Chat/pull/8979) by [@karlprieb](https://github.com/karlprieb))
+
 - Token Controlled Access channels ([#8060](https://github.com/RocketChat/Rocket.Chat/pull/8060) by [@karlprieb](https://github.com/karlprieb) & [@lindoelio](https://github.com/lindoelio))
+
 - Send category and title fields to iOS push notification ([#8905](https://github.com/RocketChat/Rocket.Chat/pull/8905))
+
 - code to get the updated messages ([#8857](https://github.com/RocketChat/Rocket.Chat/pull/8857))
+
 - Rest API endpoints to list, get, and run commands ([#8531](https://github.com/RocketChat/Rocket.Chat/pull/8531))
+
 - Upgrade Meteor to 1.6 ([#8715](https://github.com/RocketChat/Rocket.Chat/pull/8715) by [@karlprieb](https://github.com/karlprieb))
+
 - Add settings for allow user direct messages to yourself ([#8066](https://github.com/RocketChat/Rocket.Chat/pull/8066) by [@lindoelio](https://github.com/lindoelio))
+
 - Add sweet alert to video call tab ([#8108](https://github.com/RocketChat/Rocket.Chat/pull/8108))
+
 - Displays QR code for manually entering when enabling 2fa ([#8143](https://github.com/RocketChat/Rocket.Chat/pull/8143))
+
 - Add yunohost.org installation method to Readme.md ([#8037](https://github.com/RocketChat/Rocket.Chat/pull/8037) by [@selamanse](https://github.com/selamanse))
+
 - Modal ([#9092](https://github.com/RocketChat/Rocket.Chat/pull/9092) by [@karlprieb](https://github.com/karlprieb))
+
 - Make Custom oauth accept nested usernameField ([#9066](https://github.com/RocketChat/Rocket.Chat/pull/9066) by [@pierreozoux](https://github.com/pierreozoux))
 
 ### 🐛 Bug fixes
 
+
 - Can't react on Read Only rooms even when enabled ([#8925](https://github.com/RocketChat/Rocket.Chat/pull/8925) by [@karlprieb](https://github.com/karlprieb))
+
 - CAS does not share secrets when operating multiple server instances ([#8654](https://github.com/RocketChat/Rocket.Chat/pull/8654) by [@AmShaegar13](https://github.com/AmShaegar13))
+
 - Snippetted messages not working ([#8937](https://github.com/RocketChat/Rocket.Chat/pull/8937) by [@karlprieb](https://github.com/karlprieb))
+
 - Added afterUserCreated trigger after first CAS login ([#9022](https://github.com/RocketChat/Rocket.Chat/pull/9022) by [@AmShaegar13](https://github.com/AmShaegar13))
+
 - Notification is not sent when a video conference start ([#8828](https://github.com/RocketChat/Rocket.Chat/pull/8828) by [@deepseainside75](https://github.com/deepseainside75) & [@stefanoverducci](https://github.com/stefanoverducci))
+
 - long filename overlaps cancel button in progress bar ([#8868](https://github.com/RocketChat/Rocket.Chat/pull/8868) by [@joesitton](https://github.com/joesitton))
+
 - Changed oembedUrlWidget to prefer og:image and twitter:image over msapplication-TileImage ([#9012](https://github.com/RocketChat/Rocket.Chat/pull/9012) by [@wferris722](https://github.com/wferris722))
+
 - Update insecure moment.js dependency ([#9046](https://github.com/RocketChat/Rocket.Chat/pull/9046) by [@robbyoconnor](https://github.com/robbyoconnor))
+
 - Custom OAuth: Not able to set different token place for routes ([#9034](https://github.com/RocketChat/Rocket.Chat/pull/9034))
+
 - Can't use OAuth login against a Rocket.Chat OAuth server ([#9044](https://github.com/RocketChat/Rocket.Chat/pull/9044))
+
 - Notification sound is not disabling when busy ([#9042](https://github.com/RocketChat/Rocket.Chat/pull/9042))
+
 - Use encodeURI in AmazonS3 contentDisposition file.name to prevent fail ([#9024](https://github.com/RocketChat/Rocket.Chat/pull/9024) by [@paulovitin](https://github.com/paulovitin))
+
 - snap install by setting grpc package used by google/vision to 1.6.6 ([#9029](https://github.com/RocketChat/Rocket.Chat/pull/9029))
+
 - Enable CORS for Restivus ([#8671](https://github.com/RocketChat/Rocket.Chat/pull/8671) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Importers failing when usernames exists but cases don't match and improve the importer framework's performance ([#8966](https://github.com/RocketChat/Rocket.Chat/pull/8966))
+
 - Error when saving integration with symbol as only trigger ([#9023](https://github.com/RocketChat/Rocket.Chat/pull/9023))
+
 - Sync of non existent field throws exception ([#8006](https://github.com/RocketChat/Rocket.Chat/pull/8006) by [@goiaba](https://github.com/goiaba))
+
 - Autoupdate of CSS does not work when using a prefix ([#8107](https://github.com/RocketChat/Rocket.Chat/pull/8107) by [@Darkneon](https://github.com/Darkneon))
+
 - Contextual errors for this and RegExp declarations in IRC module ([#8656](https://github.com/RocketChat/Rocket.Chat/pull/8656) by [@Pharserror](https://github.com/Pharserror))
+
 - Wrong room counter name ([#9013](https://github.com/RocketChat/Rocket.Chat/pull/9013) by [@karlprieb](https://github.com/karlprieb))
+
 - Message-box autogrow flick ([#8932](https://github.com/RocketChat/Rocket.Chat/pull/8932) by [@karlprieb](https://github.com/karlprieb))
+
 - Don't strip trailing slash on autolinker urls ([#8812](https://github.com/RocketChat/Rocket.Chat/pull/8812) by [@jwilkins](https://github.com/jwilkins))
+
 - Change the unread messages style ([#8883](https://github.com/RocketChat/Rocket.Chat/pull/8883) by [@karlprieb](https://github.com/karlprieb))
+
 - Missing sidebar footer padding ([#8884](https://github.com/RocketChat/Rocket.Chat/pull/8884) by [@karlprieb](https://github.com/karlprieb))
+
 - Long room announcement cut off ([#8907](https://github.com/RocketChat/Rocket.Chat/pull/8907) by [@karlprieb](https://github.com/karlprieb))
+
 - DM email notifications always being sent regardless of account setting ([#8917](https://github.com/RocketChat/Rocket.Chat/pull/8917) by [@ashward](https://github.com/ashward))
+
 - Typo Fix ([#8938](https://github.com/RocketChat/Rocket.Chat/pull/8938) by [@seangeleno](https://github.com/seangeleno))
+
 - Katex markdown link changed ([#8948](https://github.com/RocketChat/Rocket.Chat/pull/8948) by [@mritunjaygoutam12](https://github.com/mritunjaygoutam12))
+
 - if ogImage exists use it over image in oembedUrlWidget ([#9000](https://github.com/RocketChat/Rocket.Chat/pull/9000) by [@satyapramodh](https://github.com/satyapramodh))
+
 - Cannot edit or delete custom sounds ([#8889](https://github.com/RocketChat/Rocket.Chat/pull/8889) by [@ccfang](https://github.com/ccfang))
+
 - Change old 'rocketbot' username to 'InternalHubot_Username' setting ([#8928](https://github.com/RocketChat/Rocket.Chat/pull/8928) by [@ramrami](https://github.com/ramrami))
+
 - Link for channels are not rendering correctly ([#8985](https://github.com/RocketChat/Rocket.Chat/pull/8985) by [@karlprieb](https://github.com/karlprieb))
+
 - Xenforo [BD]API for 'user.user_id; instead of 'id' ([#8968](https://github.com/RocketChat/Rocket.Chat/pull/8968) by [@wesnspace](https://github.com/wesnspace))
+
 - flextab height on smaller screens ([#8994](https://github.com/RocketChat/Rocket.Chat/pull/8994) by [@karlprieb](https://github.com/karlprieb))
+
 - Check for mention-all permission in room scope ([#8931](https://github.com/RocketChat/Rocket.Chat/pull/8931))
+
 - fix emoji package path so they show up correctly in browser ([#8822](https://github.com/RocketChat/Rocket.Chat/pull/8822) by [@ryoshimizu](https://github.com/ryoshimizu))
+
 - Set correct Twitter link ([#8830](https://github.com/RocketChat/Rocket.Chat/pull/8830) by [@jotafeldmann](https://github.com/jotafeldmann))
+
 - User email settings on DM ([#8810](https://github.com/RocketChat/Rocket.Chat/pull/8810) by [@karlprieb](https://github.com/karlprieb))
+
 - i18n'd Resend_verification_mail, username_initials, upload avatar ([#8721](https://github.com/RocketChat/Rocket.Chat/pull/8721) by [@arungalva](https://github.com/arungalva))
+
 - Username clipping on firefox ([#8716](https://github.com/RocketChat/Rocket.Chat/pull/8716) by [@karlprieb](https://github.com/karlprieb))
+
 - Improved grammar and made it clearer to the user ([#8795](https://github.com/RocketChat/Rocket.Chat/pull/8795) by [@HammyHavoc](https://github.com/HammyHavoc))
+
 - Show real name of current user at top of side nav if setting enabled ([#8718](https://github.com/RocketChat/Rocket.Chat/pull/8718) by [@alexbrazier](https://github.com/alexbrazier))
+
 - Range Slider Value label has bug in RTL ([#8441](https://github.com/RocketChat/Rocket.Chat/pull/8441) by [@cyclops24](https://github.com/cyclops24))
+
 - Add historic chats icon in Livechat ([#8708](https://github.com/RocketChat/Rocket.Chat/pull/8708) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Sort direct messages by full name if show real names setting enabled ([#8717](https://github.com/RocketChat/Rocket.Chat/pull/8717) by [@alexbrazier](https://github.com/alexbrazier))
+
 - Improving consistency of UX ([#8796](https://github.com/RocketChat/Rocket.Chat/pull/8796) by [@HammyHavoc](https://github.com/HammyHavoc))
+
 - fixed some typos ([#8787](https://github.com/RocketChat/Rocket.Chat/pull/8787) by [@TheReal1604](https://github.com/TheReal1604))
+
 - Changed all rocket.chat/docs/ to docs.rocket.chat/ ([#8588](https://github.com/RocketChat/Rocket.Chat/pull/8588) by [@RekkyRek](https://github.com/RekkyRek))
+
 - Email verification indicator added ([#7923](https://github.com/RocketChat/Rocket.Chat/pull/7923) by [@aditya19496](https://github.com/aditya19496))
+
 - REST API file upload not respecting size limit ([#9108](https://github.com/RocketChat/Rocket.Chat/pull/9108))
+
 - Creating channels on Firefox ([#9109](https://github.com/RocketChat/Rocket.Chat/pull/9109) by [@karlprieb](https://github.com/karlprieb))
+
 - Some UI problems on 0.60 ([#9095](https://github.com/RocketChat/Rocket.Chat/pull/9095) by [@karlprieb](https://github.com/karlprieb))
+
 - Update rocketchat:streamer to be compatible with previous version ([#9094](https://github.com/RocketChat/Rocket.Chat/pull/9094))
+
 - Importers not recovering when an error occurs ([#9134](https://github.com/RocketChat/Rocket.Chat/pull/9134))
+
 - Do not block room while loading history ([#9121](https://github.com/RocketChat/Rocket.Chat/pull/9121))
+
 - Channel page error ([#9091](https://github.com/RocketChat/Rocket.Chat/pull/9091) by [@ggrish](https://github.com/ggrish))
+
 - Update Rocket.Chat for sandstorm ([#9062](https://github.com/RocketChat/Rocket.Chat/pull/9062) by [@peterlee0127](https://github.com/peterlee0127))
+
 - modal data on enter and modal style for file preview ([#9171](https://github.com/RocketChat/Rocket.Chat/pull/9171) by [@karlprieb](https://github.com/karlprieb))
+
 - show oauth logins when adblock is used ([#9170](https://github.com/RocketChat/Rocket.Chat/pull/9170) by [@karlprieb](https://github.com/karlprieb))
+
 - Last sent message reoccurs in textbox ([#9169](https://github.com/RocketChat/Rocket.Chat/pull/9169))
+
 - Made welcome emails more readable ([#9193](https://github.com/RocketChat/Rocket.Chat/pull/9193) by [@HammyHavoc](https://github.com/HammyHavoc))
+
 - Unread bar position when room have announcement ([#9188](https://github.com/RocketChat/Rocket.Chat/pull/9188) by [@karlprieb](https://github.com/karlprieb))
+
 - Emoji size on last message preview ([#9186](https://github.com/RocketChat/Rocket.Chat/pull/9186) by [@karlprieb](https://github.com/karlprieb))
+
 - Cursor position when reply on safari ([#9185](https://github.com/RocketChat/Rocket.Chat/pull/9185) by [@karlprieb](https://github.com/karlprieb))
+
 - "Use Emoji" preference not working ([#9182](https://github.com/RocketChat/Rocket.Chat/pull/9182) by [@karlprieb](https://github.com/karlprieb))
+
 - make the cross icon on user selection at channel creation page work ([#9176](https://github.com/RocketChat/Rocket.Chat/pull/9176) by [@karlprieb](https://github.com/karlprieb) & [@vitor-nagao](https://github.com/vitor-nagao))
+
 - go to replied message ([#9172](https://github.com/RocketChat/Rocket.Chat/pull/9172) by [@karlprieb](https://github.com/karlprieb))
+
 - channel create scroll on small screens ([#9168](https://github.com/RocketChat/Rocket.Chat/pull/9168) by [@karlprieb](https://github.com/karlprieb))
+
 - Error when user roles is missing or is invalid ([#9040](https://github.com/RocketChat/Rocket.Chat/pull/9040) by [@paulovitin](https://github.com/paulovitin))
+
 - Make mentions and menu icons color darker ([#8922](https://github.com/RocketChat/Rocket.Chat/pull/8922) by [@karlprieb](https://github.com/karlprieb))
+
 - Show modal with announcement ([#9241](https://github.com/RocketChat/Rocket.Chat/pull/9241) by [@karlprieb](https://github.com/karlprieb))
+
 - File upload not working on IE and weird on Chrome ([#9206](https://github.com/RocketChat/Rocket.Chat/pull/9206) by [@karlprieb](https://github.com/karlprieb))
+
 - "Enter usernames" placeholder is cutting in "create channel" view ([#9194](https://github.com/RocketChat/Rocket.Chat/pull/9194) by [@TheReal1604](https://github.com/TheReal1604))
+
 - Move emojipicker css to theme package ([#9243](https://github.com/RocketChat/Rocket.Chat/pull/9243) by [@karlprieb](https://github.com/karlprieb))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.60.0 ([#9259](https://github.com/RocketChat/Rocket.Chat/pull/9259))
+
 - Fix tag build ([#9084](https://github.com/RocketChat/Rocket.Chat/pull/9084))
+
 - Turn off prettyJson if the node environment isn't development ([#9068](https://github.com/RocketChat/Rocket.Chat/pull/9068))
+
 - Fix api regression (exception when deleting user) ([#9049](https://github.com/RocketChat/Rocket.Chat/pull/9049))
+
 - Use real names for user and room in emails ([#7922](https://github.com/RocketChat/Rocket.Chat/pull/7922) by [@danischreiber](https://github.com/danischreiber))
+
 - [MOVE] Move mentions files to client/server ([#8142](https://github.com/RocketChat/Rocket.Chat/pull/8142) by [@vcapretz](https://github.com/vcapretz))
+
 - Update multiple-instance-status package ([#9018](https://github.com/RocketChat/Rocket.Chat/pull/9018))
+
 - Use redhat official image with openshift ([#9007](https://github.com/RocketChat/Rocket.Chat/pull/9007))
+
 - Added d2c.io to deployment ([#8975](https://github.com/RocketChat/Rocket.Chat/pull/8975) by [@mastappl](https://github.com/mastappl))
+
 - LingoHub based on develop ([#8831](https://github.com/RocketChat/Rocket.Chat/pull/8831))
+
 - Fix snap download url ([#8981](https://github.com/RocketChat/Rocket.Chat/pull/8981))
+
 - Add a few dots in readme.md ([#8906](https://github.com/RocketChat/Rocket.Chat/pull/8906) by [@dusta](https://github.com/dusta))
+
 - Changed wording for "Maximum Allowed Message Size" ([#8872](https://github.com/RocketChat/Rocket.Chat/pull/8872) by [@HammyHavoc](https://github.com/HammyHavoc))
+
 - Fix Docker image build ([#8862](https://github.com/RocketChat/Rocket.Chat/pull/8862))
+
 - Fix link to .asc file on S3 ([#8829](https://github.com/RocketChat/Rocket.Chat/pull/8829))
+
 - Bump version to 0.60.0-develop ([#8820](https://github.com/RocketChat/Rocket.Chat/pull/8820) by [@gdelavald](https://github.com/gdelavald) & [@karlprieb](https://github.com/karlprieb))
+
 - Update path for s3 redirect in circle ci ([#8819](https://github.com/RocketChat/Rocket.Chat/pull/8819))
+
 - Remove chatops package ([#8742](https://github.com/RocketChat/Rocket.Chat/pull/8742))
+
 - Removed tmeasday:crypto-md5 ([#8743](https://github.com/RocketChat/Rocket.Chat/pull/8743))
+
 - Update meteor package to 1.8.1 ([#8802](https://github.com/RocketChat/Rocket.Chat/pull/8802))
+
 - Fix typo ([#8705](https://github.com/RocketChat/Rocket.Chat/pull/8705) by [@rmetzler](https://github.com/rmetzler))
+
 - [Fix] Store Outgoing Integration Result as String in Mongo ([#8413](https://github.com/RocketChat/Rocket.Chat/pull/8413) by [@cpitman](https://github.com/cpitman))
+
 - Update DEMO to OPEN links ([#8793](https://github.com/RocketChat/Rocket.Chat/pull/8793))
+
 - Fix Travis CI build ([#8750](https://github.com/RocketChat/Rocket.Chat/pull/8750))
+
 - Updated comments. ([#8719](https://github.com/RocketChat/Rocket.Chat/pull/8719) by [@jasonjyu](https://github.com/jasonjyu))
+
 - Fix community links in readme ([#8589](https://github.com/RocketChat/Rocket.Chat/pull/8589))
+
 - [MOVE] Move favico to client folder ([#8077](https://github.com/RocketChat/Rocket.Chat/pull/8077) by [@vcapretz](https://github.com/vcapretz))
+
 - [MOVE] Move files from emojione to client/server folders ([#8078](https://github.com/RocketChat/Rocket.Chat/pull/8078) by [@vcapretz](https://github.com/vcapretz))
+
 - [MOVE] Move files from slashcommands-unarchive to client/server folders ([#8084](https://github.com/RocketChat/Rocket.Chat/pull/8084) by [@vcapretz](https://github.com/vcapretz))
+
 - [MOVE] Move slashcommands-open to client folder ([#8132](https://github.com/RocketChat/Rocket.Chat/pull/8132) by [@vcapretz](https://github.com/vcapretz))
+
 - [MOVE] Move kick command to client/server folders ([#8135](https://github.com/RocketChat/Rocket.Chat/pull/8135) by [@vcapretz](https://github.com/vcapretz))
+
 - [MOVE] Move join command to client/server folder ([#8136](https://github.com/RocketChat/Rocket.Chat/pull/8136) by [@vcapretz](https://github.com/vcapretz))
+
 - [MOVE] Move inviteall command to client/server folder ([#8137](https://github.com/RocketChat/Rocket.Chat/pull/8137) by [@vcapretz](https://github.com/vcapretz))
+
 - [MOVE] Move invite command to client/server folder ([#8138](https://github.com/RocketChat/Rocket.Chat/pull/8138) by [@vcapretz](https://github.com/vcapretz))
+
 - [MOVE] Move create command to client/server folder ([#8139](https://github.com/RocketChat/Rocket.Chat/pull/8139) by [@vcapretz](https://github.com/vcapretz))
+
 - [MOVE] Move archiveroom command to client/server folders ([#8140](https://github.com/RocketChat/Rocket.Chat/pull/8140) by [@vcapretz](https://github.com/vcapretz))
+
 - [MOVE] Move slackbridge to client/server folders ([#8141](https://github.com/RocketChat/Rocket.Chat/pull/8141) by [@vcapretz](https://github.com/vcapretz))
+
 - [MOVE] Move logger files to client/server folders ([#8150](https://github.com/RocketChat/Rocket.Chat/pull/8150) by [@vcapretz](https://github.com/vcapretz))
+
 - [MOVE] Move timesync files to client/server folders ([#8152](https://github.com/RocketChat/Rocket.Chat/pull/8152) by [@vcapretz](https://github.com/vcapretz))
+
 - Adding: How to Install in WeDeploy ([#8036](https://github.com/RocketChat/Rocket.Chat/pull/8036) by [@thompsonemerson](https://github.com/thompsonemerson))
+
 - Revert "npm deps update" ([#7983](https://github.com/RocketChat/Rocket.Chat/pull/7983))
+
 - npm deps update ([#7969](https://github.com/RocketChat/Rocket.Chat/pull/7969))
+
 - Added RocketChatLauncher (SaaS) ([#6606](https://github.com/RocketChat/Rocket.Chat/pull/6606) by [@designgurudotorg](https://github.com/designgurudotorg))
+
 - Develop sync ([#7866](https://github.com/RocketChat/Rocket.Chat/pull/7866))
+
 - Fix: users listed as online after API login ([#9111](https://github.com/RocketChat/Rocket.Chat/pull/9111))
+
 - Fix regression in api channels.members ([#9110](https://github.com/RocketChat/Rocket.Chat/pull/9110))
+
 - Fix: Clear all unreads modal not closing after confirming ([#9137](https://github.com/RocketChat/Rocket.Chat/pull/9137))
+
 - Fix: Message action quick buttons drops if "new message" divider is being shown ([#9138](https://github.com/RocketChat/Rocket.Chat/pull/9138))
+
 - Fix: Confirmation modals showing `Send` button ([#9136](https://github.com/RocketChat/Rocket.Chat/pull/9136))
+
 - Fix: Multiple unread indicators ([#9120](https://github.com/RocketChat/Rocket.Chat/pull/9120))
+
 - Fix: Messages being displayed in reverse order ([#9144](https://github.com/RocketChat/Rocket.Chat/pull/9144))
+
 - Fix: UI: Descenders of glyphs are cut off ([#9166](https://github.com/RocketChat/Rocket.Chat/pull/9166))
+
 - Fix: Click on channel name - hover area bigger than link area ([#9165](https://github.com/RocketChat/Rocket.Chat/pull/9165))
+
 - Fix: Can’t login using LDAP via REST ([#9162](https://github.com/RocketChat/Rocket.Chat/pull/9162))
+
 - Fix: Unread line ([#9149](https://github.com/RocketChat/Rocket.Chat/pull/9149))
+
 - Fix test without oplog by waiting a successful login on changing users ([#9146](https://github.com/RocketChat/Rocket.Chat/pull/9146))
+
 - Replace postcss-nesting with postcss-nested ([#9200](https://github.com/RocketChat/Rocket.Chat/pull/9200))
+
 - Dependencies Update ([#9197](https://github.com/RocketChat/Rocket.Chat/pull/9197))
+
 - Fix: Rooms and users are using different avatar style ([#9196](https://github.com/RocketChat/Rocket.Chat/pull/9196))
+
 - Typo: German language file ([#9190](https://github.com/RocketChat/Rocket.Chat/pull/9190) by [@TheReal1604](https://github.com/TheReal1604))
+
 - Fix: Snippet name to not showing in snippet list ([#9184](https://github.com/RocketChat/Rocket.Chat/pull/9184) by [@karlprieb](https://github.com/karlprieb))
+
 - Fix/api me only return verified ([#9183](https://github.com/RocketChat/Rocket.Chat/pull/9183))
+
 - Fix: UI: Descenders of glyphs are cut off ([#9181](https://github.com/RocketChat/Rocket.Chat/pull/9181))
+
 - Fix: Unneeded warning in payload of REST API calls ([#9240](https://github.com/RocketChat/Rocket.Chat/pull/9240))
+
 - Fix: Missing option to set user's avatar from a url ([#9229](https://github.com/RocketChat/Rocket.Chat/pull/9229))
+
 - Fix: updating last message on message edit or delete ([#9227](https://github.com/RocketChat/Rocket.Chat/pull/9227))
+
 - Fix: Username find is matching partially ([#9217](https://github.com/RocketChat/Rocket.Chat/pull/9217))
+
 - Fix: Upload access control too distributed ([#9215](https://github.com/RocketChat/Rocket.Chat/pull/9215))
+
 - Do not change room icon color when room is unread ([#9257](https://github.com/RocketChat/Rocket.Chat/pull/9257))
+
 - LingoHub based on develop ([#9256](https://github.com/RocketChat/Rocket.Chat/pull/9256))
+
 - Add curl, its missing on worker nodes so has to be explicitly added ([#9248](https://github.com/RocketChat/Rocket.Chat/pull/9248))
+
 - Fix: Sidebar item on rtl and small devices ([#9247](https://github.com/RocketChat/Rocket.Chat/pull/9247) by [@karlprieb](https://github.com/karlprieb))
 
 </details>
@@ -5817,6 +8511,7 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Fix tag build ([#8973](https://github.com/RocketChat/Rocket.Chat/pull/8973))
 
 </details>
@@ -5835,6 +8530,7 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Fix CircleCI deploy filter ([#8972](https://github.com/RocketChat/Rocket.Chat/pull/8972))
 
 </details>
@@ -5852,12 +8548,15 @@
 
 ### 🐛 Bug fixes
 
+
 - Channel settings buttons ([#8753](https://github.com/RocketChat/Rocket.Chat/pull/8753) by [@karlprieb](https://github.com/karlprieb))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release/0.59.4 ([#8967](https://github.com/RocketChat/Rocket.Chat/pull/8967) by [@cpitman](https://github.com/cpitman) & [@karlprieb](https://github.com/karlprieb))
+
 - Add CircleCI ([#8685](https://github.com/RocketChat/Rocket.Chat/pull/8685))
 
 </details>
@@ -5882,18 +8581,27 @@
 
 ### 🐛 Bug fixes
 
+
 - AmazonS3: Quote file.name for ContentDisposition for files with commas ([#8593](https://github.com/RocketChat/Rocket.Chat/pull/8593) by [@xenithorb](https://github.com/xenithorb))
+
 - Fix e-mail message forward ([#8645](https://github.com/RocketChat/Rocket.Chat/pull/8645))
+
 - Audio message icon ([#8648](https://github.com/RocketChat/Rocket.Chat/pull/8648) by [@karlprieb](https://github.com/karlprieb))
+
 - Highlighted color height issue ([#8431](https://github.com/RocketChat/Rocket.Chat/pull/8431) by [@cyclops24](https://github.com/cyclops24))
+
 - Update pt-BR translation ([#8655](https://github.com/RocketChat/Rocket.Chat/pull/8655) by [@rodorgas](https://github.com/rodorgas))
+
 - Fix typos ([#8679](https://github.com/RocketChat/Rocket.Chat/pull/8679))
+
 - LDAP not respecting UTF8 characters & Sync Interval not working ([#8691](https://github.com/RocketChat/Rocket.Chat/pull/8691))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - removing a duplicate line ([#8434](https://github.com/RocketChat/Rocket.Chat/pull/8434) by [@vikaskedia](https://github.com/vikaskedia))
+
 - install grpc package manually to fix snap armhf build ([#8653](https://github.com/RocketChat/Rocket.Chat/pull/8653))
 
 </details>
@@ -5921,11 +8629,17 @@
 
 ### 🐛 Bug fixes
 
+
 - Missing scroll at create channel page ([#8637](https://github.com/RocketChat/Rocket.Chat/pull/8637) by [@karlprieb](https://github.com/karlprieb))
+
 - Message popup menu on mobile/cordova ([#8634](https://github.com/RocketChat/Rocket.Chat/pull/8634) by [@karlprieb](https://github.com/karlprieb))
+
 - API channel/group.members not sorting ([#8635](https://github.com/RocketChat/Rocket.Chat/pull/8635))
+
 - LDAP not merging existent users && Wrong id link generation ([#8613](https://github.com/RocketChat/Rocket.Chat/pull/8613))
+
 - encode filename in url to prevent links breaking ([#8551](https://github.com/RocketChat/Rocket.Chat/pull/8551) by [@joesitton](https://github.com/joesitton))
+
 - Fix guest pool inquiry taking ([#8577](https://github.com/RocketChat/Rocket.Chat/pull/8577))
 
 ### 👩‍💻👨‍💻 Contributors 😍
@@ -5947,9 +8661,13 @@
 
 ### 🐛 Bug fixes
 
+
 - Color reset when default value editor is different ([#8543](https://github.com/RocketChat/Rocket.Chat/pull/8543))
+
 - Wrong colors after migration 103 ([#8547](https://github.com/RocketChat/Rocket.Chat/pull/8547))
+
 - LDAP login error regression at 0.59.0 ([#8541](https://github.com/RocketChat/Rocket.Chat/pull/8541))
+
 - Migration 103 wrong converting primrary colors ([#8544](https://github.com/RocketChat/Rocket.Chat/pull/8544))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -5966,202 +8684,392 @@
 
 ### 🎉 New features
 
+
 - Replace message cog for vertical menu ([#7864](https://github.com/RocketChat/Rocket.Chat/pull/7864) by [@karlprieb](https://github.com/karlprieb))
+
 - block users to mention unknow users ([#7830](https://github.com/RocketChat/Rocket.Chat/pull/7830))
+
 - Allow ldap mapping of customFields ([#7614](https://github.com/RocketChat/Rocket.Chat/pull/7614) by [@goiaba](https://github.com/goiaba))
+
 - Create a standard for our svg icons ([#7853](https://github.com/RocketChat/Rocket.Chat/pull/7853) by [@karlprieb](https://github.com/karlprieb))
+
 - Allows admin to list all groups with API ([#7565](https://github.com/RocketChat/Rocket.Chat/pull/7565) by [@mboudet](https://github.com/mboudet))
+
 - Add markdown parser "marked" ([#7852](https://github.com/RocketChat/Rocket.Chat/pull/7852) by [@nishimaki10](https://github.com/nishimaki10))
+
 - Audio Notification updated in sidebar ([#7817](https://github.com/RocketChat/Rocket.Chat/pull/7817) by [@aditya19496](https://github.com/aditya19496) & [@maarten-v](https://github.com/maarten-v))
+
 - Search users by fields defined by admin ([#7612](https://github.com/RocketChat/Rocket.Chat/pull/7612) by [@goiaba](https://github.com/goiaba))
+
 - Template to show Custom Fields in user info view ([#7688](https://github.com/RocketChat/Rocket.Chat/pull/7688) by [@goiaba](https://github.com/goiaba))
+
 - Add room type as a class to the ul-group of rooms ([#7711](https://github.com/RocketChat/Rocket.Chat/pull/7711) by [@danischreiber](https://github.com/danischreiber))
+
 - Add classes to notification menu so they can be hidden in css ([#7636](https://github.com/RocketChat/Rocket.Chat/pull/7636) by [@danischreiber](https://github.com/danischreiber))
+
 - Adds a Keyboard Shortcut option to the flextab ([#5902](https://github.com/RocketChat/Rocket.Chat/pull/5902) by [@cnash](https://github.com/cnash) & [@karlprieb](https://github.com/karlprieb))
+
 - Integrated personal email gateway (GSoC'17) ([#7342](https://github.com/RocketChat/Rocket.Chat/pull/7342) by [@pkgodara](https://github.com/pkgodara))
+
 - Add tags to uploaded images using Google Cloud Vision API ([#6301](https://github.com/RocketChat/Rocket.Chat/pull/6301) by [@karlprieb](https://github.com/karlprieb))
+
 - Package to render issue numbers into links to an issue tracker. ([#6700](https://github.com/RocketChat/Rocket.Chat/pull/6700) by [@TAdeJong](https://github.com/TAdeJong) & [@TobiasKappe](https://github.com/TobiasKappe))
+
 - Automatically select the first channel ([#7350](https://github.com/RocketChat/Rocket.Chat/pull/7350) by [@antaryami-sahoo](https://github.com/antaryami-sahoo))
+
 - Rocket.Chat UI Redesign ([#7643](https://github.com/RocketChat/Rocket.Chat/pull/7643))
+
 - Upgrade to meteor 1.5.2 ([#8073](https://github.com/RocketChat/Rocket.Chat/pull/8073))
+
 - Enable read only channel creation ([#8260](https://github.com/RocketChat/Rocket.Chat/pull/8260) by [@karlprieb](https://github.com/karlprieb))
+
 - Add RD Station integration to livechat ([#8304](https://github.com/RocketChat/Rocket.Chat/pull/8304))
+
 - Unify unread and mentions badge ([#8361](https://github.com/RocketChat/Rocket.Chat/pull/8361) by [@karlprieb](https://github.com/karlprieb))
+
 - make sidebar item width 100% ([#8362](https://github.com/RocketChat/Rocket.Chat/pull/8362) by [@karlprieb](https://github.com/karlprieb))
+
 - Smaller accountBox ([#8360](https://github.com/RocketChat/Rocket.Chat/pull/8360) by [@karlprieb](https://github.com/karlprieb))
+
 - Setting to disable MarkDown and enable AutoLinker ([#8459](https://github.com/RocketChat/Rocket.Chat/pull/8459))
 
 ### 🐛 Bug fixes
 
+
 - File upload on multi-instances using a path prefix ([#7855](https://github.com/RocketChat/Rocket.Chat/pull/7855) by [@Darkneon](https://github.com/Darkneon))
+
 - Fix migration 100 ([#7863](https://github.com/RocketChat/Rocket.Chat/pull/7863))
+
 - Email message forward error ([#7846](https://github.com/RocketChat/Rocket.Chat/pull/7846))
+
 - Add CSS support for Safari versions > 7 ([#7854](https://github.com/RocketChat/Rocket.Chat/pull/7854))
+
 - Fix black background on transparent avatars ([#7168](https://github.com/RocketChat/Rocket.Chat/pull/7168))
+
 - Google vision NSFW tag ([#7825](https://github.com/RocketChat/Rocket.Chat/pull/7825))
+
 - meteor-accounts-saml issue with ns0,ns1 namespaces, makes it compatible with pysaml2 lib ([#7721](https://github.com/RocketChat/Rocket.Chat/pull/7721) by [@arminfelder](https://github.com/arminfelder))
+
 - Fix new-message button showing on search ([#7823](https://github.com/RocketChat/Rocket.Chat/pull/7823))
+
 - Settings not getting applied from Meteor.settings and process.env  ([#7779](https://github.com/RocketChat/Rocket.Chat/pull/7779) by [@Darkneon](https://github.com/Darkneon))
+
 - scroll on flex-tab ([#7748](https://github.com/RocketChat/Rocket.Chat/pull/7748))
+
 - Dutch translations ([#7815](https://github.com/RocketChat/Rocket.Chat/pull/7815) by [@maarten-v](https://github.com/maarten-v))
+
 - Fix Dutch translation ([#7814](https://github.com/RocketChat/Rocket.Chat/pull/7814) by [@maarten-v](https://github.com/maarten-v))
+
 - Update Snap links ([#7778](https://github.com/RocketChat/Rocket.Chat/pull/7778) by [@MichaelGooden](https://github.com/MichaelGooden))
+
 - Remove redundant "do" in "Are you sure ...?" messages. ([#7809](https://github.com/RocketChat/Rocket.Chat/pull/7809) by [@xurizaemon](https://github.com/xurizaemon))
+
 - Fixed function closure syntax allowing validation emails to be sent. ([#7758](https://github.com/RocketChat/Rocket.Chat/pull/7758) by [@snoozan](https://github.com/snoozan))
+
 - Fix avatar upload fail on Cordova app ([#7656](https://github.com/RocketChat/Rocket.Chat/pull/7656) by [@ccfang](https://github.com/ccfang))
+
 - Make link inside YouTube preview open in new tab ([#7679](https://github.com/RocketChat/Rocket.Chat/pull/7679) by [@1lann](https://github.com/1lann))
+
 - Remove references to non-existent tests ([#7672](https://github.com/RocketChat/Rocket.Chat/pull/7672) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - Example usage of unsubscribe.js ([#7673](https://github.com/RocketChat/Rocket.Chat/pull/7673) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - sidebar paddings ([#7880](https://github.com/RocketChat/Rocket.Chat/pull/7880) by [@karlprieb](https://github.com/karlprieb))
+
 - Adds default search text padding for emoji search ([#7878](https://github.com/RocketChat/Rocket.Chat/pull/7878) by [@gdelavald](https://github.com/gdelavald))
+
 - search results position on sidebar ([#7881](https://github.com/RocketChat/Rocket.Chat/pull/7881) by [@karlprieb](https://github.com/karlprieb))
+
 - hyperlink style on sidebar footer ([#7882](https://github.com/RocketChat/Rocket.Chat/pull/7882) by [@karlprieb](https://github.com/karlprieb))
+
 - popover position on mobile ([#7883](https://github.com/RocketChat/Rocket.Chat/pull/7883) by [@karlprieb](https://github.com/karlprieb))
+
 - message actions over unread bar ([#7885](https://github.com/RocketChat/Rocket.Chat/pull/7885) by [@karlprieb](https://github.com/karlprieb))
+
 - livechat icon ([#7886](https://github.com/RocketChat/Rocket.Chat/pull/7886) by [@karlprieb](https://github.com/karlprieb))
+
 - Makes text action menu width based on content size ([#7887](https://github.com/RocketChat/Rocket.Chat/pull/7887) by [@gdelavald](https://github.com/gdelavald))
+
 - sidebar buttons and badge paddings ([#7888](https://github.com/RocketChat/Rocket.Chat/pull/7888) by [@karlprieb](https://github.com/karlprieb))
+
 - Fix google play logo on repo README ([#7912](https://github.com/RocketChat/Rocket.Chat/pull/7912) by [@luizbills](https://github.com/luizbills))
+
 - Fix livechat toggle UI issue ([#7904](https://github.com/RocketChat/Rocket.Chat/pull/7904))
+
 - Remove break change in Realtime API ([#7895](https://github.com/RocketChat/Rocket.Chat/pull/7895))
+
 - Window exception when parsing Markdown on server ([#7893](https://github.com/RocketChat/Rocket.Chat/pull/7893))
+
 - Text area buttons and layout on mobile  ([#7985](https://github.com/RocketChat/Rocket.Chat/pull/7985))
+
 - Double scroll on 'keyboard shortcuts' menu in sidepanel ([#7927](https://github.com/RocketChat/Rocket.Chat/pull/7927) by [@aditya19496](https://github.com/aditya19496))
+
 - Broken embedded view layout ([#7944](https://github.com/RocketChat/Rocket.Chat/pull/7944) by [@karlprieb](https://github.com/karlprieb))
+
 - Textarea on firefox ([#7986](https://github.com/RocketChat/Rocket.Chat/pull/7986))
+
 - Chat box no longer auto-focuses when typing ([#7984](https://github.com/RocketChat/Rocket.Chat/pull/7984))
+
 - Add padding on messages to allow space to the action buttons ([#7971](https://github.com/RocketChat/Rocket.Chat/pull/7971))
+
 - Small alignment fixes ([#7970](https://github.com/RocketChat/Rocket.Chat/pull/7970))
+
 - Markdown being rendered in code tags ([#7965](https://github.com/RocketChat/Rocket.Chat/pull/7965))
+
 - Fix the status on the members list ([#7963](https://github.com/RocketChat/Rocket.Chat/pull/7963))
+
 - status and active room colors on sidebar ([#7960](https://github.com/RocketChat/Rocket.Chat/pull/7960) by [@karlprieb](https://github.com/karlprieb))
+
 - OTR buttons padding ([#7954](https://github.com/RocketChat/Rocket.Chat/pull/7954) by [@karlprieb](https://github.com/karlprieb))
+
 - username ellipsis on firefox ([#7953](https://github.com/RocketChat/Rocket.Chat/pull/7953) by [@karlprieb](https://github.com/karlprieb))
+
 - Document README.md. Drupal repo out of date ([#7948](https://github.com/RocketChat/Rocket.Chat/pull/7948) by [@Lawri-van-Buel](https://github.com/Lawri-van-Buel))
+
 - Fix placeholders in account profile ([#7945](https://github.com/RocketChat/Rocket.Chat/pull/7945) by [@josiasds](https://github.com/josiasds))
+
 - Broken emoji picker on firefox ([#7943](https://github.com/RocketChat/Rocket.Chat/pull/7943) by [@karlprieb](https://github.com/karlprieb))
+
 - Create channel button on Firefox ([#7942](https://github.com/RocketChat/Rocket.Chat/pull/7942) by [@karlprieb](https://github.com/karlprieb))
+
 - Show leader on first load ([#7712](https://github.com/RocketChat/Rocket.Chat/pull/7712) by [@danischreiber](https://github.com/danischreiber))
+
 - Vertical menu on flex-tab ([#7988](https://github.com/RocketChat/Rocket.Chat/pull/7988) by [@karlprieb](https://github.com/karlprieb))
+
 - Invisible leader bar on hover ([#8048](https://github.com/RocketChat/Rocket.Chat/pull/8048))
+
 - Prevent autotranslate tokens race condition ([#8046](https://github.com/RocketChat/Rocket.Chat/pull/8046))
+
 - copy to clipboard and update clipboard.js library ([#8039](https://github.com/RocketChat/Rocket.Chat/pull/8039) by [@karlprieb](https://github.com/karlprieb))
+
 - message-box autogrow ([#8019](https://github.com/RocketChat/Rocket.Chat/pull/8019) by [@karlprieb](https://github.com/karlprieb))
+
 - search results height ([#8018](https://github.com/RocketChat/Rocket.Chat/pull/8018) by [@gdelavald](https://github.com/gdelavald) & [@karlprieb](https://github.com/karlprieb))
+
 - room icon on header ([#8017](https://github.com/RocketChat/Rocket.Chat/pull/8017) by [@karlprieb](https://github.com/karlprieb))
+
 - Hide scrollbar on login page if not necessary ([#8014](https://github.com/RocketChat/Rocket.Chat/pull/8014) by [@alexbrazier](https://github.com/alexbrazier))
+
 - Error when translating message ([#8001](https://github.com/RocketChat/Rocket.Chat/pull/8001))
+
 - Recent emojis not updated when adding via text ([#7998](https://github.com/RocketChat/Rocket.Chat/pull/7998))
+
 - [PL] Polish translation ([#7989](https://github.com/RocketChat/Rocket.Chat/pull/7989) by [@Rzeszow](https://github.com/Rzeszow))
+
 - Fix email on mention ([#7754](https://github.com/RocketChat/Rocket.Chat/pull/7754))
+
 - RTL ([#8112](https://github.com/RocketChat/Rocket.Chat/pull/8112))
+
 - Dynamic popover ([#8101](https://github.com/RocketChat/Rocket.Chat/pull/8101) by [@karlprieb](https://github.com/karlprieb))
+
 - Settings description not showing ([#8122](https://github.com/RocketChat/Rocket.Chat/pull/8122))
+
 - Fix setting user avatar on LDAP login ([#8099](https://github.com/RocketChat/Rocket.Chat/pull/8099))
+
 - Not sending email to mentioned users with unchanged preference ([#8059](https://github.com/RocketChat/Rocket.Chat/pull/8059))
+
 - Scroll on messagebox ([#8047](https://github.com/RocketChat/Rocket.Chat/pull/8047))
+
 - Allow unknown file types if no allowed whitelist has been set (#7074) ([#8172](https://github.com/RocketChat/Rocket.Chat/pull/8172) by [@TriPhoenix](https://github.com/TriPhoenix))
+
 - Issue #8166 where empty analytics setting breaks to load Piwik script ([#8167](https://github.com/RocketChat/Rocket.Chat/pull/8167) by [@ruKurz](https://github.com/ruKurz))
+
 - Sidebar and RTL alignments ([#8154](https://github.com/RocketChat/Rocket.Chat/pull/8154) by [@karlprieb](https://github.com/karlprieb))
+
 - "*.members" rest api being useless and only returning usernames ([#8147](https://github.com/RocketChat/Rocket.Chat/pull/8147))
+
 - Fix iframe login API response (issue #8145) ([#8146](https://github.com/RocketChat/Rocket.Chat/pull/8146) by [@astax-t](https://github.com/astax-t))
+
 - Text area lost text when page reloads ([#8159](https://github.com/RocketChat/Rocket.Chat/pull/8159))
+
 - Fix new room sound being played too much ([#8144](https://github.com/RocketChat/Rocket.Chat/pull/8144))
+
 - Add admin audio preferences translations ([#8094](https://github.com/RocketChat/Rocket.Chat/pull/8094))
+
 - Leave and hide buttons was removed ([#8213](https://github.com/RocketChat/Rocket.Chat/pull/8213) by [@karlprieb](https://github.com/karlprieb))
+
 - Incorrect URL for login terms when using prefix ([#8211](https://github.com/RocketChat/Rocket.Chat/pull/8211) by [@Darkneon](https://github.com/Darkneon))
+
 - User avatar in DM list. ([#8210](https://github.com/RocketChat/Rocket.Chat/pull/8210))
+
 - Scrollbar not using new style ([#8190](https://github.com/RocketChat/Rocket.Chat/pull/8190))
+
 - sidenav colors, hide and leave, create channel on safari ([#8257](https://github.com/RocketChat/Rocket.Chat/pull/8257) by [@karlprieb](https://github.com/karlprieb))
+
 - make sidebar item animation fast ([#8262](https://github.com/RocketChat/Rocket.Chat/pull/8262) by [@karlprieb](https://github.com/karlprieb))
+
 - RTL on reply ([#8261](https://github.com/RocketChat/Rocket.Chat/pull/8261) by [@karlprieb](https://github.com/karlprieb))
+
 - clipboard and permalink on new popover ([#8259](https://github.com/RocketChat/Rocket.Chat/pull/8259) by [@karlprieb](https://github.com/karlprieb))
+
 - sidenav mentions on hover ([#8252](https://github.com/RocketChat/Rocket.Chat/pull/8252) by [@karlprieb](https://github.com/karlprieb))
+
 - Api groups.files is always returning empty ([#8241](https://github.com/RocketChat/Rocket.Chat/pull/8241))
+
 - Case insensitive SAML email check ([#8216](https://github.com/RocketChat/Rocket.Chat/pull/8216) by [@arminfelder](https://github.com/arminfelder))
+
 - Execute meteor reset on TRAVIS_TAG builds ([#8310](https://github.com/RocketChat/Rocket.Chat/pull/8310))
+
 - Call buttons with wrong margin on RTL ([#8307](https://github.com/RocketChat/Rocket.Chat/pull/8307) by [@karlprieb](https://github.com/karlprieb))
+
 - Emoji Picker hidden for reactions in RTL ([#8300](https://github.com/RocketChat/Rocket.Chat/pull/8300) by [@karlprieb](https://github.com/karlprieb))
+
 - Amin menu not showing all items & File list breaking line ([#8299](https://github.com/RocketChat/Rocket.Chat/pull/8299) by [@karlprieb](https://github.com/karlprieb))
+
 - TypeError: Cannot read property 't' of undefined ([#8298](https://github.com/RocketChat/Rocket.Chat/pull/8298))
+
 - Wrong file name when upload to AWS S3 ([#8296](https://github.com/RocketChat/Rocket.Chat/pull/8296))
+
 - Check attachments is defined before accessing first element ([#8295](https://github.com/RocketChat/Rocket.Chat/pull/8295) by [@Darkneon](https://github.com/Darkneon))
+
 - Missing placeholder translations ([#8286](https://github.com/RocketChat/Rocket.Chat/pull/8286))
+
 - fix color on unread messages ([#8282](https://github.com/RocketChat/Rocket.Chat/pull/8282))
+
 - "Cancel button" on modal in RTL in Firefox 55 ([#8278](https://github.com/RocketChat/Rocket.Chat/pull/8278) by [@cyclops24](https://github.com/cyclops24))
+
 - Attachment icons alignment in LTR and RTL ([#8271](https://github.com/RocketChat/Rocket.Chat/pull/8271) by [@cyclops24](https://github.com/cyclops24))
+
 - [i18n] My Profile & README.md links ([#8270](https://github.com/RocketChat/Rocket.Chat/pull/8270) by [@Rzeszow](https://github.com/Rzeszow))
+
 - some placeholder and phrase traslation fix ([#8269](https://github.com/RocketChat/Rocket.Chat/pull/8269) by [@cyclops24](https://github.com/cyclops24))
+
 - "Channel Setting" buttons alignment in RTL ([#8266](https://github.com/RocketChat/Rocket.Chat/pull/8266) by [@cyclops24](https://github.com/cyclops24))
+
 - Removing pipe and commas from custom emojis (#8168) ([#8237](https://github.com/RocketChat/Rocket.Chat/pull/8237) by [@matheusml](https://github.com/matheusml))
+
 - After deleting the room, cache is not synchronizing ([#8314](https://github.com/RocketChat/Rocket.Chat/pull/8314) by [@szluohua](https://github.com/szluohua))
+
 - Remove sidebar header on admin embedded version ([#8334](https://github.com/RocketChat/Rocket.Chat/pull/8334) by [@karlprieb](https://github.com/karlprieb))
+
 - Email Subjects not being sent ([#8317](https://github.com/RocketChat/Rocket.Chat/pull/8317))
+
 - Put delete action on another popover group ([#8315](https://github.com/RocketChat/Rocket.Chat/pull/8315) by [@karlprieb](https://github.com/karlprieb))
+
 - Mention unread indicator was removed ([#8316](https://github.com/RocketChat/Rocket.Chat/pull/8316))
+
 - Various LDAP issues & Missing pagination ([#8372](https://github.com/RocketChat/Rocket.Chat/pull/8372))
+
 - remove accountBox from admin menu ([#8358](https://github.com/RocketChat/Rocket.Chat/pull/8358) by [@karlprieb](https://github.com/karlprieb))
+
 - Missing i18n translations ([#8357](https://github.com/RocketChat/Rocket.Chat/pull/8357))
+
 - Sidebar item menu position in RTL ([#8397](https://github.com/RocketChat/Rocket.Chat/pull/8397) by [@cyclops24](https://github.com/cyclops24))
+
 - disabled katex tooltip on messageBox ([#8386](https://github.com/RocketChat/Rocket.Chat/pull/8386))
+
 - LDAP memory issues when pagination is not available ([#8457](https://github.com/RocketChat/Rocket.Chat/pull/8457))
+
 - Uncessary route reload break some routes ([#8514](https://github.com/RocketChat/Rocket.Chat/pull/8514))
+
 - Invalid Code message for password protected channel ([#8491](https://github.com/RocketChat/Rocket.Chat/pull/8491))
+
 - Wrong message when reseting password and 2FA is enabled ([#8489](https://github.com/RocketChat/Rocket.Chat/pull/8489))
+
 - Do not send joinCode field to clients ([#8527](https://github.com/RocketChat/Rocket.Chat/pull/8527))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Merge 0.58.4 to master ([#8420](https://github.com/RocketChat/Rocket.Chat/pull/8420))
+
 - 0.58.3 ([#8335](https://github.com/RocketChat/Rocket.Chat/pull/8335))
+
 - Mobile sidenav ([#7865](https://github.com/RocketChat/Rocket.Chat/pull/7865))
+
 - npm deps update ([#7842](https://github.com/RocketChat/Rocket.Chat/pull/7842))
+
 - LingoHub based on develop ([#7803](https://github.com/RocketChat/Rocket.Chat/pull/7803))
+
 - Additions to the REST API ([#7793](https://github.com/RocketChat/Rocket.Chat/pull/7793))
+
 - npm deps update ([#7755](https://github.com/RocketChat/Rocket.Chat/pull/7755))
+
 - FIX: Error when starting local development environment ([#7728](https://github.com/RocketChat/Rocket.Chat/pull/7728) by [@rdebeasi](https://github.com/rdebeasi))
+
 - Remove CircleCI ([#7739](https://github.com/RocketChat/Rocket.Chat/pull/7739))
+
 - Meteor packages and npm dependencies update ([#7677](https://github.com/RocketChat/Rocket.Chat/pull/7677))
+
 - [MOVE] Client folder rocketchat-colors ([#7664](https://github.com/RocketChat/Rocket.Chat/pull/7664) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - [MOVE] Client folder rocketchat-custom-oauth ([#7665](https://github.com/RocketChat/Rocket.Chat/pull/7665) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - [MOVE] Client folder rocketchat-tooltip ([#7666](https://github.com/RocketChat/Rocket.Chat/pull/7666) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - [MOVE] Client folder rocketchat-autolinker ([#7667](https://github.com/RocketChat/Rocket.Chat/pull/7667) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - [MOVE] Client folder rocketchat-cas ([#7668](https://github.com/RocketChat/Rocket.Chat/pull/7668) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - [MOVE] Client folder rocketchat-highlight-words ([#7669](https://github.com/RocketChat/Rocket.Chat/pull/7669) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - [MOVE] Client folder rocketchat-custom-sounds ([#7670](https://github.com/RocketChat/Rocket.Chat/pull/7670) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - [MOVE] Client folder rocketchat-emoji ([#7671](https://github.com/RocketChat/Rocket.Chat/pull/7671) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - Fix typo in generated URI ([#7661](https://github.com/RocketChat/Rocket.Chat/pull/7661) by [@Rohlik](https://github.com/Rohlik))
+
 - Bump version to 0.59.0-develop ([#7625](https://github.com/RocketChat/Rocket.Chat/pull/7625))
+
 - implemented new page-loader animated icon ([#2](https://github.com/RocketChat/Rocket.Chat/pull/2))
+
 - Hide flex-tab close button ([#7894](https://github.com/RocketChat/Rocket.Chat/pull/7894) by [@karlprieb](https://github.com/karlprieb))
+
 - Update BlackDuck URL ([#7941](https://github.com/RocketChat/Rocket.Chat/pull/7941))
+
 - [DOCS] Add native mobile app links into README and update button images ([#7909](https://github.com/RocketChat/Rocket.Chat/pull/7909) by [@rafaelks](https://github.com/rafaelks))
+
 - Remove unnecessary returns in cors common ([#8054](https://github.com/RocketChat/Rocket.Chat/pull/8054) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - npm deps update ([#8197](https://github.com/RocketChat/Rocket.Chat/pull/8197))
+
 - Fix more rtl issues ([#8194](https://github.com/RocketChat/Rocket.Chat/pull/8194) by [@karlprieb](https://github.com/karlprieb))
+
 - readme-file: fix broken link ([#8253](https://github.com/RocketChat/Rocket.Chat/pull/8253) by [@vcapretz](https://github.com/vcapretz))
+
 - Disable perfect scrollbar ([#8244](https://github.com/RocketChat/Rocket.Chat/pull/8244))
+
 - Fix `leave and hide` click, color and position ([#8243](https://github.com/RocketChat/Rocket.Chat/pull/8243) by [@karlprieb](https://github.com/karlprieb))
+
 - Deps update ([#8273](https://github.com/RocketChat/Rocket.Chat/pull/8273))
+
 - Update meteor to 1.5.2.2-rc.0 ([#8355](https://github.com/RocketChat/Rocket.Chat/pull/8355))
+
 - [FIX-RC] Mobile file upload not working ([#8331](https://github.com/RocketChat/Rocket.Chat/pull/8331) by [@karlprieb](https://github.com/karlprieb))
+
 - LingoHub based on develop ([#8375](https://github.com/RocketChat/Rocket.Chat/pull/8375))
+
 - Update Meteor to 1.5.2.2 ([#8364](https://github.com/RocketChat/Rocket.Chat/pull/8364))
+
 - Sync translations from LingoHub ([#8363](https://github.com/RocketChat/Rocket.Chat/pull/8363))
+
 - Remove field `lastActivity` from subscription data ([#8345](https://github.com/RocketChat/Rocket.Chat/pull/8345))
+
 - Fix: Account menu position on RTL ([#8416](https://github.com/RocketChat/Rocket.Chat/pull/8416) by [@karlprieb](https://github.com/karlprieb))
+
 - Fix: Missing LDAP option to show internal logs ([#8417](https://github.com/RocketChat/Rocket.Chat/pull/8417))
+
 - Fix: Missing LDAP reconnect setting ([#8414](https://github.com/RocketChat/Rocket.Chat/pull/8414))
+
 - Add i18n Title to snippet messages ([#8394](https://github.com/RocketChat/Rocket.Chat/pull/8394))
+
 - Fix: Missing settings to configure LDAP size and page limits ([#8398](https://github.com/RocketChat/Rocket.Chat/pull/8398))
+
 - Improve markdown parser code ([#8451](https://github.com/RocketChat/Rocket.Chat/pull/8451))
+
 - Change artifact path ([#8515](https://github.com/RocketChat/Rocket.Chat/pull/8515))
+
 - Color variables migration ([#8463](https://github.com/RocketChat/Rocket.Chat/pull/8463) by [@karlprieb](https://github.com/karlprieb))
+
 - Fix: Change password not working in new UI ([#8516](https://github.com/RocketChat/Rocket.Chat/pull/8516))
+
 - Enable AutoLinker back ([#8490](https://github.com/RocketChat/Rocket.Chat/pull/8490))
+
 - Fix artifact path ([#8518](https://github.com/RocketChat/Rocket.Chat/pull/8518))
+
 - Fix high CPU load when sending messages on large rooms (regression) ([#8520](https://github.com/RocketChat/Rocket.Chat/pull/8520))
+
 - Improve room sync speed ([#8529](https://github.com/RocketChat/Rocket.Chat/pull/8529))
 
 </details>
@@ -6233,6 +9141,7 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.58.2 ([#7841](https://github.com/RocketChat/Rocket.Chat/pull/7841) by [@snoozan](https://github.com/snoozan))
 
 </details>
@@ -6254,11 +9163,13 @@
 
 ### 🐛 Bug fixes
 
+
 - Fix flex tab not opening and getting offscreen ([#7781](https://github.com/RocketChat/Rocket.Chat/pull/7781))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.58.1 ([#7782](https://github.com/RocketChat/Rocket.Chat/pull/7782))
 
 </details>
@@ -6277,93 +9188,171 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Remove Sandstorm login method ([#7556](https://github.com/RocketChat/Rocket.Chat/pull/7556))
 
 ### 🎉 New features
 
+
 - Allow special chars on room names ([#7595](https://github.com/RocketChat/Rocket.Chat/pull/7595))
+
 - Add admin and user setting for notifications #4339 ([#7479](https://github.com/RocketChat/Rocket.Chat/pull/7479) by [@stalley](https://github.com/stalley))
+
 - Edit user permissions ([#7309](https://github.com/RocketChat/Rocket.Chat/pull/7309))
+
 - Adding support for piwik sub domain settings ([#7324](https://github.com/RocketChat/Rocket.Chat/pull/7324) by [@ruKurz](https://github.com/ruKurz))
+
 - Add setting to change User Agent of OEmbed calls ([#6753](https://github.com/RocketChat/Rocket.Chat/pull/6753) by [@AhmetS](https://github.com/AhmetS))
+
 - Configurable Volume for Notifications #6087 ([#7517](https://github.com/RocketChat/Rocket.Chat/pull/7517) by [@lindoelio](https://github.com/lindoelio))
+
 - Add customFields in rooms/get method ([#6564](https://github.com/RocketChat/Rocket.Chat/pull/6564) by [@borsden](https://github.com/borsden))
+
 - Option to select unread count style ([#7589](https://github.com/RocketChat/Rocket.Chat/pull/7589))
+
 - Show different shape for alert numbers when have mentions ([#7580](https://github.com/RocketChat/Rocket.Chat/pull/7580))
+
 - Add reaction to the last message when get the shortcut +: ([#7569](https://github.com/RocketChat/Rocket.Chat/pull/7569) by [@danilomiranda](https://github.com/danilomiranda))
+
 - Show emojis and file uploads on notifications ([#7559](https://github.com/RocketChat/Rocket.Chat/pull/7559))
+
 - Closes tab bar on mobile when leaving room ([#7561](https://github.com/RocketChat/Rocket.Chat/pull/7561) by [@gdelavald](https://github.com/gdelavald))
+
 - Adds preference to one-click-to-direct-message and basic functionality ([#7564](https://github.com/RocketChat/Rocket.Chat/pull/7564) by [@gdelavald](https://github.com/gdelavald))
+
 - Search users also by email in toolbar ([#7334](https://github.com/RocketChat/Rocket.Chat/pull/7334) by [@shahar3012](https://github.com/shahar3012))
+
 - Do not rate limit bots on createDirectMessage ([#7326](https://github.com/RocketChat/Rocket.Chat/pull/7326) by [@jangmarker](https://github.com/jangmarker))
+
 - Allow channel property in the integrations returned content ([#7214](https://github.com/RocketChat/Rocket.Chat/pull/7214))
+
 - Add room type identifier to room list header ([#7520](https://github.com/RocketChat/Rocket.Chat/pull/7520) by [@danischreiber](https://github.com/danischreiber))
+
 - Room type and recipient data for global event ([#7523](https://github.com/RocketChat/Rocket.Chat/pull/7523) by [@danischreiber](https://github.com/danischreiber))
+
 - Show room leader at top of chat when user scrolls down. Set and unset leader as admin. ([#7526](https://github.com/RocketChat/Rocket.Chat/pull/7526) by [@danischreiber](https://github.com/danischreiber))
+
 - Add toolbar buttons for iframe API ([#7525](https://github.com/RocketChat/Rocket.Chat/pull/7525))
+
 - Add close button to flex tabs ([#7529](https://github.com/RocketChat/Rocket.Chat/pull/7529))
+
 - Update meteor to 1.5.1 ([#7496](https://github.com/RocketChat/Rocket.Chat/pull/7496))
+
 - flex-tab now is side by side with message list ([#7448](https://github.com/RocketChat/Rocket.Chat/pull/7448) by [@karlprieb](https://github.com/karlprieb))
+
 - Option to select unread count behavior ([#7477](https://github.com/RocketChat/Rocket.Chat/pull/7477))
+
 - Add healthchecks in OpenShift templates ([#7184](https://github.com/RocketChat/Rocket.Chat/pull/7184) by [@jfchevrette](https://github.com/jfchevrette))
+
 - Add unread options for direct messages ([#7658](https://github.com/RocketChat/Rocket.Chat/pull/7658))
 
 ### 🐛 Bug fixes
 
+
 - Error when updating message with an empty attachment array ([#7624](https://github.com/RocketChat/Rocket.Chat/pull/7624))
+
 - Uploading an unknown file type erroring out ([#7623](https://github.com/RocketChat/Rocket.Chat/pull/7623))
+
 - Error when acessing settings before ready ([#7622](https://github.com/RocketChat/Rocket.Chat/pull/7622))
+
 - Message box on safari ([#7621](https://github.com/RocketChat/Rocket.Chat/pull/7621))
+
 - The username not being allowed to be passed into the user.setAvatar ([#7620](https://github.com/RocketChat/Rocket.Chat/pull/7620))
+
 - Fix Custom Fields Crashing on Register ([#7617](https://github.com/RocketChat/Rocket.Chat/pull/7617))
+
 - Fix admin room list show the correct i18n type ([#7582](https://github.com/RocketChat/Rocket.Chat/pull/7582) by [@ccfang](https://github.com/ccfang))
+
 - URL parse error fix for issue #7169 ([#7538](https://github.com/RocketChat/Rocket.Chat/pull/7538) by [@satyapramodh](https://github.com/satyapramodh))
+
 - User avatar image background ([#7572](https://github.com/RocketChat/Rocket.Chat/pull/7572) by [@filipedelimabrito](https://github.com/filipedelimabrito))
+
 - Look for livechat visitor IP address on X-Forwarded-For header ([#7554](https://github.com/RocketChat/Rocket.Chat/pull/7554))
+
 - Revert emojione package version upgrade ([#7557](https://github.com/RocketChat/Rocket.Chat/pull/7557))
+
 - Stop logging mentions object to console ([#7562](https://github.com/RocketChat/Rocket.Chat/pull/7562) by [@gdelavald](https://github.com/gdelavald))
+
 - Fix hiding flex-tab on embedded view ([#7486](https://github.com/RocketChat/Rocket.Chat/pull/7486))
+
 - Fix emoji picker translations ([#7195](https://github.com/RocketChat/Rocket.Chat/pull/7195))
+
 - Issue #7365: added check for the existence of a parameter in the CAS URL ([#7471](https://github.com/RocketChat/Rocket.Chat/pull/7471) by [@wsw70](https://github.com/wsw70))
+
 - Fix Word Placement Anywhere on WebHooks ([#7392](https://github.com/RocketChat/Rocket.Chat/pull/7392))
+
 - Prevent new room status from playing when user status changes ([#7487](https://github.com/RocketChat/Rocket.Chat/pull/7487))
+
 - url click events in the cordova app open in external browser or not at all ([#7205](https://github.com/RocketChat/Rocket.Chat/pull/7205) by [@flaviogrossi](https://github.com/flaviogrossi))
+
 - sweetalert alignment on mobile ([#7404](https://github.com/RocketChat/Rocket.Chat/pull/7404) by [@karlprieb](https://github.com/karlprieb))
+
 - Sweet-Alert modal popup position on mobile devices ([#7376](https://github.com/RocketChat/Rocket.Chat/pull/7376) by [@Oliver84](https://github.com/Oliver84))
+
 - Update node-engine in Snap to latest v4 LTS relase: 4.8.3 ([#7355](https://github.com/RocketChat/Rocket.Chat/pull/7355) by [@al3x](https://github.com/al3x))
+
 - Remove warning about 2FA support being unavailable in mobile apps ([#7354](https://github.com/RocketChat/Rocket.Chat/pull/7354) by [@al3x](https://github.com/al3x))
+
 - Fix geolocation button ([#7322](https://github.com/RocketChat/Rocket.Chat/pull/7322))
+
 - Fix Block Delete Message After (n) Minutes ([#7207](https://github.com/RocketChat/Rocket.Chat/pull/7207))
+
 - Use I18n on "File Uploaded" ([#7199](https://github.com/RocketChat/Rocket.Chat/pull/7199))
+
 - Fix error on image preview due to undefined description|title  ([#7187](https://github.com/RocketChat/Rocket.Chat/pull/7187))
+
 - Fix messagebox growth ([#7629](https://github.com/RocketChat/Rocket.Chat/pull/7629))
+
 - Wrong render of snippet’s name ([#7630](https://github.com/RocketChat/Rocket.Chat/pull/7630))
+
 - Fix room load on first hit ([#7687](https://github.com/RocketChat/Rocket.Chat/pull/7687))
+
 - Markdown noopener/noreferrer: use correct HTML attribute ([#7644](https://github.com/RocketChat/Rocket.Chat/pull/7644) by [@jangmarker](https://github.com/jangmarker))
+
 - Wrong email subject when "All Messages" setting enabled ([#7639](https://github.com/RocketChat/Rocket.Chat/pull/7639))
+
 - Csv importer: work with more problematic data ([#7456](https://github.com/RocketChat/Rocket.Chat/pull/7456) by [@reist](https://github.com/reist))
+
 - make flex-tab visible again when reduced width ([#7738](https://github.com/RocketChat/Rocket.Chat/pull/7738))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.58.0 ([#7752](https://github.com/RocketChat/Rocket.Chat/pull/7752) by [@flaviogrossi](https://github.com/flaviogrossi) & [@jangmarker](https://github.com/jangmarker) & [@karlprieb](https://github.com/karlprieb) & [@pierreozoux](https://github.com/pierreozoux) & [@ryoshimizu](https://github.com/ryoshimizu))
+
 - Sync Master with 0.57.3 ([#7690](https://github.com/RocketChat/Rocket.Chat/pull/7690))
+
 - Add missing parts of `one click to direct message` ([#7608](https://github.com/RocketChat/Rocket.Chat/pull/7608))
+
 - LingoHub based on develop ([#7613](https://github.com/RocketChat/Rocket.Chat/pull/7613))
+
 - Improve link parser using tokens ([#7615](https://github.com/RocketChat/Rocket.Chat/pull/7615))
+
 - Improve login error messages ([#7616](https://github.com/RocketChat/Rocket.Chat/pull/7616))
+
 - LingoHub based on develop ([#7594](https://github.com/RocketChat/Rocket.Chat/pull/7594))
+
 - Improve room leader ([#7578](https://github.com/RocketChat/Rocket.Chat/pull/7578))
+
 - Develop sync ([#7590](https://github.com/RocketChat/Rocket.Chat/pull/7590))
+
 - [Fix] Don't save user to DB when a custom field is invalid ([#7513](https://github.com/RocketChat/Rocket.Chat/pull/7513) by [@Darkneon](https://github.com/Darkneon))
+
 - Develop sync ([#7500](https://github.com/RocketChat/Rocket.Chat/pull/7500) by [@thinkeridea](https://github.com/thinkeridea))
+
 - Better Issue Template ([#7492](https://github.com/RocketChat/Rocket.Chat/pull/7492))
+
 - Add helm chart kubernetes deployment ([#6340](https://github.com/RocketChat/Rocket.Chat/pull/6340) by [@pierreozoux](https://github.com/pierreozoux))
+
 - Develop sync ([#7363](https://github.com/RocketChat/Rocket.Chat/pull/7363) by [@JSzaszvari](https://github.com/JSzaszvari))
+
 - Escape error messages ([#7308](https://github.com/RocketChat/Rocket.Chat/pull/7308))
+
 - update meteor to 1.5.0 ([#7287](https://github.com/RocketChat/Rocket.Chat/pull/7287))
+
 - [New] Add instance id to response headers ([#7211](https://github.com/RocketChat/Rocket.Chat/pull/7211))
+
 - Only use "File Uploaded" prefix on files ([#7652](https://github.com/RocketChat/Rocket.Chat/pull/7652))
 
 </details>
@@ -6415,8 +9404,11 @@
 
 ### 🐛 Bug fixes
 
+
 - Slack import failing and not being able to be restarted ([#8390](https://github.com/RocketChat/Rocket.Chat/pull/8390))
+
 - Duplicate code in rest api letting in a few bugs with the rest api ([#8408](https://github.com/RocketChat/Rocket.Chat/pull/8408))
+
 - Add needed dependency for snaps ([#8389](https://github.com/RocketChat/Rocket.Chat/pull/8389))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -6433,18 +9425,27 @@
 
 ### 🐛 Bug fixes
 
+
 - Modernize rate limiting of sendMessage ([#7325](https://github.com/RocketChat/Rocket.Chat/pull/7325) by [@jangmarker](https://github.com/jangmarker))
+
 - custom soundEdit.html ([#7390](https://github.com/RocketChat/Rocket.Chat/pull/7390) by [@rasos](https://github.com/rasos))
+
 - Use UTF8 setting for /create command ([#7394](https://github.com/RocketChat/Rocket.Chat/pull/7394))
+
 - file upload broken when running in subdirectory https://github.com… ([#7395](https://github.com/RocketChat/Rocket.Chat/pull/7395) by [@ryoshimizu](https://github.com/ryoshimizu))
+
 - Fix Anonymous User ([#7444](https://github.com/RocketChat/Rocket.Chat/pull/7444))
+
 - Missing eventName in unUser ([#7533](https://github.com/RocketChat/Rocket.Chat/pull/7533) by [@Darkneon](https://github.com/Darkneon))
+
 - Fix Join Channel Without Preview Room Permission ([#7535](https://github.com/RocketChat/Rocket.Chat/pull/7535))
+
 - Improve build script example ([#7555](https://github.com/RocketChat/Rocket.Chat/pull/7555))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - [Fix] Users and Channels list not respecting permissions ([#7212](https://github.com/RocketChat/Rocket.Chat/pull/7212))
 
 </details>
@@ -6471,11 +9472,17 @@
 
 ### 🐛 Bug fixes
 
+
 - Fix Emails in User Admin View ([#7431](https://github.com/RocketChat/Rocket.Chat/pull/7431))
+
 - Always set LDAP properties on login ([#7472](https://github.com/RocketChat/Rocket.Chat/pull/7472))
+
 - Fix Unread Bar Disappearing ([#7403](https://github.com/RocketChat/Rocket.Chat/pull/7403))
+
 - Fix file upload on Slack import ([#7469](https://github.com/RocketChat/Rocket.Chat/pull/7469))
+
 - Fix Private Channel List Submit ([#7432](https://github.com/RocketChat/Rocket.Chat/pull/7432))
+
 - S3 uploads not working for custom URLs ([#7443](https://github.com/RocketChat/Rocket.Chat/pull/7443))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -6493,6 +9500,7 @@
 
 ### 🐛 Bug fixes
 
+
 - Fix migration of avatars from version 0.57.0 ([#7428](https://github.com/RocketChat/Rocket.Chat/pull/7428))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -6509,100 +9517,185 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Internal hubot does not load hubot-scripts anymore, it loads scripts from custom folders ([#7095](https://github.com/RocketChat/Rocket.Chat/pull/7095))
 
 ### 🎉 New features
 
+
 - New avatar storage types ([#6788](https://github.com/RocketChat/Rocket.Chat/pull/6788))
+
 - Show full name in mentions if use full name setting enabled ([#6690](https://github.com/RocketChat/Rocket.Chat/pull/6690) by [@alexbrazier](https://github.com/alexbrazier))
+
 - Increase unread message count on @here mention ([#7059](https://github.com/RocketChat/Rocket.Chat/pull/7059))
+
 - API method and REST Endpoint for getting a single message by id ([#7085](https://github.com/RocketChat/Rocket.Chat/pull/7085))
+
 - Migration to add <html> tags to email header and footer ([#7080](https://github.com/RocketChat/Rocket.Chat/pull/7080))
+
 - postcss parser and cssnext implementation ([#6982](https://github.com/RocketChat/Rocket.Chat/pull/6982))
+
 - Start running unit tests ([#6605](https://github.com/RocketChat/Rocket.Chat/pull/6605))
+
 - Make channel/group delete call answer to roomName ([#6857](https://github.com/RocketChat/Rocket.Chat/pull/6857) by [@reist](https://github.com/reist))
+
 - Feature/delete any message permission ([#6919](https://github.com/RocketChat/Rocket.Chat/pull/6919) by [@phutchins](https://github.com/phutchins))
+
 - Force use of MongoDB for spotlight queries ([#7311](https://github.com/RocketChat/Rocket.Chat/pull/7311))
 
 ### 🐛 Bug fixes
 
+
 - Message being displayed unescaped ([#7379](https://github.com/RocketChat/Rocket.Chat/pull/7379) by [@gdelavald](https://github.com/gdelavald))
+
 - Fix highlightjs bug ([#6991](https://github.com/RocketChat/Rocket.Chat/pull/6991))
+
 - do only store password if LDAP_Login_Fallback is on ([#7030](https://github.com/RocketChat/Rocket.Chat/pull/7030) by [@pmb0](https://github.com/pmb0))
+
 - fix bug in preview image ([#7121](https://github.com/RocketChat/Rocket.Chat/pull/7121))
+
 - Fix the failing tests  ([#7094](https://github.com/RocketChat/Rocket.Chat/pull/7094))
+
 - Add option to ignore TLS in SMTP server settings ([#7084](https://github.com/RocketChat/Rocket.Chat/pull/7084) by [@colin-campbell](https://github.com/colin-campbell))
+
 - Add support for carriage return in markdown code blocks ([#7072](https://github.com/RocketChat/Rocket.Chat/pull/7072) by [@jm-factorin](https://github.com/jm-factorin))
+
 - Parse HTML on admin setting's descriptions ([#7014](https://github.com/RocketChat/Rocket.Chat/pull/7014))
+
 - edit button on firefox ([#7105](https://github.com/RocketChat/Rocket.Chat/pull/7105))
+
 - Fix missing CSS files on production builds ([#7104](https://github.com/RocketChat/Rocket.Chat/pull/7104))
+
 - clipboard (permalink, copy, pin, star buttons) ([#7103](https://github.com/RocketChat/Rocket.Chat/pull/7103))
+
 - Fixed typo hmtl -> html ([#7092](https://github.com/RocketChat/Rocket.Chat/pull/7092) by [@jautero](https://github.com/jautero))
+
 - Add <html> and </html> to header and footer ([#7025](https://github.com/RocketChat/Rocket.Chat/pull/7025) by [@ExTechOp](https://github.com/ExTechOp))
+
 - Prevent Ctrl key on message field from reloading messages list ([#7033](https://github.com/RocketChat/Rocket.Chat/pull/7033))
+
 - New screen sharing Chrome extension checking method ([#7044](https://github.com/RocketChat/Rocket.Chat/pull/7044))
+
 - Improve Tests ([#7049](https://github.com/RocketChat/Rocket.Chat/pull/7049))
+
 - Fix avatar upload via users.setAvatar REST endpoint ([#7045](https://github.com/RocketChat/Rocket.Chat/pull/7045))
+
 - Sidenav roomlist ([#7023](https://github.com/RocketChat/Rocket.Chat/pull/7023))
+
 - video message recording dialog is shown in an incorrect position ([#7012](https://github.com/RocketChat/Rocket.Chat/pull/7012) by [@flaviogrossi](https://github.com/flaviogrossi))
+
 - Remove room from roomPick setting ([#6912](https://github.com/RocketChat/Rocket.Chat/pull/6912))
+
 - Parse markdown links last ([#6997](https://github.com/RocketChat/Rocket.Chat/pull/6997))
+
 - overlapping text for users-typing-message ([#6999](https://github.com/RocketChat/Rocket.Chat/pull/6999) by [@darkv](https://github.com/darkv))
+
 - Updating Incoming Integration Post As Field Not Allowed ([#6903](https://github.com/RocketChat/Rocket.Chat/pull/6903))
+
 - Fix error handling for non-valid avatar URL ([#6972](https://github.com/RocketChat/Rocket.Chat/pull/6972))
+
 - SAML: Only set KeyDescriptor when non empty ([#6961](https://github.com/RocketChat/Rocket.Chat/pull/6961) by [@sathieu](https://github.com/sathieu))
+
 - Fix the other tests failing due chimp update ([#6986](https://github.com/RocketChat/Rocket.Chat/pull/6986))
+
 - Fix badge counter on iOS push notifications ([#6950](https://github.com/RocketChat/Rocket.Chat/pull/6950))
+
 - Fix login with Meteor saving an object as email address ([#6974](https://github.com/RocketChat/Rocket.Chat/pull/6974))
+
 - Check that username is not in the room when being muted / unmuted ([#6840](https://github.com/RocketChat/Rocket.Chat/pull/6840) by [@matthewshirley](https://github.com/matthewshirley))
+
 - Use AWS Signature Version 4 signed URLs for uploads ([#6947](https://github.com/RocketChat/Rocket.Chat/pull/6947))
+
 - Bugs in `isUserFromParams` helper ([#6904](https://github.com/RocketChat/Rocket.Chat/pull/6904) by [@abrom](https://github.com/abrom))
+
 - Allow image insert from slack through slackbridge ([#6910](https://github.com/RocketChat/Rocket.Chat/pull/6910))
+
 - Slackbridge text replacements ([#6913](https://github.com/RocketChat/Rocket.Chat/pull/6913))
+
 - Fix all reactions having the same username ([#7157](https://github.com/RocketChat/Rocket.Chat/pull/7157))
+
 - Fix editing others messages ([#7200](https://github.com/RocketChat/Rocket.Chat/pull/7200))
+
 - Fix oembed previews not being shown ([#7208](https://github.com/RocketChat/Rocket.Chat/pull/7208))
+
 - "requirePasswordChange" property not being saved when set to false ([#7209](https://github.com/RocketChat/Rocket.Chat/pull/7209))
+
 - Removing the kadira package install from example build script. ([#7160](https://github.com/RocketChat/Rocket.Chat/pull/7160) by [@JSzaszvari](https://github.com/JSzaszvari))
+
 - Fix user's customFields not being saved correctly ([#7358](https://github.com/RocketChat/Rocket.Chat/pull/7358))
+
 - Improve avatar migration ([#7352](https://github.com/RocketChat/Rocket.Chat/pull/7352))
+
 - Fix jump to unread button ([#7320](https://github.com/RocketChat/Rocket.Chat/pull/7320))
+
 - click on image in a message ([#7345](https://github.com/RocketChat/Rocket.Chat/pull/7345))
+
 - Proxy upload to correct instance ([#7304](https://github.com/RocketChat/Rocket.Chat/pull/7304))
+
 - Fix Secret Url ([#7321](https://github.com/RocketChat/Rocket.Chat/pull/7321))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - add server methods getRoomNameById ([#7102](https://github.com/RocketChat/Rocket.Chat/pull/7102) by [@thinkeridea](https://github.com/thinkeridea))
+
 - Convert hipchat importer to js ([#7146](https://github.com/RocketChat/Rocket.Chat/pull/7146))
+
 - Convert file unsubscribe.coffee to js ([#7145](https://github.com/RocketChat/Rocket.Chat/pull/7145))
+
 - Convert oauth2-server-config package  to js ([#7017](https://github.com/RocketChat/Rocket.Chat/pull/7017))
+
 - Convert irc package to js ([#7022](https://github.com/RocketChat/Rocket.Chat/pull/7022))
+
 - Ldap: User_Data_FieldMap description ([#7055](https://github.com/RocketChat/Rocket.Chat/pull/7055) by [@bbrauns](https://github.com/bbrauns))
+
 - Remove Useless Jasmine Tests  ([#7062](https://github.com/RocketChat/Rocket.Chat/pull/7062))
+
 - converted rocketchat-importer ([#7018](https://github.com/RocketChat/Rocket.Chat/pull/7018))
+
 - LingoHub based on develop ([#7114](https://github.com/RocketChat/Rocket.Chat/pull/7114))
+
 - Convert Livechat from Coffeescript to JavaScript ([#7096](https://github.com/RocketChat/Rocket.Chat/pull/7096))
+
 - Rocketchat ui3 ([#7006](https://github.com/RocketChat/Rocket.Chat/pull/7006))
+
 - converted rocketchat-ui coffee to js part 2 ([#6836](https://github.com/RocketChat/Rocket.Chat/pull/6836))
+
 - LingoHub based on develop ([#7005](https://github.com/RocketChat/Rocket.Chat/pull/7005))
+
 - rocketchat-lib[4] coffee to js ([#6735](https://github.com/RocketChat/Rocket.Chat/pull/6735))
+
 - rocketchat-importer-slack coffee to js ([#6987](https://github.com/RocketChat/Rocket.Chat/pull/6987))
+
 - Convert ui-admin package to js ([#6911](https://github.com/RocketChat/Rocket.Chat/pull/6911))
+
 - Rocketchat ui message ([#6914](https://github.com/RocketChat/Rocket.Chat/pull/6914))
+
 - [New] LDAP: Use variables in User_Data_FieldMap for name mapping ([#6921](https://github.com/RocketChat/Rocket.Chat/pull/6921) by [@bbrauns](https://github.com/bbrauns))
+
 - Convert meteor-autocomplete package to js ([#6936](https://github.com/RocketChat/Rocket.Chat/pull/6936))
+
 - Convert Ui Account Package to Js ([#6795](https://github.com/RocketChat/Rocket.Chat/pull/6795))
+
 - LingoHub based on develop ([#6978](https://github.com/RocketChat/Rocket.Chat/pull/6978))
+
 - fix the crashing tests ([#6976](https://github.com/RocketChat/Rocket.Chat/pull/6976))
+
 - Convert WebRTC Package to Js ([#6775](https://github.com/RocketChat/Rocket.Chat/pull/6775))
+
 - Remove missing CoffeeScript dependencies ([#7154](https://github.com/RocketChat/Rocket.Chat/pull/7154))
+
 - Switch logic of artifact name ([#7158](https://github.com/RocketChat/Rocket.Chat/pull/7158))
+
 - Fix the Zapier oAuth return url to the new one ([#7215](https://github.com/RocketChat/Rocket.Chat/pull/7215))
+
 - Fix the admin oauthApps view not working ([#7196](https://github.com/RocketChat/Rocket.Chat/pull/7196))
+
 - Fix forbidden error on setAvatar REST endpoint ([#7159](https://github.com/RocketChat/Rocket.Chat/pull/7159))
+
 - Fix the admin oauthApps view not working ([#7196](https://github.com/RocketChat/Rocket.Chat/pull/7196))
+
 - Fix mobile avatars ([#7177](https://github.com/RocketChat/Rocket.Chat/pull/7177))
 
 </details>
@@ -6647,61 +9740,110 @@
 
 ### 🎉 New features
 
+
 - Add a pointer cursor to message images ([#6881](https://github.com/RocketChat/Rocket.Chat/pull/6881))
+
 - Make channels.info accept roomName, just like groups.info ([#6827](https://github.com/RocketChat/Rocket.Chat/pull/6827) by [@reist](https://github.com/reist))
+
 - Option to allow to signup as anonymous ([#6797](https://github.com/RocketChat/Rocket.Chat/pull/6797))
+
 - create a method 'create token' ([#6807](https://github.com/RocketChat/Rocket.Chat/pull/6807))
+
 - Add option on Channel Settings: Hide Notifications and Hide Unread Room Status (#2707, #2143) ([#5373](https://github.com/RocketChat/Rocket.Chat/pull/5373))
+
 - Remove lesshat ([#6722](https://github.com/RocketChat/Rocket.Chat/pull/6722) by [@karlprieb](https://github.com/karlprieb))
+
 - Use tokenSentVia parameter for clientid/secret to token endpoint ([#6692](https://github.com/RocketChat/Rocket.Chat/pull/6692) by [@intelradoux](https://github.com/intelradoux))
+
 - Add a setting to not run outgoing integrations on message edits ([#6615](https://github.com/RocketChat/Rocket.Chat/pull/6615))
+
 - Improve CI/Docker build/release ([#6938](https://github.com/RocketChat/Rocket.Chat/pull/6938))
+
 - Add SMTP settings for Protocol and Pool ([#6940](https://github.com/RocketChat/Rocket.Chat/pull/6940))
+
 - Show info about multiple instances at admin page ([#6953](https://github.com/RocketChat/Rocket.Chat/pull/6953))
 
 ### 🐛 Bug fixes
 
+
 - start/unstar message ([#6861](https://github.com/RocketChat/Rocket.Chat/pull/6861))
+
 - Added helper for testing if the current user matches the params ([#6845](https://github.com/RocketChat/Rocket.Chat/pull/6845) by [@abrom](https://github.com/abrom))
+
 - REST API user.update throwing error due to rate limiting ([#6796](https://github.com/RocketChat/Rocket.Chat/pull/6796))
+
 - fix german translation ([#6790](https://github.com/RocketChat/Rocket.Chat/pull/6790) by [@sscholl](https://github.com/sscholl))
+
 - Improve and correct Iframe Integration help text ([#6793](https://github.com/RocketChat/Rocket.Chat/pull/6793))
+
 - Quoted and replied messages not retaining the original message's alias ([#6800](https://github.com/RocketChat/Rocket.Chat/pull/6800))
+
 - Fix iframe wise issues ([#6798](https://github.com/RocketChat/Rocket.Chat/pull/6798))
+
 - Incorrect error message when creating channel ([#6747](https://github.com/RocketChat/Rocket.Chat/pull/6747) by [@gdelavald](https://github.com/gdelavald))
+
 - Hides nav buttons when selecting own profile ([#6760](https://github.com/RocketChat/Rocket.Chat/pull/6760) by [@gdelavald](https://github.com/gdelavald))
+
 - Search full name on client side ([#6767](https://github.com/RocketChat/Rocket.Chat/pull/6767) by [@alexbrazier](https://github.com/alexbrazier))
+
 - Sort by real name if use real name setting is enabled ([#6758](https://github.com/RocketChat/Rocket.Chat/pull/6758) by [@alexbrazier](https://github.com/alexbrazier))
+
 - CSV importer: require that there is some data in the zip, not ALL data ([#6768](https://github.com/RocketChat/Rocket.Chat/pull/6768) by [@reist](https://github.com/reist))
+
 - Archiving Direct Messages ([#6737](https://github.com/RocketChat/Rocket.Chat/pull/6737))
+
 - Fix Caddy by forcing go 1.7 as needed by one of caddy's dependencies ([#6721](https://github.com/RocketChat/Rocket.Chat/pull/6721))
+
 - Users status on main menu always offline ([#6896](https://github.com/RocketChat/Rocket.Chat/pull/6896))
+
 - Not showing unread count on electron app’s icon ([#6923](https://github.com/RocketChat/Rocket.Chat/pull/6923))
+
 - Compile CSS color variables ([#6939](https://github.com/RocketChat/Rocket.Chat/pull/6939))
+
 - Remove spaces from env PORT and INSTANCE_IP ([#6955](https://github.com/RocketChat/Rocket.Chat/pull/6955))
+
 - make channels.create API check for create-c ([#6968](https://github.com/RocketChat/Rocket.Chat/pull/6968) by [@reist](https://github.com/reist))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - [New] Snap arm support ([#6842](https://github.com/RocketChat/Rocket.Chat/pull/6842))
+
 - Meteor update ([#6858](https://github.com/RocketChat/Rocket.Chat/pull/6858))
+
 - Converted rocketchat-lib 3 ([#6672](https://github.com/RocketChat/Rocket.Chat/pull/6672))
+
 - Convert Message-Star Package to js  ([#6781](https://github.com/RocketChat/Rocket.Chat/pull/6781))
+
 - Convert Mailer Package to Js ([#6780](https://github.com/RocketChat/Rocket.Chat/pull/6780))
+
 - LingoHub based on develop ([#6816](https://github.com/RocketChat/Rocket.Chat/pull/6816))
+
 - Missing useful fields in admin user list #5110 ([#6804](https://github.com/RocketChat/Rocket.Chat/pull/6804) by [@vlogic](https://github.com/vlogic))
+
 - Convert Katex Package to Js ([#6671](https://github.com/RocketChat/Rocket.Chat/pull/6671))
+
 - Convert Oembed Package to Js ([#6688](https://github.com/RocketChat/Rocket.Chat/pull/6688))
+
 - Convert Mentions-Flextab Package to Js ([#6689](https://github.com/RocketChat/Rocket.Chat/pull/6689))
+
 - Anonymous use ([#5986](https://github.com/RocketChat/Rocket.Chat/pull/5986))
+
 - Breaking long URLS to prevent overflow ([#6368](https://github.com/RocketChat/Rocket.Chat/pull/6368) by [@robertdown](https://github.com/robertdown))
+
 - Rocketchat lib2 ([#6593](https://github.com/RocketChat/Rocket.Chat/pull/6593))
+
 - disable proxy configuration ([#6654](https://github.com/RocketChat/Rocket.Chat/pull/6654) by [@glehmann](https://github.com/glehmann))
+
 - Convert markdown to js ([#6694](https://github.com/RocketChat/Rocket.Chat/pull/6694) by [@ehkasper](https://github.com/ehkasper))
+
 - LingoHub based on develop ([#6715](https://github.com/RocketChat/Rocket.Chat/pull/6715))
+
 - meteor update to 1.4.4 ([#6706](https://github.com/RocketChat/Rocket.Chat/pull/6706))
+
 - LingoHub based on develop ([#6703](https://github.com/RocketChat/Rocket.Chat/pull/6703))
+
 - [Fix] Error when trying to show preview of undefined filetype ([#6935](https://github.com/RocketChat/Rocket.Chat/pull/6935))
 
 </details>
@@ -6741,6 +9883,7 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - [Fix] Bug with incoming integration (0.55.1) ([#6734](https://github.com/RocketChat/Rocket.Chat/pull/6734))
 
 </details>
@@ -6758,137 +9901,259 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - `getUsersOfRoom` API to return array of objects with user and username, instead of array of strings
 
 ### 🎉 New features
 
+
 - Add shield.svg api route to generate custom shields/badges ([#6565](https://github.com/RocketChat/Rocket.Chat/pull/6565) by [@alexbrazier](https://github.com/alexbrazier))
+
 - resolve merge share function ([#6577](https://github.com/RocketChat/Rocket.Chat/pull/6577) by [@karlprieb](https://github.com/karlprieb) & [@tgxn](https://github.com/tgxn))
+
 - Two Factor Auth ([#6476](https://github.com/RocketChat/Rocket.Chat/pull/6476))
+
 - Permission `join-without-join-code` assigned to admins and bots by default ([#6430](https://github.com/RocketChat/Rocket.Chat/pull/6430))
+
 - Integrations, both incoming and outgoing, now have access to the models. Example: `Users.findOneById(id)` ([#6420](https://github.com/RocketChat/Rocket.Chat/pull/6420))
+
 - 'users.resetAvatar' rest api endpoint ([#6616](https://github.com/RocketChat/Rocket.Chat/pull/6616))
+
 - Drupal oAuth Integration for Rocketchat ([#6632](https://github.com/RocketChat/Rocket.Chat/pull/6632) by [@Lawri-van-Buel](https://github.com/Lawri-van-Buel))
+
 - Add monitoring package ([#6634](https://github.com/RocketChat/Rocket.Chat/pull/6634))
+
 - Expose Livechat to Incoming Integrations and allow response ([#6681](https://github.com/RocketChat/Rocket.Chat/pull/6681))
 
 ### 🐛 Bug fixes
 
+
 - Incoming integrations would break when trying to use the `Store` feature.`
+
 - Removed Deprecated Package rocketchat:sharedsecret`
+
 - emoji picker exception ([#6709](https://github.com/RocketChat/Rocket.Chat/pull/6709) by [@gdelavald](https://github.com/gdelavald))
+
 - Large files crashed browser when trying to show preview ([#6598](https://github.com/RocketChat/Rocket.Chat/pull/6598))
+
 - messageBox: put "joinCodeRequired" back ([#6600](https://github.com/RocketChat/Rocket.Chat/pull/6600) by [@karlprieb](https://github.com/karlprieb))
+
 - Do not add default roles for users without services field ([#6594](https://github.com/RocketChat/Rocket.Chat/pull/6594))
+
 - Accounts from LinkedIn OAuth without name ([#6590](https://github.com/RocketChat/Rocket.Chat/pull/6590))
+
 - Usage of subtagged languages ([#6575](https://github.com/RocketChat/Rocket.Chat/pull/6575))
+
 - UTC offset missing UTC text when positive ([#6562](https://github.com/RocketChat/Rocket.Chat/pull/6562) by [@alexbrazier](https://github.com/alexbrazier))
+
 - can not get access_token when using custom oauth ([#6531](https://github.com/RocketChat/Rocket.Chat/pull/6531) by [@fengt](https://github.com/fengt))
+
 - Outgoing webhooks which have an error and they're retrying would still retry even if the integration was disabled` ([#6478](https://github.com/RocketChat/Rocket.Chat/pull/6478))
+
 - Incorrect curl command being generated on incoming integrations ([#6620](https://github.com/RocketChat/Rocket.Chat/pull/6620))
+
 - arguments logger ([#6617](https://github.com/RocketChat/Rocket.Chat/pull/6617))
+
 - Improve markdown code ([#6650](https://github.com/RocketChat/Rocket.Chat/pull/6650))
+
 - Encode avatar url to prevent CSS injection ([#6651](https://github.com/RocketChat/Rocket.Chat/pull/6651))
+
 - Do not escaping markdown on message attachments ([#6648](https://github.com/RocketChat/Rocket.Chat/pull/6648))
+
 - Revert unwanted UI changes ([#6658](https://github.com/RocketChat/Rocket.Chat/pull/6658))
+
 - Fix Logger stdout publication ([#6682](https://github.com/RocketChat/Rocket.Chat/pull/6682))
+
 - Downgrade email package to from 1.2.0 to 1.1.18 ([#6680](https://github.com/RocketChat/Rocket.Chat/pull/6680))
+
 - Administrators being rate limited when editing users data ([#6659](https://github.com/RocketChat/Rocket.Chat/pull/6659))
+
 - Make sure username exists in findByActiveUsersExcept ([#6674](https://github.com/RocketChat/Rocket.Chat/pull/6674))
+
 - Update server cache indexes on record updates ([#6686](https://github.com/RocketChat/Rocket.Chat/pull/6686))
+
 - Allow question on OAuth token path ([#6684](https://github.com/RocketChat/Rocket.Chat/pull/6684))
+
 - Error when returning undefined from incoming intergation’s script ([#6683](https://github.com/RocketChat/Rocket.Chat/pull/6683))
+
 - Fix message types ([#6704](https://github.com/RocketChat/Rocket.Chat/pull/6704))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Add candidate snap channel ([#6614](https://github.com/RocketChat/Rocket.Chat/pull/6614))
+
 - Add `fname` to subscriptions in memory ([#6597](https://github.com/RocketChat/Rocket.Chat/pull/6597))
+
 - [New] Switch Snaps to use oplog ([#6608](https://github.com/RocketChat/Rocket.Chat/pull/6608))
+
 - Convert Message Pin Package to JS ([#6576](https://github.com/RocketChat/Rocket.Chat/pull/6576))
+
 - Move room display name logic to roomType definition ([#6585](https://github.com/RocketChat/Rocket.Chat/pull/6585))
+
 - Only configure LoggerManager on server ([#6596](https://github.com/RocketChat/Rocket.Chat/pull/6596))
+
 - POC Google Natural Language integration ([#6298](https://github.com/RocketChat/Rocket.Chat/pull/6298))
+
 - Fix recently introduced bug: OnePassword not defined ([#6591](https://github.com/RocketChat/Rocket.Chat/pull/6591))
+
 - rocketchat-lib part1 ([#6553](https://github.com/RocketChat/Rocket.Chat/pull/6553))
+
 - dependencies upgrade ([#6584](https://github.com/RocketChat/Rocket.Chat/pull/6584))
+
 - fixed typo in readme.md ([#6580](https://github.com/RocketChat/Rocket.Chat/pull/6580) by [@sezinkarli](https://github.com/sezinkarli))
+
 - Use real name instead of username for messages and direct messages list ([#3851](https://github.com/RocketChat/Rocket.Chat/pull/3851) by [@alexbrazier](https://github.com/alexbrazier))
+
 - Convert Ui-Login Package to Js ([#6561](https://github.com/RocketChat/Rocket.Chat/pull/6561))
+
 - rocketchat-channel-settings coffee to js ([#6551](https://github.com/RocketChat/Rocket.Chat/pull/6551))
+
 - Move wordpress packages client files to client folder ([#6571](https://github.com/RocketChat/Rocket.Chat/pull/6571))
+
 - convert rocketchat-ui part 2 ([#6539](https://github.com/RocketChat/Rocket.Chat/pull/6539))
+
 - rocketchat-channel-settings-mail-messages coffee to js ([#6541](https://github.com/RocketChat/Rocket.Chat/pull/6541))
+
 - LingoHub based on develop ([#6574](https://github.com/RocketChat/Rocket.Chat/pull/6574))
+
 - LingoHub based on develop ([#6567](https://github.com/RocketChat/Rocket.Chat/pull/6567))
+
 - [New] Added oauth2 userinfo endpoint ([#6554](https://github.com/RocketChat/Rocket.Chat/pull/6554))
+
 - Remove Deprecated Shared Secret Package ([#6540](https://github.com/RocketChat/Rocket.Chat/pull/6540))
+
 - Remove coffeescript package from ui-sidenav ([#6542](https://github.com/RocketChat/Rocket.Chat/pull/6542) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - Remove coffeescript package from ui-flextab ([#6543](https://github.com/RocketChat/Rocket.Chat/pull/6543) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - Convert Theme Package to JS ([#6491](https://github.com/RocketChat/Rocket.Chat/pull/6491))
+
 - Fix typo of the safari pinned tab label ([#6487](https://github.com/RocketChat/Rocket.Chat/pull/6487) by [@qge](https://github.com/qge))
+
 - fix channel merge option of user preferences ([#6493](https://github.com/RocketChat/Rocket.Chat/pull/6493) by [@billtt](https://github.com/billtt))
+
 - converted Rocketchat logger coffee to js ([#6495](https://github.com/RocketChat/Rocket.Chat/pull/6495))
+
 - converted rocketchat-integrations coffee to js ([#6502](https://github.com/RocketChat/Rocket.Chat/pull/6502))
+
 - 'allow reacting' should be a toggle option.otherwise, the style will display an error ([#6522](https://github.com/RocketChat/Rocket.Chat/pull/6522) by [@szluohua](https://github.com/szluohua))
+
 - Clipboard [Firefox version < 50] ([#6280](https://github.com/RocketChat/Rocket.Chat/pull/6280))
+
 - Convert ui-vrecord Package to JS ([#6473](https://github.com/RocketChat/Rocket.Chat/pull/6473))
+
 - converted slashcommands-mute coffee to js ([#6474](https://github.com/RocketChat/Rocket.Chat/pull/6474))
+
 - Convert Version Package to JS ([#6494](https://github.com/RocketChat/Rocket.Chat/pull/6494))
+
 - Convert Ui-Master Package to Js ([#6498](https://github.com/RocketChat/Rocket.Chat/pull/6498))
+
 - converted messageAttachment coffee to js ([#6500](https://github.com/RocketChat/Rocket.Chat/pull/6500))
+
 - Convert File Package to js ([#6503](https://github.com/RocketChat/Rocket.Chat/pull/6503))
+
 - Create groups.addAll endpoint and add activeUsersOnly param. ([#6505](https://github.com/RocketChat/Rocket.Chat/pull/6505) by [@nathanmarcos](https://github.com/nathanmarcos))
+
 - New feature: Room announcement ([#6351](https://github.com/RocketChat/Rocket.Chat/pull/6351) by [@billtt](https://github.com/billtt))
+
 - converted slashcommand-me coffee to js ([#6468](https://github.com/RocketChat/Rocket.Chat/pull/6468))
+
 - converted slashcommand-join coffee to js ([#6469](https://github.com/RocketChat/Rocket.Chat/pull/6469))
+
 - converted slashcommand-leave coffee to js ([#6470](https://github.com/RocketChat/Rocket.Chat/pull/6470))
+
 - convert mapview package to js ([#6471](https://github.com/RocketChat/Rocket.Chat/pull/6471))
+
 - converted getAvatarUrlFromUsername ([#6496](https://github.com/RocketChat/Rocket.Chat/pull/6496))
+
 - converted slashcommand-invite coffee to js ([#6497](https://github.com/RocketChat/Rocket.Chat/pull/6497))
+
 - Convert Wordpress Package to js ([#6499](https://github.com/RocketChat/Rocket.Chat/pull/6499))
+
 - converted slashcommand-msg coffee to js ([#6501](https://github.com/RocketChat/Rocket.Chat/pull/6501))
+
 - rocketchat-ui coffee to js part1 ([#6504](https://github.com/RocketChat/Rocket.Chat/pull/6504))
+
 - converted rocketchat-mentions coffee to js ([#6467](https://github.com/RocketChat/Rocket.Chat/pull/6467))
+
 - ESLint add rule `no-void` ([#6479](https://github.com/RocketChat/Rocket.Chat/pull/6479))
+
 - Add ESLint rules `prefer-template` and `template-curly-spacing` ([#6456](https://github.com/RocketChat/Rocket.Chat/pull/6456))
+
 - Fix livechat permissions ([#6466](https://github.com/RocketChat/Rocket.Chat/pull/6466))
+
 - Add ESLint rule `object-shorthand` ([#6457](https://github.com/RocketChat/Rocket.Chat/pull/6457))
+
 - Add ESLint rules `one-var` and `no-var` ([#6459](https://github.com/RocketChat/Rocket.Chat/pull/6459))
+
 - Add ESLint rule `one-var` ([#6458](https://github.com/RocketChat/Rocket.Chat/pull/6458))
+
 - Side-nav CoffeeScript to JavaScript III  ([#6274](https://github.com/RocketChat/Rocket.Chat/pull/6274))
+
 - Flex-Tab CoffeeScript to JavaScript II ([#6277](https://github.com/RocketChat/Rocket.Chat/pull/6277))
+
 - Side-nav CoffeeScript to JavaScript II ([#6266](https://github.com/RocketChat/Rocket.Chat/pull/6266))
+
 - Allow Livechat visitors to switch the department ([#6035](https://github.com/RocketChat/Rocket.Chat/pull/6035) by [@drallgood](https://github.com/drallgood))
+
 - fix livechat widget on small screens ([#6122](https://github.com/RocketChat/Rocket.Chat/pull/6122) by [@karlprieb](https://github.com/karlprieb))
+
 - Allow livechat managers to transfer chats ([#6180](https://github.com/RocketChat/Rocket.Chat/pull/6180) by [@drallgood](https://github.com/drallgood))
+
 - focus first textbox element ([#6257](https://github.com/RocketChat/Rocket.Chat/pull/6257) by [@a5his](https://github.com/a5his))
+
 - Join command ([#6268](https://github.com/RocketChat/Rocket.Chat/pull/6268))
+
 - Fix visitor ending livechat if multiples still open ([#6419](https://github.com/RocketChat/Rocket.Chat/pull/6419))
+
 - Password reset Cleaner text ([#6319](https://github.com/RocketChat/Rocket.Chat/pull/6319))
+
 - Add permission check to the import methods and not just the UI ([#6400](https://github.com/RocketChat/Rocket.Chat/pull/6400))
+
 - Max textarea height ([#6409](https://github.com/RocketChat/Rocket.Chat/pull/6409))
+
 - Livechat fix office hours order ([#6413](https://github.com/RocketChat/Rocket.Chat/pull/6413))
+
 - Convert Spotify Package to JS ([#6449](https://github.com/RocketChat/Rocket.Chat/pull/6449))
+
 - Make favicon package easier to read. ([#6422](https://github.com/RocketChat/Rocket.Chat/pull/6422) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - Just admins can change a Default Channel to Private (the channel will be a non default channel) ([#6426](https://github.com/RocketChat/Rocket.Chat/pull/6426))
+
 - Hide email settings on Sandstorm ([#6429](https://github.com/RocketChat/Rocket.Chat/pull/6429))
+
 - Do not show reset button for hidden settings ([#6432](https://github.com/RocketChat/Rocket.Chat/pull/6432))
+
 - Convert Dolphin Package to JavaScript ([#6427](https://github.com/RocketChat/Rocket.Chat/pull/6427))
+
 - converted rocketchat-message-mark-as-unread coffee/js ([#6445](https://github.com/RocketChat/Rocket.Chat/pull/6445))
+
 - converted rocketchat-slashcommands-kick coffee to js ([#6453](https://github.com/RocketChat/Rocket.Chat/pull/6453))
+
 - converted meteor-accounts-saml coffee to js ([#6450](https://github.com/RocketChat/Rocket.Chat/pull/6450))
+
 - Convert Statistics Package to JS ([#6447](https://github.com/RocketChat/Rocket.Chat/pull/6447))
+
 - Convert ChatOps Package to JavaScript ([#6425](https://github.com/RocketChat/Rocket.Chat/pull/6425))
+
 - Change all instances of Meteor.Collection for Mongo.Collection ([#6410](https://github.com/RocketChat/Rocket.Chat/pull/6410))
+
 - Flex-Tab CoffeeScript to JavaScript III ([#6278](https://github.com/RocketChat/Rocket.Chat/pull/6278))
+
 - Flex-Tab CoffeeScript to JavaScript I  ([#6276](https://github.com/RocketChat/Rocket.Chat/pull/6276))
+
 - Side-nav CoffeeScript to JavaScript ([#6264](https://github.com/RocketChat/Rocket.Chat/pull/6264))
+
 - Convert Tutum Package to JS ([#6446](https://github.com/RocketChat/Rocket.Chat/pull/6446))
+
 - Added Deploy method and platform to stats ([#6649](https://github.com/RocketChat/Rocket.Chat/pull/6649))
+
 - LingoHub based on develop ([#6647](https://github.com/RocketChat/Rocket.Chat/pull/6647))
+
 - meteor update ([#6631](https://github.com/RocketChat/Rocket.Chat/pull/6631))
+
 - Env override initial setting ([#6163](https://github.com/RocketChat/Rocket.Chat/pull/6163) by [@mrsimpson](https://github.com/mrsimpson))
 
 </details>
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index 89e93e701d59..c96c3f78b851 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.1.0-rc.0"
+	"version": "3.1.0-rc.1"
 }
diff --git a/package.json b/package.json
index f24426c8b27c..739da825bd08 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.1.0-rc.0",
+	"version": "3.1.0-rc.1",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

From 81888bfe1d1fcda6563de8eba004f39b97cf1cd2 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Fri, 27 Mar 2020 17:02:25 -0300
Subject: [PATCH 084/223] Regression: omnichannel manual queued sidebarlist
 (#17048)

---
 app/ui-sidenav/client/chatRoomItem.js | 2 +-
 app/ui-utils/client/lib/openRoom.js   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/ui-sidenav/client/chatRoomItem.js b/app/ui-sidenav/client/chatRoomItem.js
index d3c050e2e243..1d29d75c58c9 100644
--- a/app/ui-sidenav/client/chatRoomItem.js
+++ b/app/ui-sidenav/client/chatRoomItem.js
@@ -23,7 +23,7 @@ Template.chatRoomItem.helpers({
 		const roomData = {
 			...this,
 			icon: icon !== 'at' && icon,
-			avatar: roomTypes.getConfig(this.t).getAvatarPath(room, this),
+			avatar: roomTypes.getConfig(this.t).getAvatarPath(room || this),
 			username: this.name,
 			route: roomTypes.getRouteLink(this.t, this),
 			name: roomType.roomName(this),
diff --git a/app/ui-utils/client/lib/openRoom.js b/app/ui-utils/client/lib/openRoom.js
index 18d644323c83..7528398b0acb 100644
--- a/app/ui-utils/client/lib/openRoom.js
+++ b/app/ui-utils/client/lib/openRoom.js
@@ -61,6 +61,7 @@ export const openRoom = async function(type, name) {
 
 		try {
 			const room = roomTypes.findRoom(type, name, user) || await callMethod('getRoomByTypeAndName', type, name);
+			Rooms.upsert({ _id: room._id }, _.omit(room, '_id'));
 
 			if (RoomManager.open(type + name).ready() !== true) {
 				if (settings.get('Accounts_AllowAnonymousRead')) {
@@ -72,8 +73,6 @@ export const openRoom = async function(type, name) {
 
 			c.stop();
 
-			Rooms.upsert({ _id: room._id }, _.omit(room, '_id'));
-
 			if (window.currentTracker) {
 				window.currentTracker = undefined;
 			}

From 421d2a893c705b3156740c2b561ab47787e08bdc Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Sat, 28 Mar 2020 01:26:32 -0300
Subject: [PATCH 085/223] Regression: Fix removing user not removing his 1-on-1
 DMs (#17057)

---
 app/lib/server/functions/deleteUser.js    | 29 +++++++++++++++--------
 app/models/server/models/Messages.js      |  4 ++++
 app/models/server/models/Rooms.js         | 16 +++++++------
 app/models/server/models/Subscriptions.js |  4 ++++
 4 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/app/lib/server/functions/deleteUser.js b/app/lib/server/functions/deleteUser.js
index f5b59b8c7e24..1038c6783d46 100644
--- a/app/lib/server/functions/deleteUser.js
+++ b/app/lib/server/functions/deleteUser.js
@@ -1,13 +1,24 @@
 import { Meteor } from 'meteor/meteor';
 import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
-import { FileUpload } from '../../../file-upload';
+import { FileUpload } from '../../../file-upload/server';
 import { Users, Subscriptions, Messages, Rooms, Integrations, FederationServers } from '../../../models/server';
 import { hasRole, getUsersInRole } from '../../../authorization/server';
 import { settings } from '../../../settings/server';
 import { Notifications } from '../../../notifications/server';
 import { updateGroupDMsName } from './updateGroupDMsName';
 
+const bulkRoomCleanUp = (rids) => {
+	// no bulk deletion for files
+	rids.forEach((rid) => FileUpload.removeFilesByRoomId(rid));
+
+	return Promise.await(Promise.all([
+		Subscriptions.removeByRoomIds(rids),
+		Messages.removeByRoomIds(rids),
+		Rooms.removeByIds(rids),
+	]));
+};
+
 export const deleteUser = function(userId) {
 	const user = Users.findOneById(userId, {
 		fields: { username: 1, avatarOrigin: 1, federation: 1 },
@@ -83,21 +94,19 @@ export const deleteUser = function(userId) {
 				break;
 		}
 
-		roomCache.forEach((roomData) => {
+		const roomIds = roomCache.filter((roomData) => {
 			if (roomData.subscribers === null && roomData.t !== 'd' && roomData.t !== 'c') {
 				roomData.subscribers = Subscriptions.findByRoomId(roomData.rid).count();
 			}
 
 			// Remove non-channel rooms with only 1 user (the one being deleted)
-			if (roomData.t !== 'c' && roomData.subscribers === 1) {
-				Subscriptions.removeByRoomId(roomData.rid);
-				FileUpload.removeFilesByRoomId(roomData.rid);
-				Messages.removeByRoomId(roomData.rid);
-				Rooms.removeById(roomData.rid);
-			}
-		});
+			return roomData.t !== 'c' && roomData.subscribers === 1;
+		}).map(({ _id }) => _id);
+
+		Rooms.find1On1ByUserId(user._id, { fields: { _id: 1 } }).forEach(({ _id }) => roomIds.push(_id));
+
+		bulkRoomCleanUp(roomIds);
 
-		// TODO: do not remove group DMs
 		Rooms.updateGroupDMsRemovingUsernamesByUsername(user.username); // Remove direct rooms with the user
 		Rooms.removeDirectRoomContainingUsername(user.username); // Remove direct rooms with the user
 
diff --git a/app/models/server/models/Messages.js b/app/models/server/models/Messages.js
index d9e686002da6..ca29fe391eaa 100644
--- a/app/models/server/models/Messages.js
+++ b/app/models/server/models/Messages.js
@@ -896,6 +896,10 @@ export class Messages extends Base {
 		return this.remove(query);
 	}
 
+	removeByRoomIds(rids) {
+		return this.remove({ rid: { $in: rids } });
+	}
+
 	removeByIdPinnedTimestampLimitAndUsers(rid, pinned, ignoreDiscussion = true, ts, limit, users = []) {
 		const query = {
 			rid,
diff --git a/app/models/server/models/Rooms.js b/app/models/server/models/Rooms.js
index 50b2568d735c..2ed0cd76c83b 100644
--- a/app/models/server/models/Rooms.js
+++ b/app/models/server/models/Rooms.js
@@ -550,6 +550,13 @@ export class Rooms extends Base {
 		}, options);
 	}
 
+	find1On1ByUserId(userId, options) {
+		return this.find({
+			uids: userId,
+			usersCount: 2,
+		}, options);
+	}
+
 	// UPDATE
 	addImportIds(_id, importIds) {
 		importIds = [].concat(importIds);
@@ -1025,13 +1032,8 @@ export class Rooms extends Base {
 		return this.remove(query);
 	}
 
-	remove1on1ById(_id) {
-		const query = {
-			_id,
-			usersCount: { $lte: 2 },
-		};
-
-		return this.remove(query);
+	removeByIds(ids) {
+		return this.remove({ _id: { $in: ids } });
 	}
 
 	removeDirectRoomContainingUsername(username) {
diff --git a/app/models/server/models/Subscriptions.js b/app/models/server/models/Subscriptions.js
index 50396a886367..3442cfcd5a46 100644
--- a/app/models/server/models/Subscriptions.js
+++ b/app/models/server/models/Subscriptions.js
@@ -1331,6 +1331,10 @@ export class Subscriptions extends Base {
 		return result;
 	}
 
+	removeByRoomIds(rids) {
+		return this.remove({ rid: { $in: rids } });
+	}
+
 	// //////////////////////////////////////////////////////////////////
 	// threads
 

From 0e3883e4cca8e6c76e5e3c7aa4ae855a9fff4776 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sat, 28 Mar 2020 01:55:15 -0300
Subject: [PATCH 086/223] Regression: Do not refresh statistics when opening
 the info panel (#17060)

---
 client/components/admin/info/InformationRoute.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/components/admin/info/InformationRoute.js b/client/components/admin/info/InformationRoute.js
index 10c51e94ab0a..455b7c1fd826 100644
--- a/client/components/admin/info/InformationRoute.js
+++ b/client/components/admin/info/InformationRoute.js
@@ -21,7 +21,7 @@ export function InformationRoute() {
 	useEffect(() => {
 		let didCancel = false;
 
-		const fetchStatistics = async () => {
+		const fetchStatistics = async ({ refresh = false } = {}) => {
 			if (!canViewStatistics) {
 				setStatistics(null);
 				setInstances(null);
@@ -32,7 +32,7 @@ export function InformationRoute() {
 
 			try {
 				const [statistics, instances] = await Promise.all([
-					getStatistics({ refresh: true }),
+					getStatistics({ refresh }),
 					getInstances(),
 				]);
 
@@ -62,7 +62,7 @@ export function InformationRoute() {
 			return;
 		}
 
-		fetchStatistics();
+		fetchStatistics({ refresh: true });
 	};
 
 	const handleClickDownloadInfo = () => {

From ba602bcabb1478a61bdefd868666f8120a156cb3 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sat, 28 Mar 2020 03:11:11 -0300
Subject: [PATCH 087/223] Regression: Invite links working for group DMs
 (#17056)

* Regression: Invite links working for group DMs

* Protect invite link creation

Co-authored-by: Diego Sampaio <chinello@gmail.com>
---
 app/invites/server/functions/findOrCreateInvite.js | 8 +++++++-
 app/invites/server/functions/useInviteToken.js     | 5 +++++
 app/lib/server/functions/addUserToRoom.js          | 6 ++++++
 app/ui-flextab/client/tabs/membersList.html        | 6 +++---
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/app/invites/server/functions/findOrCreateInvite.js b/app/invites/server/functions/findOrCreateInvite.js
index cd01c0cc06e9..379a934804a1 100644
--- a/app/invites/server/functions/findOrCreateInvite.js
+++ b/app/invites/server/functions/findOrCreateInvite.js
@@ -3,9 +3,10 @@ import { Random } from 'meteor/random';
 
 import { hasPermission } from '../../../authorization';
 import { Notifications } from '../../../notifications';
-import { Invites, Subscriptions } from '../../../models';
+import { Invites, Subscriptions, Rooms } from '../../../models/server';
 import { settings } from '../../../settings';
 import { getURL } from '../../../utils/lib/getURL';
+import { roomTypes, RoomMemberActions } from '../../../utils/server';
 
 function getInviteUrl(invite) {
 	const { _id } = invite;
@@ -40,6 +41,11 @@ export const findOrCreateInvite = (userId, invite) => {
 		throw new Meteor.Error('error-invalid-room', 'The rid field is invalid', { method: 'findOrCreateInvite', field: 'rid' });
 	}
 
+	const room = Rooms.findOneById(invite.rid);
+	if (!roomTypes.getConfig(room.t).allowMemberAction(room, RoomMemberActions.INVITE)) {
+		throw new Meteor.Error('error-room-type-not-allowed', 'Cannot create invite links for this room type', { method: 'findOrCreateInvite' });
+	}
+
 	let { days, maxUses } = invite;
 
 	if (!possibleDays.includes(days)) {
diff --git a/app/invites/server/functions/useInviteToken.js b/app/invites/server/functions/useInviteToken.js
index d14554795928..3cf638fd3e94 100644
--- a/app/invites/server/functions/useInviteToken.js
+++ b/app/invites/server/functions/useInviteToken.js
@@ -3,6 +3,7 @@ import { Meteor } from 'meteor/meteor';
 import { Invites, Users, Subscriptions } from '../../../models/server';
 import { validateInviteToken } from './validateInviteToken';
 import { addUserToRoom } from '../../../lib/server/functions/addUserToRoom';
+import { roomTypes, RoomMemberActions } from '../../../utils/server';
 
 export const useInviteToken = (userId, token) => {
 	if (!userId) {
@@ -15,6 +16,10 @@ export const useInviteToken = (userId, token) => {
 
 	const { inviteData, room } = validateInviteToken(token);
 
+	if (!roomTypes.getConfig(room.t).allowMemberAction(room, RoomMemberActions.INVITE)) {
+		throw new Meteor.Error('error-room-type-not-allowed', 'Can\'t join room of this type via invite', { method: 'useInviteToken', field: 'token' });
+	}
+
 	const user = Users.findOneById(userId);
 	Users.updateInviteToken(user._id, token);
 
diff --git a/app/lib/server/functions/addUserToRoom.js b/app/lib/server/functions/addUserToRoom.js
index 39db45fb4143..1e9878aadcd6 100644
--- a/app/lib/server/functions/addUserToRoom.js
+++ b/app/lib/server/functions/addUserToRoom.js
@@ -2,11 +2,17 @@ import { Meteor } from 'meteor/meteor';
 
 import { Rooms, Subscriptions, Messages } from '../../../models';
 import { callbacks } from '../../../callbacks';
+import { roomTypes, RoomMemberActions } from '../../../utils/server';
 
 export const addUserToRoom = function(rid, user, inviter, silenced) {
 	const now = new Date();
 	const room = Rooms.findOneById(rid);
 
+	const roomConfig = roomTypes.getConfig(room.t);
+	if (!roomConfig.allowMemberAction(room, RoomMemberActions.JOIN) && !roomConfig.allowMemberAction(room, RoomMemberActions.INVITE)) {
+		return;
+	}
+
 	// Check if user is already in room
 	const subscription = Subscriptions.findOneByRoomIdAndUserId(rid, user._id);
 	if (subscription) {
diff --git a/app/ui-flextab/client/tabs/membersList.html b/app/ui-flextab/client/tabs/membersList.html
index ad92bc15ff59..69c75e11214e 100644
--- a/app/ui-flextab/client/tabs/membersList.html
+++ b/app/ui-flextab/client/tabs/membersList.html
@@ -51,10 +51,10 @@
 		<div class="rc-button__group rc-button__group--stretch">
 			{{#if canAddUser}}
 				<button class="rc-button rc-button--primary js-add">{{> icon block="rc-input__icon-svg" icon="plus"}}{{_ "Add_users"}}</button>
-			{{/if}}
 
-			{{#if canInviteUser}}
-				<button class="rc-button rc-button--primary js-invite">{{> icon block="rc-input__icon-svg" icon="user-plus"}}{{_ "Invite_Users"}}</button>
+				{{#if canInviteUser}}
+					<button class="rc-button rc-button--primary js-invite">{{> icon block="rc-input__icon-svg" icon="user-plus"}}{{_ "Invite_Users"}}</button>
+				{{/if}}
 			{{/if}}
 		</div>
 

From 4127a3c6a10c2bcf059da4733cc235fc560063e1 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sat, 28 Mar 2020 03:15:33 -0300
Subject: [PATCH 088/223] Fix: Last message of Group DMs not showing the sender
 (#17059)

---
 app/ui-sidenav/client/chatRoomItem.js | 1 +
 app/ui-sidenav/client/sidebarItem.js  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/ui-sidenav/client/chatRoomItem.js b/app/ui-sidenav/client/chatRoomItem.js
index 1d29d75c58c9..45d7a5c8555c 100644
--- a/app/ui-sidenav/client/chatRoomItem.js
+++ b/app/ui-sidenav/client/chatRoomItem.js
@@ -31,6 +31,7 @@ Template.chatRoomItem.helpers({
 			active: false,
 			archivedClass,
 			status: this.t === 'd' || this.t === 'l',
+			isGroupChat: roomType.isGroupChat(room),
 		};
 		roomData.username = roomData.username || roomData.name;
 
diff --git a/app/ui-sidenav/client/sidebarItem.js b/app/ui-sidenav/client/sidebarItem.js
index 1021b70a8674..46e5427589ea 100644
--- a/app/ui-sidenav/client/sidebarItem.js
+++ b/app/ui-sidenav/client/sidebarItem.js
@@ -98,7 +98,7 @@ Template.sidebarItem.onCreated(function() {
 		const renderedMessage = renderMessageBody(currentData.lastMessage).replace(/<br\s?\\?>/g, ' ');
 		const sender = this.user && this.user._id === currentData.lastMessage.u._id ? t('You') : otherUser;
 
-		if (currentData.t === 'd' && Meteor.userId() !== currentData.lastMessage.u._id) {
+		if (!currentData.isGroupChat && Meteor.userId() !== currentData.lastMessage.u._id) {
 			this.renderedMessage = currentData.lastMessage.msg === '' ? t('Sent_an_attachment') : renderedMessage;
 		} else {
 			this.renderedMessage = currentData.lastMessage.msg === '' ? t('user_sent_an_attachment', { user: sender }) : `${ sender }: ${ renderedMessage }`;

From 7f7a5512f8361c348b0a098a5cc642cf9327e3c3 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sat, 28 Mar 2020 03:40:24 -0300
Subject: [PATCH 089/223] Fix: Notifications of Group DM were not showing the
 room name (#17058)

* Fix: Notifications of Group DM were not showing the room name

* Use isGroupChat method

* Add sender to notification text

Co-authored-by: Diego Sampaio <chinello@gmail.com>
---
 app/lib/lib/roomTypes/direct.js                  | 13 ++++++++++---
 app/lib/server/functions/notifications/email.js  |  8 +++++---
 app/lib/server/functions/notifications/mobile.js |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/lib/lib/roomTypes/direct.js b/app/lib/lib/roomTypes/direct.js
index b564d3e3e012..487c21d63891 100644
--- a/app/lib/lib/roomTypes/direct.js
+++ b/app/lib/lib/roomTypes/direct.js
@@ -167,10 +167,17 @@ export class DirectMessageRoomType extends RoomTypeConfig {
 			return {};
 		}
 
-		const title = settings.get('UI_Use_Real_Name') ? user.name : `@${ user.username }`;
-		const text = notificationMessage;
+		if (this.isGroupChat(room)) {
+			return {
+				title: this.roomName(room),
+				text: `${ (settings.get('UI_Use_Real_Name') && user.name) || user.username }: ${ notificationMessage }`,
+			};
+		}
 
-		return { title, text };
+		return {
+			title: (settings.get('UI_Use_Real_Name') && user.name) || user.username,
+			text: notificationMessage,
+		};
 	}
 
 	getAvatarPath(roomData, subData) {
diff --git a/app/lib/server/functions/notifications/email.js b/app/lib/server/functions/notifications/email.js
index 0b22255842ec..13a4652072d3 100644
--- a/app/lib/server/functions/notifications/email.js
+++ b/app/lib/server/functions/notifications/email.js
@@ -26,7 +26,9 @@ function getEmailContent({ message, user, room }) {
 	const roomName = s.escapeHTML(`#${ roomTypes.getRoomName(room.t, room) }`);
 	const userName = s.escapeHTML(settings.get('UI_Use_Real_Name') ? message.u.name || message.u.username : message.u.username);
 
-	const header = TAPi18n.__(room.t === 'd' ? 'User_sent_a_message_to_you' : 'User_sent_a_message_on_channel', {
+	const roomType = roomTypes.getConfig(room.t);
+
+	const header = TAPi18n.__(!roomType.isGroupChat(room) ? 'User_sent_a_message_to_you' : 'User_sent_a_message_on_channel', {
 		username: userName,
 		channel: roomName,
 		lng,
@@ -54,7 +56,7 @@ function getEmailContent({ message, user, room }) {
 	}
 
 	if (message.file) {
-		const fileHeader = TAPi18n.__(room.t === 'd' ? 'User_uploaded_a_file_to_you' : 'User_uploaded_a_file_on_channel', {
+		const fileHeader = TAPi18n.__(!roomType.isGroupChat(room) ? 'User_uploaded_a_file_to_you' : 'User_uploaded_a_file_on_channel', {
 			username: userName,
 			channel: roomName,
 			lng,
@@ -112,7 +114,7 @@ export function sendEmail({ message, user, subscription, room, emailAddress, has
 	const username = settings.get('UI_Use_Real_Name') ? message.u.name || message.u.username : message.u.username;
 	let subjectKey = 'Offline_Mention_All_Email';
 
-	if (room.t === 'd') {
+	if (!roomTypes.getConfig(room.t).isGroupChat(room)) {
 		subjectKey = 'Offline_DM_Email';
 	} else if (hasMentionToUser) {
 		subjectKey = 'Offline_Mention_Email';
diff --git a/app/lib/server/functions/notifications/mobile.js b/app/lib/server/functions/notifications/mobile.js
index fef2c83ba2b5..1e7a5d54849d 100644
--- a/app/lib/server/functions/notifications/mobile.js
+++ b/app/lib/server/functions/notifications/mobile.js
@@ -63,7 +63,7 @@ export async function sendSinglePush({ room, message, userId, receiverUsername,
 			messageType: message.t,
 			messageId: message._id,
 		},
-		roomName: settings.get('Push_show_username_room') && room.t !== 'd' ? `#${ roomTypes.getRoomName(room.t, room) }` : '',
+		roomName: settings.get('Push_show_username_room') && roomTypes.getConfig(room.t).isGroupChat(room) ? `#${ roomTypes.getRoomName(room.t, room) }` : '',
 		username,
 		message: settings.get('Push_show_message') ? notificationMessage : ' ',
 		badge: await getBadgeCount(userId),

From f925e44852084083264aa381b4f81b03acc9e29e Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Sat, 28 Mar 2020 16:56:15 -0300
Subject: [PATCH 090/223] Regression: Omnichannel notification on new
 conversations displaying incorrect information (#16346)

---
 app/livechat/server/lib/Livechat.js                |  1 +
 app/livechat/server/lib/routing/ManualSelection.js | 11 +++++++----
 app/livechat/server/roomType.js                    |  2 +-
 packages/rocketchat-i18n/i18n/en.i18n.json         |  2 ++
 packages/rocketchat-i18n/i18n/pt-BR.i18n.json      |  2 ++
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/livechat/server/lib/Livechat.js b/app/livechat/server/lib/Livechat.js
index 36cf3352fb87..8a31d02e1c7d 100644
--- a/app/livechat/server/lib/Livechat.js
+++ b/app/livechat/server/lib/Livechat.js
@@ -72,6 +72,7 @@ export const Livechat = {
 
 	getAgents(department) {
 		if (department) {
+			// TODO: This and all others should get the user's info as well
 			return LivechatDepartmentAgents.findByDepartmentId(department);
 		}
 		return Users.findAgents();
diff --git a/app/livechat/server/lib/routing/ManualSelection.js b/app/livechat/server/lib/routing/ManualSelection.js
index e977d9a6f8e9..f217424cf062 100644
--- a/app/livechat/server/lib/routing/ManualSelection.js
+++ b/app/livechat/server/lib/routing/ManualSelection.js
@@ -4,7 +4,7 @@ import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 import { Livechat } from '../Livechat';
 import { RoutingManager } from '../RoutingManager';
 import { sendNotification } from '../../../../lib/server';
-import { LivechatRooms, LivechatInquiry } from '../../../../models/server';
+import { LivechatRooms, LivechatInquiry, Users } from '../../../../models/server';
 
 /* Manual Selection Queuing Method:
 	*
@@ -46,11 +46,14 @@ class ManualSelection {
 
 		// Alert only the online agents of the queued request
 		const onlineAgents = Livechat.getOnlineAgents(department);
-		const { message } = inquiry;
 
 		const room = LivechatRooms.findOneById(rid);
+		const notificationUserName = v && (v.name || v.username);
 
 		onlineAgents.forEach((agent) => {
+			if (agent.agentId) {
+				agent = Users.findOneById(agent.agentId);
+			}
 			const { _id, active, emails, language, status, statusConnection, username } = agent;
 			sendNotification({
 				// fake a subscription in order to make use of the function defined above
@@ -73,8 +76,8 @@ class ManualSelection {
 				hasMentionToAll: true, // consider all agents to be in the room
 				hasMentionToHere: false,
 				message: Object.assign({}, { u: v }),
-				notificationMessage: message.msg,
-				room: Object.assign(room, { name: TAPi18n.__('New_livechat_in_queue') }),
+				notificationMessage: TAPi18n.__('User_started_a_new_conversation', { username: notificationUserName }, language),
+				room: Object.assign(room, { name: TAPi18n.__('New_chat_in_queue', {}, language) }),
 				mentionIds: [],
 			});
 		});
diff --git a/app/livechat/server/roomType.js b/app/livechat/server/roomType.js
index 31d62c609b68..9d8cb17af7b5 100644
--- a/app/livechat/server/roomType.js
+++ b/app/livechat/server/roomType.js
@@ -17,7 +17,7 @@ class LivechatRoomTypeServer extends LivechatRoomType {
 	 * @return {object} Notification details
 	 */
 	getNotificationDetails(room, user, notificationMessage) {
-		const title = `[livechat] ${ this.roomName(room) }`;
+		const title = `[Omnichannel] ${ this.roomName(room) }`;
 		const text = notificationMessage;
 
 		return { title, text };
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index dd9a3327143c..110f01e9b262 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -2420,6 +2420,7 @@
   "Navigation_History": "Navigation History",
   "New_users": "New users",
   "New_Application": "New Application",
+  "New_chat_in_queue": "New chat in queue",
   "New_chat_transfer": "New Chat Transfer: __transfer__",
   "New_Custom_Field": "New Custom Field",
   "New_Department": "New Department",
@@ -3482,6 +3483,7 @@
   "User_sent_a_message_to_you": "<strong>__username__</strong> sent you a message",
   "user_sent_an_attachment": "__user__ sent an attachment",
   "User_Settings": "User Settings",
+  "User_started_a_new_conversation": "__username__ started a new conversation",
   "User_unmuted_by": "User <em>__user_unmuted__</em> unmuted by <em>__user_by__</em>.",
   "User_unmuted_in_room": "User unmuted in room",
   "User_updated_successfully": "User updated successfully",
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index e26ed0ea5829..bc6301c49fc0 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -2178,6 +2178,7 @@
   "Name_Placeholder": "Por favor, insira seu nome...",
   "Navigation_History": "Histórico de navegação",
   "New_Application": "Nova aplicação",
+  "New_chat_in_queue": "Novo chat na fila",
   "New_chat_transfer": "Nova Transferência de conversa: __transfer__",
   "New_Custom_Field": "Novo Campo Personalizado",
   "New_Department": "Novo Departamento",
@@ -3157,6 +3158,7 @@
   "User_sent_a_message_to_you": "<strong>__username__</strong> enviou uma mensagem para você",
   "user_sent_an_attachment": "__user__ enviou um anexo",
   "User_Settings": "Configurações do Usuário",
+  "User_started_a_new_conversation": "__username__ iniciou um nova conversa",
   "User_unmuted_by": "<em>__user_by__</em> permitiu que <em>__user_unmuted__</em> fale na sala.",
   "User_unmuted_in_room": "Usuário pode falar na sala",
   "User_updated_successfully": "Usuário atualizado com sucesso",

From af3d8883b83656fe3dabe6102b1a1aafb74635f5 Mon Sep 17 00:00:00 2001
From: Marcos Spessatto Defendi <marcos.defendi@ulbra.inf.br>
Date: Sat, 28 Mar 2020 17:06:15 -0300
Subject: [PATCH 091/223] Regression: users.setStatus throwing an error if
 message is empty (#17036)

---
 app/api/server/v1/users.js       |   4 +-
 tests/data/users.helper.js       |  10 ++
 tests/end-to-end/api/01-users.js | 170 ++++++++++++++++++++-----------
 3 files changed, 121 insertions(+), 63 deletions(-)

diff --git a/app/api/server/v1/users.js b/app/api/server/v1/users.js
index 5570517c9c7d..a3618a3caa2e 100644
--- a/app/api/server/v1/users.js
+++ b/app/api/server/v1/users.js
@@ -365,6 +365,7 @@ API.v1.addRoute('users.getStatus', { authRequired: true }, {
 		if (this.isUserFromParams()) {
 			const user = Users.findOneById(this.userId);
 			return API.v1.success({
+				_id: user._id,
 				message: user.statusText,
 				connectionStatus: user.statusConnection,
 				status: user.status,
@@ -374,6 +375,7 @@ API.v1.addRoute('users.getStatus', { authRequired: true }, {
 		const user = this.getUserFromParams();
 
 		return API.v1.success({
+			_id: user._id,
 			message: user.statusText,
 			status: user.status,
 		});
@@ -403,7 +405,7 @@ API.v1.addRoute('users.setStatus', { authRequired: true }, {
 		}
 
 		Meteor.runAsUser(user._id, () => {
-			if (this.bodyParams.message || this.bodyParams.message.length === 0) {
+			if (this.bodyParams.message || this.bodyParams.message === '') {
 				setStatusText(user._id, this.bodyParams.message);
 			}
 			if (this.bodyParams.status) {
diff --git a/tests/data/users.helper.js b/tests/data/users.helper.js
index ec2ae445b3b6..44ee4f73c749 100644
--- a/tests/data/users.helper.js
+++ b/tests/data/users.helper.js
@@ -40,3 +40,13 @@ export const getUserByUsername = (username) => new Promise((resolve) => {
 			resolve(res.body.user);
 		});
 });
+
+export const getUserStatus = (userId) => new Promise((resolve) => {
+	request.get(api(`users.getStatus?userId=${ userId }`))
+		.set(credentials)
+		.expect('Content-Type', 'application/json')
+		.expect(200)
+		.end((end, res) => {
+			resolve(res.body);
+		});
+});
diff --git a/tests/end-to-end/api/01-users.js b/tests/end-to-end/api/01-users.js
index 8c6411d0f80f..56de4a6a2db6 100644
--- a/tests/end-to-end/api/01-users.js
+++ b/tests/end-to-end/api/01-users.js
@@ -17,7 +17,7 @@ import { adminEmail, preferences, password, adminUsername } from '../../data/use
 import { imgURL } from '../../data/interactions.js';
 import { customFieldText, clearCustomFields, setCustomFields } from '../../data/custom-fields.js';
 import { updatePermission, updateSetting } from '../../data/permissions.helper';
-import { createUser, login, deleteUser } from '../../data/users.helper.js';
+import { createUser, login, deleteUser, getUserStatus } from '../../data/users.helper.js';
 
 describe('[Users]', function() {
 	this.retries(0);
@@ -1738,84 +1738,130 @@ describe('[Users]', function() {
 		});
 	});
 
-	describe('[/users.setStatus]', () => {
-		let user;
-		before((done) => {
-			const username = `user.test.${ Date.now() }`;
-			const email = `${ username }@rocket.chat`;
-			request.post(api('users.create'))
+	describe('[/users.getStatus]', () => {
+		it('should return my own status', (done) => {
+			request.get(api('users.getStatus'))
 				.set(credentials)
-				.send({ email, name: username, username, password })
-				.end((err, res) => {
-					user = res.body.user;
-					done();
-				});
-		});
-		let userCredentials;
-		before((done) => {
-			request.post(api('login'))
-				.send({
-					user: user.username,
-					password,
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('status');
+					expect(res.body._id).to.be.equal(credentials['X-User-Id']);
 				})
+				.end(done);
+		});
+		it('should return other user status', (done) => {
+			request.get(api('users.getStatus?userId=rocket.cat'))
+				.set(credentials)
 				.expect('Content-Type', 'application/json')
 				.expect(200)
 				.expect((res) => {
-					userCredentials = {};
-					userCredentials['X-Auth-Token'] = res.body.data.authToken;
-					userCredentials['X-User-Id'] = res.body.data.userId;
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.have.property('status');
+					expect(res.body._id).to.be.equal('rocket.cat');
 				})
 				.end(done);
 		});
+	});
+
+	describe('[/users.setStatus]', () => {
+		let user;
 		before((done) => {
-			updatePermission('edit-other-user-info', ['admin', 'user']).then(done);
+			createUser()
+				.then((createdUser) => {
+					user = createdUser;
+					done();
+				});
 		});
-		after((done) => {
-			request.post(api('users.delete')).set(credentials).send({
-				userId: user._id,
-			}).end(() => updatePermission('edit-other-user-info', ['admin']).then(done));
-			user = undefined;
+		it('should return an error when the setting "Accounts_AllowUserStatusMessageChange" is disabled', (done) => {
+			updateSetting('Accounts_AllowUserStatusMessageChange', false).then(() => {
+				request.post(api('users.setStatus'))
+					.set(credentials)
+					.send({
+						status: 'busy',
+						message: '',
+					})
+					.expect('Content-Type', 'application/json')
+					.expect(400)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', false);
+						expect(res.body.errorType).to.be.equal('error-not-allowed');
+						expect(res.body.error).to.be.equal('Change status is not allowed [error-not-allowed]');
+					})
+					.end(done);
+			});
 		});
-		it('should set other user status to busy', (done) => {
-			const testUsername = `testuserdelete${ +new Date() }`;
-			let targetUser;
-			request.post(api('users.register'))
+		it('should update my own status', (done) => {
+			updateSetting('Accounts_AllowUserStatusMessageChange', true).then(() => {
+				request.post(api('users.setStatus'))
+					.set(credentials)
+					.send({
+						status: 'busy',
+						message: 'test',
+					})
+					.expect('Content-Type', 'application/json')
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', true);
+						getUserStatus(credentials['X-User-Id']).then((status) => expect(status.status).to.be.equal('busy'));
+					})
+					.end(done);
+			});
+		});
+		it('should return an error when trying to update other user status without the required permission', (done) => {
+			updatePermission('edit-other-user-info', []).then(() => {
+				request.post(api('users.setStatus'))
+					.set(credentials)
+					.send({
+						status: 'busy',
+						message: 'test',
+						userId: user._id,
+					})
+					.expect('Content-Type', 'application/json')
+					.expect(403)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', false);
+						expect(res.body.error).to.be.equal('unauthorized');
+					})
+					.end(done);
+			});
+		});
+		it('should update another user status succesfully', (done) => {
+			updatePermission('edit-other-user-info', ['admin']).then(() => {
+				request.post(api('users.setStatus'))
+					.set(credentials)
+					.send({
+						status: 'busy',
+						message: 'test',
+						userId: user._id,
+					})
+					.expect('Content-Type', 'application/json')
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', true);
+						getUserStatus(credentials['X-User-Id']).then((status) => {
+							expect(status.status).to.be.equal('busy');
+							expect(status.message).to.be.equal('test');
+						});
+					})
+					.end(done);
+			});
+		});
+		it('should return an error when the user try to update user status with an invalid status', (done) => {
+			request.post(api('users.setStatus'))
 				.set(credentials)
 				.send({
-					email: `${ testUsername }.@teste.com`,
-					username: `${ testUsername }test`,
-					name: testUsername,
-					pass: password,
+					status: 'invalid',
 				})
 				.expect('Content-Type', 'application/json')
-				.expect(200)
+				.expect(400)
 				.expect((res) => {
-					targetUser = res.body.user;
+					expect(res.body).to.have.property('success', false);
+					expect(res.body.errorType).to.be.equal('error-invalid-status');
+					expect(res.body.error).to.be.equal('Valid status types include online, away, offline, and busy. [error-invalid-status]');
 				})
-				.end(() => {
-					request.post(api('users.setStatus'))
-						.set(userCredentials)
-						.send({
-							status: 'busy',
-							message: '',
-							userId: targetUser._id,
-						})
-						.expect('Content-Type', 'application/json')
-						.expect(200)
-						.expect((res) => {
-							expect(res.body).to.have.property('success', true);
-						})
-						.end(() => {
-							request.get(api(`users.getStatus?userId=${ targetUser._id }`))
-								.set(userCredentials)
-								.expect('Content-Type', 'application/json')
-								.expect(200)
-								.expect((res) => {
-									expect(res.body).to.have.property('status', 'busy');
-								})
-								.end(done);
-						});
-				});
+				.end(done);
 		});
 	});
 

From 03cb0e1edd1ea228c8c099cffb8559abef383db1 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Sat, 28 Mar 2020 23:07:40 -0300
Subject: [PATCH 092/223] Regression: Overwrite model functions on EE only when
 license applied (#17061)

* Overwrite model function on EE only license applied

* Convert to typescript

Co-authored-by: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
---
 .../license/server/{bundles.js => bundles.ts} |  14 ++-
 .../license/server/{decrypt.js => decrypt.ts} |   4 +-
 ee/app/license/server/index.js                |   6 -
 ee/app/license/server/index.ts                |   5 +
 .../license/server/{license.js => license.ts} | 118 ++++++++++++------
 .../license/server/{methods.js => methods.ts} |   5 +-
 .../livechat-enterprise/server/lib/units.js   |   1 +
 .../server/models/LivechatDepartment.js       |  79 +++++-------
 ee/app/models/server/models/LivechatRooms.js  |  50 +++-----
 .../models/server/raw/LivechatDepartment.js   |  35 ++----
 ee/app/models/server/raw/LivechatRooms.js     |  42 +++----
 11 files changed, 171 insertions(+), 188 deletions(-)
 rename ee/app/license/server/{bundles.js => bundles.ts} (61%)
 rename ee/app/license/server/{decrypt.js => decrypt.ts} (90%)
 delete mode 100644 ee/app/license/server/index.js
 create mode 100644 ee/app/license/server/index.ts
 rename ee/app/license/server/{license.js => license.ts} (61%)
 rename ee/app/license/server/{methods.js => methods.ts} (56%)

diff --git a/ee/app/license/server/bundles.js b/ee/app/license/server/bundles.ts
similarity index 61%
rename from ee/app/license/server/bundles.js
rename to ee/app/license/server/bundles.ts
index f4cc45c2d348..5b92f305a1bd 100644
--- a/ee/app/license/server/bundles.js
+++ b/ee/app/license/server/bundles.ts
@@ -1,4 +1,8 @@
-const bundles = {
+interface IBundle {
+	[key: string]: string[];
+}
+
+const bundles: IBundle = {
 	enterprise: [
 		'auditing',
 		'canned-responses',
@@ -10,7 +14,7 @@ const bundles = {
 	],
 };
 
-const getBundleFromModule = (moduleName) => {
+const getBundleFromModule = (moduleName: string): string|undefined => {
 	const match = moduleName.match(/(.*):\*$/);
 	if (!match) {
 		return;
@@ -19,7 +23,7 @@ const getBundleFromModule = (moduleName) => {
 	return match[1];
 };
 
-export function isBundle(moduleName) {
+export function isBundle(moduleName: string): boolean {
 	if (moduleName === '*') {
 		return true;
 	}
@@ -32,10 +36,10 @@ export function isBundle(moduleName) {
 	return true;
 }
 
-export function getBundleModules(moduleName) {
+export function getBundleModules(moduleName: string): string[] {
 	if (moduleName === '*') {
 		return Object.keys(bundles)
-			.reduce((modules, bundle) => modules.concat(bundles[bundle]), []);
+			.reduce<string[]>((modules, bundle) => modules.concat(bundles[bundle]), []);
 	}
 
 	const bundle = getBundleFromModule(moduleName);
diff --git a/ee/app/license/server/decrypt.js b/ee/app/license/server/decrypt.ts
similarity index 90%
rename from ee/app/license/server/decrypt.js
rename to ee/app/license/server/decrypt.ts
index 889f60e66fb5..ef06dcc03310 100644
--- a/ee/app/license/server/decrypt.js
+++ b/ee/app/license/server/decrypt.ts
@@ -2,8 +2,8 @@ import crypto from 'crypto';
 
 const publicKey = 'LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQ0lqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FnOEFNSUlDQ2dLQ0FnRUFxV1Nza2Q5LzZ6Ung4a3lQY2ljcwpiMzJ3Mnd4VnV3N3lCVDk2clEvOEQreU1lQ01POXdTU3BIYS85bkZ5d293RXRpZ3B0L3dyb1BOK1ZHU3didHdQCkZYQmVxRWxCbmRHRkFsODZlNStFbGlIOEt6L2hHbkNtSk5tWHB4RUsyUkUwM1g0SXhzWVg3RERCN010eC9pcXMKY2pCL091dlNCa2ppU2xlUzdibE5JVC9kQTdLNC9DSjNvaXUwMmJMNEV4Y2xDSGVwenFOTWVQM3dVWmdweE9uZgpOT3VkOElYWUs3M3pTY3VFOEUxNTdZd3B6Q0twVmFIWDdaSmY4UXVOc09PNVcvYUlqS2wzTDYyNjkrZUlPRXJHCndPTm1hSG56Zmc5RkxwSmh6Z3BPMzhhVm43NnZENUtLakJhaldza1krNGEyZ1NRbUtOZUZxYXFPb3p5RUZNMGUKY0ZXWlZWWjNMZWg0dkVNb1lWUHlJeng5Nng4ZjIveW1QbmhJdXZRdjV3TjRmeWVwYTdFWTVVQ2NwNzF6OGtmUAo0RmNVelBBMElEV3lNaWhYUi9HNlhnUVFaNEdiL3FCQmh2cnZpSkNGemZZRGNKZ0w3RmVnRllIUDNQR0wwN1FnCnZMZXZNSytpUVpQcnhyYnh5U3FkUE9rZ3VyS2pWclhUVXI0QTlUZ2lMeUlYNVVsSnEzRS9SVjdtZk9xWm5MVGEKU0NWWEhCaHVQbG5DR1pSMDFUb1RDZktoTUcxdTBDRm5MMisxNWhDOWZxT21XdjlRa2U0M3FsSjBQZ0YzVkovWAp1eC9tVHBuazlnbmJHOUpIK21mSDM5Um9GdlROaW5Zd1NNdll6dXRWT242OXNPemR3aERsYTkwbDNBQ2g0eENWCks3Sk9YK3VIa29OdTNnMmlWeGlaVU0wQ0F3RUFBUT09Ci0tLS0tRU5EIFBVQkxJQyBLRVktLS0tLQo=';
 
-export default function decrypt(encrypted) {
-	const decrypted = crypto.publicDecrypt(Buffer.from(publicKey, 'base64'), Buffer.from(encrypted, 'base64'));
+export default function decrypt(encrypted: string): string {
+	const decrypted = crypto.publicDecrypt(Buffer.from(publicKey, 'base64').toString('utf-8'), Buffer.from(encrypted, 'base64'));
 
 	return decrypted.toString('utf-8');
 }
diff --git a/ee/app/license/server/index.js b/ee/app/license/server/index.js
deleted file mode 100644
index 1d19328f9b76..000000000000
--- a/ee/app/license/server/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import { onLicense } from './license';
-import './settings';
-import './methods';
-import './startup';
-
-export { onLicense };
diff --git a/ee/app/license/server/index.ts b/ee/app/license/server/index.ts
new file mode 100644
index 000000000000..5d718ee36c21
--- /dev/null
+++ b/ee/app/license/server/index.ts
@@ -0,0 +1,5 @@
+import './settings';
+import './methods';
+import './startup';
+
+export { onLicense, overwriteClassOnLicense } from './license';
diff --git a/ee/app/license/server/license.js b/ee/app/license/server/license.ts
similarity index 61%
rename from ee/app/license/server/license.js
rename to ee/app/license/server/license.ts
index 77618e523224..845363bee97b 100644
--- a/ee/app/license/server/license.js
+++ b/ee/app/license/server/license.ts
@@ -1,30 +1,48 @@
-import EventEmiter from 'events';
+import EventEmitter from 'events';
 
 import { Users } from '../../../../app/models/server';
 import decrypt from './decrypt';
 import { getBundleModules, isBundle } from './bundles';
 
-const EnterpriseLicenses = new EventEmiter();
+const EnterpriseLicenses = new EventEmitter();
 
-const License = {
-	url: null,
-	licenses: [],
-	modules: {},
+export interface IModules {
+	[key: string]: number;
+}
+
+export interface ILicense {
+	url: string;
+	expiry: string;
+	maxActiveUsers: number;
+	modules: string[];
+}
+
+export interface IValidLicense {
+	valid?: boolean;
+	license: ILicense;
+}
+
+class LicenseClass {
+	private url: string|null = null;
+
+	private licenses: IValidLicense[] = [];
 
-	_validateExpiration(expiration) {
+	private modules: IModules = {};
+
+	_validateExpiration(expiration: string): boolean {
 		return new Date() > new Date(expiration);
-	},
+	}
 
-	_validateURL(licenseURL, url) {
+	_validateURL(licenseURL: string, url: string): boolean {
 		licenseURL = licenseURL
 			.replace(/\./g, '\\.') // convert dots to literal
 			.replace(/\*/g, '.*'); // convert * to .*
 		const regex = new RegExp(`^${ licenseURL }$`, 'i');
 
-		return regex.exec(url);
-	},
+		return !!regex.exec(url);
+	}
 
-	_validModules(licenseModules) {
+	_validModules(licenseModules: string[]): void {
 		licenseModules.forEach((licenseModule) => {
 			const modules = isBundle(licenseModule)
 				? getBundleModules(licenseModule)
@@ -35,9 +53,9 @@ const License = {
 				EnterpriseLicenses.emit(`valid:${ module }`);
 			});
 		});
-	},
+	}
 
-	_invalidModules(licenseModules) {
+	_invalidModules(licenseModules: string[]): void {
 		licenseModules.forEach((licenseModule) => {
 			const modules = isBundle(licenseModule)
 				? getBundleModules(licenseModule)
@@ -45,32 +63,32 @@ const License = {
 
 			modules.forEach((module) => EnterpriseLicenses.emit(`invalid:${ module }`));
 		});
-	},
+	}
 
-	_hasValidNumberOfActiveUsers(maxActiveUsers) {
+	_hasValidNumberOfActiveUsers(maxActiveUsers: number): boolean {
 		return Users.getActiveLocalUserCount() <= maxActiveUsers;
-	},
+	}
 
-	addLicense(license) {
+	addLicense(license: ILicense): void {
 		this.licenses.push({
-			valid: null,
+			valid: undefined,
 			license,
 		});
 
 		this.validate();
-	},
+	}
 
-	hasModule(module) {
+	hasModule(module: string): boolean {
 		return typeof this.modules[module] !== 'undefined';
-	},
+	}
 
-	setURL(url) {
+	setURL(url: string): void {
 		this.url = url.replace(/\/$/, '').replace(/^https?:\/\/(.*)$/, '$1');
 
 		this.validate();
-	},
+	}
 
-	validate() {
+	validate(): void {
 		this.licenses = this.licenses.map((item) => {
 			const { license } = item;
 
@@ -79,20 +97,20 @@ const License = {
 					return item;
 				}
 				if (!this._validateURL(license.url, this.url)) {
-					license.valid = false;
+					item.valid = false;
 					this._invalidModules(license.modules);
 					return item;
 				}
 			}
 
 			if (license.expiry && this._validateExpiration(license.expiry)) {
-				license.valid = false;
+				item.valid = false;
 				this._invalidModules(license.modules);
 				return item;
 			}
 
-			if (license.maxActiveUsers && !this._hasValidNumberOfActiveUsers(parseInt(license.maxActiveUsers))) {
-				license.valid = false;
+			if (license.maxActiveUsers && !this._hasValidNumberOfActiveUsers(license.maxActiveUsers)) {
+				item.valid = false;
 				this._invalidModules(license.modules);
 				return item;
 			}
@@ -106,9 +124,9 @@ const License = {
 		});
 
 		this.showLicenses();
-	},
+	}
 
-	showLicenses() {
+	showLicenses(): void {
 		if (!process.env.LICENSE_DEBUG || process.env.LICENSE_DEBUG === 'false') {
 			return;
 		}
@@ -125,20 +143,22 @@ const License = {
 				console.log('        modules ->', license.modules.join(', '));
 				console.log('-------------------------');
 			});
-	},
-};
+	}
+}
+
+const License = new LicenseClass();
 
-export function addLicense(encryptedLicense) {
+export function addLicense(encryptedLicense: string): boolean {
 	if (!encryptedLicense || String(encryptedLicense).trim() === '') {
-		return;
+		return false;
 	}
 
-	console.log('### New Enteprise License');
+	console.log('### New Enterprise License');
 
 	try {
 		const decrypted = decrypt(encryptedLicense);
 		if (!decrypted) {
-			return;
+			return false;
 		}
 
 		if (process.env.LICENSE_DEBUG && process.env.LICENSE_DEBUG !== 'false') {
@@ -153,21 +173,39 @@ export function addLicense(encryptedLicense) {
 		if (process.env.LICENSE_DEBUG && process.env.LICENSE_DEBUG !== 'false') {
 			console.error('##### Invalid raw license ->', encryptedLicense, e);
 		}
+		return false;
 	}
 }
 
-export function setURL(url) {
+export function setURL(url: string): void {
 	License.setURL(url);
 }
 
-export function hasLicense(feature) {
+export function hasLicense(feature: string): boolean {
 	return License.hasModule(feature);
 }
 
-export function onLicense(feature, cb) {
+export function onLicense(feature: string, cb: (...args: any[]) => void): void {
 	if (hasLicense(feature)) {
 		return cb();
 	}
 
 	EnterpriseLicenses.once(`valid:${ feature }`, cb);
 }
+
+export interface IOverrideClassProperties {
+	[key: string]: (...args: any[]) => any;
+}
+
+type Class = { new(...args: any[]): any };
+
+export function overwriteClassOnLicense(license: string, original: Class, overwrite: IOverrideClassProperties): void {
+	onLicense(license, () => {
+		Object.entries(overwrite).forEach(([key, value]) => {
+			const originalFn = original.prototype[key];
+			original.prototype[key] = function(...args: any[]): any {
+				return value.call(this, originalFn, ...args);
+			};
+		});
+	});
+}
diff --git a/ee/app/license/server/methods.js b/ee/app/license/server/methods.ts
similarity index 56%
rename from ee/app/license/server/methods.js
rename to ee/app/license/server/methods.ts
index ed1e5eca4638..d7ae53ea6c88 100644
--- a/ee/app/license/server/methods.js
+++ b/ee/app/license/server/methods.ts
@@ -1,9 +1,12 @@
 import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
 
 import { hasLicense } from './license';
 
 Meteor.methods({
-	'license:hasLicense'(feature) {
+	'license:hasLicense'(feature: string) {
+		check(feature, String);
+
 		return hasLicense(feature);
 	},
 });
diff --git a/ee/app/livechat-enterprise/server/lib/units.js b/ee/app/livechat-enterprise/server/lib/units.js
index 27ce27a880ce..c06e24813d4e 100644
--- a/ee/app/livechat-enterprise/server/lib/units.js
+++ b/ee/app/livechat-enterprise/server/lib/units.js
@@ -11,5 +11,6 @@ export function getUnitsFromUser() {
 		return;
 	}
 
+	// TODO remove this Meteor.call as this is used undirectly by models
 	return Meteor.call('livechat:getUnitsFromUserRoles');
 }
diff --git a/ee/app/models/server/models/LivechatDepartment.js b/ee/app/models/server/models/LivechatDepartment.js
index 0cb7a9206a65..d54c0db5d65f 100644
--- a/ee/app/models/server/models/LivechatDepartment.js
+++ b/ee/app/models/server/models/LivechatDepartment.js
@@ -1,64 +1,41 @@
 import { LivechatDepartment } from '../../../../../app/models/server/models/LivechatDepartment';
 import { logger } from '../../../livechat-enterprise/server/lib/logger';
 import { addQueryRestrictionsToDepartmentsModel } from '../../../livechat-enterprise/server/lib/query.helper';
-import { onLicense } from '../../../license/server';
+import { overwriteClassOnLicense } from '../../../license/server';
 
-const _find = LivechatDepartment.prototype.find;
-const _findOne = LivechatDepartment.prototype.findOne;
-const _update = LivechatDepartment.prototype.update;
-const _remove = LivechatDepartment.prototype.remove;
-const _createOrUpdateDepartment = LivechatDepartment.prototype.createOrUpdateDepartment;
+const { find, findOne, update, remove } = LivechatDepartment.prototype;
 
-LivechatDepartment.prototype.unfilteredFind = function(...args) {
-	return _find.call(this, ...args);
+const applyRestrictions = (method) => function(originalFn, originalQuery, ...args) {
+	const query = addQueryRestrictionsToDepartmentsModel(originalQuery);
+	logger.queries.debug(() => `LivechatDepartment.${ method } - ${ JSON.stringify(query) }`);
+	return originalFn.call(this, query, ...args);
 };
 
-LivechatDepartment.prototype.unfilteredFindOne = function(...args) {
-	return _findOne.call(this, ...args);
-};
-
-LivechatDepartment.prototype.unfilteredUpdate = function(...args) {
-	return _update.call(this, ...args);
-};
-
-LivechatDepartment.prototype.unfilteredRemove = function(...args) {
-	return _remove.call(this, ...args);
-};
-
-onLicense('livechat-enterprise', () => {
-	LivechatDepartment.prototype.find = function(originalQuery, ...args) {
-		const query = addQueryRestrictionsToDepartmentsModel(originalQuery);
-		logger.queries.debug('LivechatDepartment.find', JSON.stringify(query));
-		return _find.call(this, query, ...args);
-	};
-
-	LivechatDepartment.prototype.findOne = function(originalQuery, ...args) {
-		const query = addQueryRestrictionsToDepartmentsModel(originalQuery);
-		logger.queries.debug('LivechatDepartment.findOne', JSON.stringify(query));
-		return _findOne.call(this, query, ...args);
-	};
-
-	LivechatDepartment.prototype.update = function(originalQuery, ...args) {
-		const query = addQueryRestrictionsToDepartmentsModel(originalQuery);
-		logger.queries.debug('LivechatDepartment.update', JSON.stringify(query));
-		return _update.call(this, query, ...args);
-	};
-
-	LivechatDepartment.prototype.remove = function(originalQuery, ...args) {
-		const query = addQueryRestrictionsToDepartmentsModel(originalQuery);
-		logger.queries.debug('LivechatDepartment.remove', JSON.stringify(query));
-		return _remove.call(this, query, ...args);
-	};
-
-	LivechatDepartment.prototype.createOrUpdateDepartment = function(...args) {
+overwriteClassOnLicense('livechat-enterprise', LivechatDepartment, {
+	find: applyRestrictions('find'),
+	findOne: applyRestrictions('findOne'),
+	update: applyRestrictions('update'),
+	remove: applyRestrictions('remove'),
+	unfilteredFind(originalFn, ...args) {
+		return find.apply(this, args);
+	},
+	unfilteredFindOne(originalFn, ...args) {
+		return findOne.apply(this, args);
+	},
+	unfilteredUpdate(originalFn, ...args) {
+		return update.apply(this, args);
+	},
+	unfilteredRemove(originalFn, ...args) {
+		return remove.apply(this, args);
+	},
+	createOrUpdateDepartment(originalFn, ...args) {
 		if (args.length > 2 && !args[1].type) {
 			args[1].type = 'd';
 		}
 
-		return _createOrUpdateDepartment.apply(this, args);
-	};
-
-	LivechatDepartment.prototype.removeParentAndAncestorById = function(parentId) {
+		return originalFn.apply(this, args);
+	},
+	removeParentAndAncestorById(originalFn, parentId) {
 		const query = {
 			parentId,
 		};
@@ -69,7 +46,7 @@ onLicense('livechat-enterprise', () => {
 		};
 
 		return this.update(query, update, { multi: true });
-	};
+	},
 });
 
 export default LivechatDepartment;
diff --git a/ee/app/models/server/models/LivechatRooms.js b/ee/app/models/server/models/LivechatRooms.js
index 005b68ee619b..8fa684baf4b6 100644
--- a/ee/app/models/server/models/LivechatRooms.js
+++ b/ee/app/models/server/models/LivechatRooms.js
@@ -1,42 +1,26 @@
 import { LivechatRooms } from '../../../../../app/models/server/models/LivechatRooms';
 import { logger } from '../../../livechat-enterprise/server/lib/logger';
 import { addQueryRestrictionsToRoomsModel } from '../../../livechat-enterprise/server/lib/query.helper';
+import { overwriteClassOnLicense } from '../../../license/server';
 
-const _find = LivechatRooms.prototype.find;
-const _findOne = LivechatRooms.prototype.findOne;
-const _update = LivechatRooms.prototype.update;
-const _remove = LivechatRooms.prototype.remove;
-
-LivechatRooms.prototype.find = function(originalQuery, ...args) {
-	const query = addQueryRestrictionsToRoomsModel(originalQuery);
-	logger.queries.debug('LivechatRooms.find', JSON.stringify(query));
-	return _find.call(this, query, ...args);
-};
-
-LivechatRooms.prototype.findOne = function(originalQuery, ...args) {
+const applyRestrictions = (method) => function(originalFn, originalQuery, ...args) {
 	const query = addQueryRestrictionsToRoomsModel(originalQuery);
-	logger.queries.debug('LivechatRooms.findOne', JSON.stringify(query));
-	return _findOne.call(this, query, ...args);
+	logger.queries.debug(() => `LivechatRooms.${ method } - ${ JSON.stringify(query) }`);
+	return originalFn.call(this, query, ...args);
 };
 
-LivechatRooms.prototype.update = function(originalQuery, ...args) {
-	const query = addQueryRestrictionsToRoomsModel(originalQuery);
-	logger.queries.debug('LivechatRooms.update', JSON.stringify(query));
-	return _update.call(this, query, ...args);
-};
-
-LivechatRooms.prototype.remove = function(originalQuery, ...args) {
-	const query = addQueryRestrictionsToRoomsModel(originalQuery);
-	logger.queries.debug('LivechatRooms.remove', JSON.stringify(query));
-	return _remove.call(this, query, ...args);
-};
-
-LivechatRooms.prototype.updateDepartmentAncestorsById = function(_id, departmentAncestors) {
-	const query = {
-		_id,
-	};
-	const update = departmentAncestors ? { $set: { departmentAncestors } } : { $unset: { departmentAncestors: 1 } };
-	return this.update(query, update);
-};
+overwriteClassOnLicense('livechat-enterprise', LivechatRooms, {
+	find: applyRestrictions('find'),
+	findOne: applyRestrictions('findOne'),
+	update: applyRestrictions('update'),
+	remove: applyRestrictions('remove'),
+	updateDepartmentAncestorsById(originalFn, _id, departmentAncestors) {
+		const query = {
+			_id,
+		};
+		const update = departmentAncestors ? { $set: { departmentAncestors } } : { $unset: { departmentAncestors: 1 } };
+		return this.update(query, update);
+	},
+});
 
 export default LivechatRooms;
diff --git a/ee/app/models/server/raw/LivechatDepartment.js b/ee/app/models/server/raw/LivechatDepartment.js
index 7e27673f92dc..54c565c40d08 100644
--- a/ee/app/models/server/raw/LivechatDepartment.js
+++ b/ee/app/models/server/raw/LivechatDepartment.js
@@ -1,32 +1,17 @@
 import { LivechatDepartmentRaw } from '../../../../../app/models/server/raw/LivechatDepartment';
 import { logger } from '../../../livechat-enterprise/server/lib/logger';
 import { addQueryRestrictionsToDepartmentsModel } from '../../../livechat-enterprise/server/lib/query.helper';
+import { overwriteClassOnLicense } from '../../../license/server';
 
-const _find = LivechatDepartmentRaw.prototype.find;
-const _findOne = LivechatDepartmentRaw.prototype.findOne;
-const _update = LivechatDepartmentRaw.prototype.update;
-const _remove = LivechatDepartmentRaw.prototype.remove;
-
-LivechatDepartmentRaw.prototype.find = function(originalQuery, ...args) {
+const applyRestrictions = (method) => function(originalFn, originalQuery, ...args) {
 	const query = addQueryRestrictionsToDepartmentsModel(originalQuery);
-	logger.queries.debug('LivechatDepartmentRaw.find', JSON.stringify(query));
-	return _find.call(this, query, ...args);
+	logger.queries.debug(() => `LivechatDepartmentRaw.${ method } - ${ JSON.stringify(query) }`);
+	return originalFn.call(this, query, ...args);
 };
 
-LivechatDepartmentRaw.prototype.findOne = function(originalQuery, ...args) {
-	const query = addQueryRestrictionsToDepartmentsModel(originalQuery);
-	logger.queries.debug('LivechatDepartmentRaw.findOne', JSON.stringify(query));
-	return _findOne.call(this, query, ...args);
-};
-
-LivechatDepartmentRaw.prototype.update = function(originalQuery, ...args) {
-	const query = addQueryRestrictionsToDepartmentsModel(originalQuery);
-	logger.queries.debug('LivechatDepartmentRaw.update', JSON.stringify(query));
-	return _update.call(this, query, ...args);
-};
-
-LivechatDepartmentRaw.prototype.remove = function(originalQuery, ...args) {
-	const query = addQueryRestrictionsToDepartmentsModel(originalQuery);
-	logger.queries.debug('LivechatDepartmentRaw.remove', JSON.stringify(query));
-	return _remove.call(this, query, ...args);
-};
+overwriteClassOnLicense('livechat-enterprise', LivechatDepartmentRaw, {
+	find: applyRestrictions('find'),
+	findOne: applyRestrictions('findOne'),
+	update: applyRestrictions('update'),
+	remove: applyRestrictions('remove'),
+});
diff --git a/ee/app/models/server/raw/LivechatRooms.js b/ee/app/models/server/raw/LivechatRooms.js
index 3b02434b450e..7bb8e1191e9e 100644
--- a/ee/app/models/server/raw/LivechatRooms.js
+++ b/ee/app/models/server/raw/LivechatRooms.js
@@ -1,32 +1,24 @@
 import { LivechatRoomsRaw } from '../../../../../app/models/server/raw/LivechatRooms';
 import { logger } from '../../../livechat-enterprise/server/lib/logger';
 import { addQueryRestrictionsToRoomsModel } from '../../../livechat-enterprise/server/lib/query.helper';
+import { overwriteClassOnLicense } from '../../../license/server';
 
-const _find = LivechatRoomsRaw.prototype.find;
-const _findOne = LivechatRoomsRaw.prototype.findOne;
-const _update = LivechatRoomsRaw.prototype.update;
-const _remove = LivechatRoomsRaw.prototype.remove;
-
-LivechatRoomsRaw.prototype.find = function(originalQuery, ...args) {
+const applyRestrictions = (method) => function(originalFn, originalQuery, ...args) {
 	const query = addQueryRestrictionsToRoomsModel(originalQuery);
-	logger.queries.debug('LivechatRoomsRaw.find', JSON.stringify(query));
-	return _find.call(this, query, ...args);
+	logger.queries.debug(() => `LivechatRoomsRaw.${ method } - ${ JSON.stringify(query) }`);
+	return originalFn.call(this, query, ...args);
 };
 
-LivechatRoomsRaw.prototype.findOne = function(originalQuery, ...args) {
-	const query = addQueryRestrictionsToRoomsModel(originalQuery);
-	logger.queries.debug('LivechatRoomsRaw.findOne', JSON.stringify(query));
-	return _findOne.call(this, query, ...args);
-};
-
-LivechatRoomsRaw.prototype.update = function(originalQuery, ...args) {
-	const query = addQueryRestrictionsToRoomsModel(originalQuery);
-	logger.queries.debug('LivechatRoomsRaw.update', JSON.stringify(query));
-	return _update.call(this, query, ...args);
-};
-
-LivechatRoomsRaw.prototype.remove = function(originalQuery, ...args) {
-	const query = addQueryRestrictionsToRoomsModel(originalQuery);
-	logger.queries.debug('LivechatRoomsRaw.remove', JSON.stringify(query));
-	return _remove.call(this, query, ...args);
-};
+overwriteClassOnLicense('livechat-enterprise', LivechatRoomsRaw, {
+	find: applyRestrictions('find'),
+	findOne: applyRestrictions('findOne'),
+	update: applyRestrictions('update'),
+	remove: applyRestrictions('remove'),
+	updateDepartmentAncestorsById(originalFn, _id, departmentAncestors) {
+		const query = {
+			_id,
+		};
+		const update = departmentAncestors ? { $set: { departmentAncestors } } : { $unset: { departmentAncestors: 1 } };
+		return this.update(query, update);
+	},
+});

From 98bd8c9cc17a0439c8fa7a82da57aaafe9adf174 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Sun, 29 Mar 2020 00:24:11 -0300
Subject: [PATCH 093/223] Bump version to 3.1.0-rc.2

---
 .docker/Dockerfile.rhel   |   2 +-
 .github/history.json      | 101 ++++++++++++++++++++++++++++++++++++++
 HISTORY.md                |  35 +++++++++++++
 app/utils/rocketchat.info |   2 +-
 package.json              |   2 +-
 5 files changed, 139 insertions(+), 3 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index db7f8b82184b..d745754463e2 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.1.0-rc.1
+ENV RC_VERSION 3.1.0-rc.2
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index f436ce550743..e9d5e2eb343b 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -41323,6 +41323,107 @@
           ]
         }
       ]
+    },
+    "3.1.0-rc.2": {
+      "node_version": "12.16.1",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "17061",
+          "title": "Regression: Overwrite model functions on EE only when license applied",
+          "userLogin": "sampaiodiego",
+          "milestone": "3.1.0",
+          "contributors": [
+            "sampaiodiego",
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "17036",
+          "title": "Regression: `users.setStatus` throwing an error if message is empty",
+          "userLogin": "MarcosSpessatto",
+          "milestone": "3.1.0",
+          "contributors": [
+            "MarcosSpessatto",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16346",
+          "title": "Regression: Omnichannel notification on new conversations displaying incorrect information",
+          "userLogin": "renatobecker",
+          "milestone": "3.1.0",
+          "contributors": [
+            "renatobecker",
+            "rodrigok",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "17058",
+          "title": "Fix: Notifications of Group DM were not showing the room name",
+          "userLogin": "rodrigok",
+          "milestone": "3.1.0",
+          "contributors": [
+            "rodrigok",
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "17059",
+          "title": "Fix: Last message of Group DMs not showing the sender",
+          "userLogin": "rodrigok",
+          "milestone": "3.1.0",
+          "contributors": [
+            "rodrigok",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "17056",
+          "title": "Regression: Invite links working for group DMs",
+          "userLogin": "rodrigok",
+          "milestone": "3.1.0",
+          "contributors": [
+            "rodrigok",
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "17060",
+          "title": "Regression: Do not refresh statistics when opening the info panel",
+          "userLogin": "rodrigok",
+          "milestone": "3.1.0",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "17057",
+          "title": "Regression: Fix removing user not removing his 1-on-1 DMs",
+          "userLogin": "sampaiodiego",
+          "milestone": "3.1.0",
+          "contributors": [
+            "sampaiodiego",
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "17048",
+          "title": "Regression: omnichannel manual queued sidebarlist",
+          "userLogin": "ggazzo",
+          "milestone": "3.1.0",
+          "contributors": [
+            "ggazzo",
+            "rodrigok"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/HISTORY.md b/HISTORY.md
index f6fb51cc4c84..c6d6ba155b57 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,6 +1,41 @@
 
 # 3.1.0 (Under Release Candidate Process)
 
+## 3.1.0-rc.2
+`2020-03-29  ·  9 🔍  ·  5 👩‍💻👨‍💻`
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Regression: Overwrite model functions on EE only when license applied ([#17061](https://github.com/RocketChat/Rocket.Chat/pull/17061))
+
+- Regression: `users.setStatus` throwing an error if message is empty ([#17036](https://github.com/RocketChat/Rocket.Chat/pull/17036))
+
+- Regression: Omnichannel notification on new conversations displaying incorrect information ([#16346](https://github.com/RocketChat/Rocket.Chat/pull/16346))
+
+- Fix: Notifications of Group DM were not showing the room name ([#17058](https://github.com/RocketChat/Rocket.Chat/pull/17058))
+
+- Fix: Last message of Group DMs not showing the sender ([#17059](https://github.com/RocketChat/Rocket.Chat/pull/17059))
+
+- Regression: Invite links working for group DMs ([#17056](https://github.com/RocketChat/Rocket.Chat/pull/17056))
+
+- Regression: Do not refresh statistics when opening the info panel ([#17060](https://github.com/RocketChat/Rocket.Chat/pull/17060))
+
+- Regression: Fix removing user not removing his 1-on-1 DMs ([#17057](https://github.com/RocketChat/Rocket.Chat/pull/17057))
+
+- Regression: omnichannel manual queued sidebarlist ([#17048](https://github.com/RocketChat/Rocket.Chat/pull/17048))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+- [@ggazzo](https://github.com/ggazzo)
+- [@renatobecker](https://github.com/renatobecker)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 ## 3.1.0-rc.1
 `2020-03-26  ·  2 🔍  ·  2 👩‍💻👨‍💻`
 
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index c96c3f78b851..ce1762217111 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.1.0-rc.1"
+	"version": "3.1.0-rc.2"
 }
diff --git a/package.json b/package.json
index 739da825bd08..10fef9ddd81a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.1.0-rc.1",
+	"version": "3.1.0-rc.2",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

From 8f6fdff36af6b5a4cf391962045359271022d655 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sun, 29 Mar 2020 17:02:01 -0300
Subject: [PATCH 094/223] [IMPROVE] Tab Bar actions reorder (#17072)

---
 .../client/lib/startup.js                     |  2 +-
 app/channel-settings/client/startup/tabBar.js |  2 +-
 app/discussion/client/tabBar.js               |  2 +-
 app/e2e/client/tabbar.js                      |  2 +-
 app/lib/client/defaultTabBars.js              | 37 +++++--------------
 app/livechat/client/ui.js                     |  2 +-
 app/mentions-flextab/client/tabBar.js         |  2 +-
 app/message-pin/client/tabBar.js              |  2 +-
 app/message-star/client/tabBar.js             |  2 +-
 app/otr/client/tabBar.js                      |  2 +-
 app/push-notifications/client/tabBar.js       |  2 +-
 app/threads/client/flextab/threadlist.js      |  2 +-
 app/ui-admin/client/rooms/adminRooms.js       |  2 +-
 app/ui-admin/client/users/adminUsers.js       | 16 --------
 app/ui-flextab/client/tabs/membersList.js     |  2 +-
 app/ui-master/public/icons.svg                |  9 +++++
 app/ui-master/public/icons/phone.svg          |  3 ++
 app/ui-utils/client/lib/TabBar.js             |  2 +-
 app/videobridge/client/tabBar.js              | 12 +++---
 packages/rocketchat-i18n/i18n/en.i18n.json    |  4 +-
 packages/rocketchat-i18n/i18n/pt-BR.i18n.json |  3 +-
 private/public/icons.svg                      | 11 +++++-
 22 files changed, 55 insertions(+), 68 deletions(-)
 create mode 100644 app/ui-master/public/icons/phone.svg

diff --git a/app/channel-settings-mail-messages/client/lib/startup.js b/app/channel-settings-mail-messages/client/lib/startup.js
index 60986fc628be..50d119741391 100644
--- a/app/channel-settings-mail-messages/client/lib/startup.js
+++ b/app/channel-settings-mail-messages/client/lib/startup.js
@@ -12,7 +12,7 @@ Meteor.startup(() => {
 		i18nTitle: 'Mail_Messages',
 		icon: 'mail',
 		template: 'mailMessagesInstructions',
-		order: 10,
+		order: 12,
 		condition: () => hasAllPermission('mail-messages'),
 	});
 
diff --git a/app/channel-settings/client/startup/tabBar.js b/app/channel-settings/client/startup/tabBar.js
index 2a3d794c4046..2ef4c61a1d4f 100644
--- a/app/channel-settings/client/startup/tabBar.js
+++ b/app/channel-settings/client/startup/tabBar.js
@@ -10,6 +10,6 @@ Meteor.startup(() => {
 		i18nTitle: 'Room_Info',
 		icon: 'info-circled',
 		template: 'channelSettings',
-		order: 1,
+		order: 7,
 	});
 });
diff --git a/app/discussion/client/tabBar.js b/app/discussion/client/tabBar.js
index e10e1143eeb5..661c9a8ddebf 100644
--- a/app/discussion/client/tabBar.js
+++ b/app/discussion/client/tabBar.js
@@ -10,7 +10,7 @@ Meteor.startup(function() {
 		i18nTitle: 'Discussions',
 		icon: 'discussion',
 		template: 'discussionsTabbar',
-		order: 10,
+		order: 1,
 		condition: () => settings.get('Discussion_enabled'),
 	});
 });
diff --git a/app/e2e/client/tabbar.js b/app/e2e/client/tabbar.js
index 656285620096..4f7ef3cb0b8e 100644
--- a/app/e2e/client/tabbar.js
+++ b/app/e2e/client/tabbar.js
@@ -20,7 +20,7 @@ Meteor.startup(() => {
 					const room = ChatRoom.findOne(Session.get('openedRoom'));
 					call('saveRoomSettings', room._id, 'encrypted', !room.encrypted);
 				},
-				order: 10,
+				order: 13,
 				condition: () => hasAllPermission('edit-room', Session.get('openedRoom')),
 			});
 		} else {
diff --git a/app/lib/client/defaultTabBars.js b/app/lib/client/defaultTabBars.js
index 25938ee9db4c..31bb8f8a04b3 100644
--- a/app/lib/client/defaultTabBars.js
+++ b/app/lib/client/defaultTabBars.js
@@ -11,7 +11,7 @@ TabBar.addButton({
 	i18nTitle: 'Search_Messages',
 	icon: 'magnifier',
 	template: 'RocketSearch',
-	order: 2,
+	order: 4,
 });
 
 TabBar.addButton({
@@ -20,7 +20,7 @@ TabBar.addButton({
 	i18nTitle: 'User_Info',
 	icon: 'user',
 	template: 'membersList',
-	order: 2,
+	order: 5,
 	condition() {
 		const rid = Session.get('openedRoom');
 		const room = Rooms.findOne({
@@ -34,10 +34,10 @@ TabBar.addButton({
 TabBar.addButton({
 	groups: ['direct'],
 	id: 'user-info-group',
-	i18nTitle: 'Members_List',
+	i18nTitle: 'Members',
 	icon: 'team',
 	template: 'membersList',
-	order: 2,
+	order: 5,
 	condition() {
 		const rid = Session.get('openedRoom');
 		const room = Rooms.findOne({
@@ -51,10 +51,10 @@ TabBar.addButton({
 TabBar.addButton({
 	groups: ['channel', 'group'],
 	id: 'members-list',
-	i18nTitle: 'Members_List',
+	i18nTitle: 'Members',
 	icon: 'team',
 	template: 'membersList',
-	order: 2,
+	order: 5,
 	condition() {
 		const rid = Session.get('openedRoom');
 		const room = Rooms.findOne({
@@ -69,32 +69,13 @@ TabBar.addButton({
 	},
 });
 
-TabBar.addButton({
-	groups: ['channel', 'group'],
-	id: 'addUsers',
-	i18nTitle: 'Add_users',
-	icon: 'user-plus',
-	template: 'inviteUsers',
-	order: 2,
-});
-
-TabBar.addButton({
-	groups: ['channel', 'group'],
-	id: 'createInviteLink',
-	i18nTitle: 'Invite_Users',
-	icon: 'user-plus',
-	template: 'createInviteLink',
-	order: 2,
-});
-
-
 TabBar.addButton({
 	groups: ['channel', 'group', 'direct'],
 	id: 'uploaded-files-list',
-	i18nTitle: 'Room_uploaded_file_list',
+	i18nTitle: 'Files',
 	icon: 'clip',
 	template: 'uploadedFilesList',
-	order: 3,
+	order: 6,
 });
 
 TabBar.addButton({
@@ -103,5 +84,5 @@ TabBar.addButton({
 	i18nTitle: 'Keyboard_Shortcuts_Title',
 	icon: 'keyboard',
 	template: 'keyboardShortcuts',
-	order: 4,
+	order: 99,
 });
diff --git a/app/livechat/client/ui.js b/app/livechat/client/ui.js
index d1dd6f9212e0..3a4d3fb73f2b 100644
--- a/app/livechat/client/ui.js
+++ b/app/livechat/client/ui.js
@@ -34,7 +34,7 @@ TabBar.addButton({
 	groups: ['live'],
 	id: 'visitor-history',
 	i18nTitle: 'Past_Chats',
-	icon: 'chat',
+	icon: 'clock',
 	template: 'visitorHistory',
 	order: 11,
 });
diff --git a/app/mentions-flextab/client/tabBar.js b/app/mentions-flextab/client/tabBar.js
index afad4b9d86e2..2b2a219c6709 100644
--- a/app/mentions-flextab/client/tabBar.js
+++ b/app/mentions-flextab/client/tabBar.js
@@ -9,6 +9,6 @@ Meteor.startup(function() {
 		i18nTitle: 'Mentions',
 		icon: 'at',
 		template: 'mentionsFlexTab',
-		order: 3,
+		order: 9,
 	});
 });
diff --git a/app/message-pin/client/tabBar.js b/app/message-pin/client/tabBar.js
index 2830549a1fe0..b1fd452707df 100644
--- a/app/message-pin/client/tabBar.js
+++ b/app/message-pin/client/tabBar.js
@@ -13,7 +13,7 @@ Meteor.startup(function() {
 				i18nTitle: 'Pinned_Messages',
 				icon: 'pin',
 				template: 'pinnedMessages',
-				order: 10,
+				order: 11,
 			});
 		} else {
 			TabBar.removeButton('pinned-messages');
diff --git a/app/message-star/client/tabBar.js b/app/message-star/client/tabBar.js
index dbf6af6c4b89..cff05f61cc0a 100644
--- a/app/message-star/client/tabBar.js
+++ b/app/message-star/client/tabBar.js
@@ -9,6 +9,6 @@ Meteor.startup(function() {
 		i18nTitle: 'Starred_Messages',
 		icon: 'star',
 		template: 'starredMessages',
-		order: 3,
+		order: 10,
 	});
 });
diff --git a/app/otr/client/tabBar.js b/app/otr/client/tabBar.js
index 9df91860dd98..2d26df948327 100644
--- a/app/otr/client/tabBar.js
+++ b/app/otr/client/tabBar.js
@@ -16,7 +16,7 @@ Meteor.startup(function() {
 				i18nTitle: 'OTR',
 				icon: 'key',
 				template: 'otrFlexTab',
-				order: 11,
+				order: 13,
 			});
 		} else {
 			OTR.enabled.set(false);
diff --git a/app/push-notifications/client/tabBar.js b/app/push-notifications/client/tabBar.js
index ed742ddb6857..98c0edec0317 100644
--- a/app/push-notifications/client/tabBar.js
+++ b/app/push-notifications/client/tabBar.js
@@ -9,6 +9,6 @@ Meteor.startup(function() {
 		i18nTitle: 'Notifications_Preferences',
 		icon: 'bell',
 		template: 'pushNotificationsFlexTab',
-		order: 100,
+		order: 8,
 	});
 });
diff --git a/app/threads/client/flextab/threadlist.js b/app/threads/client/flextab/threadlist.js
index 64c0dc28d1a4..d639e25df042 100644
--- a/app/threads/client/flextab/threadlist.js
+++ b/app/threads/client/flextab/threadlist.js
@@ -17,6 +17,6 @@ Meteor.startup(function() {
 				return subscription.tunread && subscription.tunread.length && { body: subscription.tunread.length > 99 ? '99+' : subscription.tunread.length };
 			}
 		},
-		order: 0,
+		order: 2,
 	});
 });
diff --git a/app/ui-admin/client/rooms/adminRooms.js b/app/ui-admin/client/rooms/adminRooms.js
index 4a7133850330..96a7c4c562fd 100644
--- a/app/ui-admin/client/rooms/adminRooms.js
+++ b/app/ui-admin/client/rooms/adminRooms.js
@@ -100,7 +100,7 @@ Template.adminRooms.onCreated(function() {
 		i18nTitle: 'Room_Info',
 		icon: 'info-circled',
 		template: 'adminRoomInfo',
-		order: 1,
+		order: 7,
 	});
 	ChannelSettings.addOption({
 		group: ['admin-room'],
diff --git a/app/ui-admin/client/users/adminUsers.js b/app/ui-admin/client/users/adminUsers.js
index 6a656839bf48..090b27a2f627 100644
--- a/app/ui-admin/client/users/adminUsers.js
+++ b/app/ui-admin/client/users/adminUsers.js
@@ -75,22 +75,6 @@ Template.adminUsers.onCreated(function() {
 	this.tabBarData = new ReactiveVar();
 	this.users = new ReactiveVar([]);
 
-	TabBar.addButton({
-		groups: ['admin-users'],
-		id: 'invite-user',
-		i18nTitle: 'Invite_Users',
-		icon: 'send',
-		template: 'adminInviteUser',
-		order: 1,
-	});
-	TabBar.addButton({
-		groups: ['admin-users'],
-		id: 'add-user',
-		i18nTitle: 'Add_User',
-		icon: 'plus',
-		template: 'adminUserEdit',
-		order: 2,
-	});
 	TabBar.addButton({
 		groups: ['admin-users'],
 		id: 'admin-user-info',
diff --git a/app/ui-flextab/client/tabs/membersList.js b/app/ui-flextab/client/tabs/membersList.js
index 07f286909e79..ac77958a13c6 100644
--- a/app/ui-flextab/client/tabs/membersList.js
+++ b/app/ui-flextab/client/tabs/membersList.js
@@ -298,7 +298,7 @@ Template.membersList.onCreated(function() {
 	this.clearUserDetail = () => {
 		this.showDetail.set(false);
 		this.tabBar.setData({
-			label: 'Members_List',
+			label: 'Members',
 			icon: 'team',
 		});
 		setTimeout(() => this.clearRoomUserDetail(), 100);
diff --git a/app/ui-master/public/icons.svg b/app/ui-master/public/icons.svg
index 0d2fbfeae599..1895d7c09d23 100644
--- a/app/ui-master/public/icons.svg
+++ b/app/ui-master/public/icons.svg
@@ -158,6 +158,12 @@
 <symbol id="icon-google" viewBox="0 0 20 20" fill="currentColor">
   <path d="M18,10.1866641 C18,14.751996 14.8225871,17.999995 10.1310019,17.999995 C7.97379233,18.0023573 5.9042462,17.1602614 4.37886773,15.6594585 C2.85348926,14.1586555 1.99760413,12.1224521 2.00000504,9.99999752 C2.00000504,5.57422112 5.63275375,2 10.1310019,2 C12.3209504,2 14.1639764,2.79111087 15.583287,4.09333268 L13.369849,6.18666537 C10.4752141,3.43999955 5.09159074,5.50311003 5.09159074,9.99999752 C5.09159074,12.7911078 7.35742853,15.0515515 10.1310019,15.0515515 C13.3508767,15.0515515 14.557878,12.7804411 14.7476012,11.6026637 L10.1310019,11.6026637 L10.1310019,8.85244232 L17.8717109,8.85244232 C17.9476002,9.26221997 18,9.65599763 18,10.187553 L18,10.1866641 Z"/>
 </symbol>
+<symbol id="icon-group" viewBox="0 0 16 16" fill="currentColor">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M4.66669 0.666687C6.0474 0.666687 7.16669 1.78598 7.16669 3.16669C7.16669 4.5474 6.0474 5.66669 4.66669 5.66669C3.28598 5.66669 2.16669 4.5474 2.16669 3.16669C2.16669 1.78597 3.28598 0.666687 4.66669 0.666687ZM5.83336 3.16669C5.83336 2.52235 5.31102 2.00002 4.66669 2.00002C4.02236 2.00002 3.50002 2.52235 3.50002 3.16669C3.50002 3.81102 4.02236 4.33335 4.66669 4.33335C5.31102 4.33335 5.83336 3.81102 5.83336 3.16669Z"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M5.90093 6.27198C7.38054 5.96655 9.00002 7.0074 9.00002 8.6586V10.1111C9.00002 10.7862 8.45281 11.3334 7.7778 11.3334H1.55558C0.880562 11.3334 0.333353 10.7862 0.333353 10.1111V8.6586C0.333353 7.0074 1.95283 5.96655 3.43244 6.27198C3.88712 6.36583 4.3178 6.42504 4.66669 6.42504C5.01558 6.42504 5.44625 6.36583 5.90093 6.27198ZM7.66669 8.6586C7.66669 7.98969 6.96307 7.41417 6.17048 7.57778C5.67613 7.67982 5.14527 7.75837 4.66669 7.75837C4.1881 7.75837 3.65725 7.67982 3.1629 7.57778C2.37031 7.41417 1.66669 7.98969 1.66669 8.6586V10H7.66669V8.6586Z"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M12 3.33335C12 2.22878 11.1046 1.33335 10 1.33335C8.89545 1.33335 8.00002 2.22878 8.00002 3.33335C8.00002 4.43792 8.89545 5.33335 10 5.33335C11.1046 5.33335 12 4.43792 12 3.33335ZM10 2.66669C10.3682 2.66669 10.6667 2.96516 10.6667 3.33335C10.6667 3.70154 10.3682 4.00002 10 4.00002C9.63183 4.00002 9.33335 3.70154 9.33335 3.33335C9.33335 2.96516 9.63183 2.66669 10 2.66669Z"/>
+  <path d="M10.8376 7.22276C11.6565 7.10237 12.3334 7.68142 12.3334 8.33107V8.66669H9.70217C9.72965 9.11069 9.72307 9.56509 9.70856 10H12.4445C13.1195 10 13.6667 9.45281 13.6667 8.7778V8.33107C13.6667 6.69484 12.0864 5.69151 10.6437 5.9036C10.4039 5.93885 10.1852 5.95835 10 5.95835C9.81486 5.95835 9.59617 5.93885 9.35637 5.9036C9.02127 5.85434 8.67876 5.87065 8.35034 5.94523C8.90819 6.22492 9.24568 6.69464 9.44613 7.25916C9.6332 7.27941 9.82019 7.29169 10 7.29169C10.271 7.29169 10.5583 7.26381 10.8376 7.22276Z"/>
+</symbol>
 <symbol id="icon-hand-pointer" viewBox="0 0 20 20" fill="currentColor">
   <path d="M14.2417329,7.77795608 C15.5093053,7.17491936 17,8.11224385 17,9.55243827 L17,12.2376252 C16.9999974,12.3876984 16.9829142,12.537282 16.9490818,12.6834766 L16.0688149,16.4874882 C15.8640008,17.3726073 15.0812798,18 14.181334,18 L8.45952151,18 C7.83900313,18 7.25183819,17.6967378 6.88839688,17.1886932 L3.36773318,12.2658589 C2.74327173,11.3928142 2.93292113,10.1753167 3.79391704,9.53856332 C4.40742498,9.08489233 5.21048892,9.0412048 5.86092997,9.39713504 L5.86092997,3.95833333 C5.86092997,2.87862304 6.73022656,2 7.79932897,2 C8.86842603,2 9.73769716,2.87861762 9.73769716,3.95833333 L9.73769716,6.53666154 C10.4505838,6.35106463 11.214621,6.59062057 11.6995587,7.16957508 C12.5709429,6.67805728 13.6757773,6.94064257 14.2417329,7.77795608 Z M4.49699968,10.5017767 C4.1443559,10.7543267 4.0493934,11.1845078 4.32907285,11.5755621 L7.85010469,16.4983942 C7.99186119,16.6965482 8.21988702,16.8148148 8.45952151,16.8148148 L14.1813648,16.8148148 C14.5329833,16.8148148 14.8351112,16.5707105 14.9162919,16.2198863 L15.7966142,12.4158704 C15.8100939,12.3575472 15.8169342,12.2975819 15.8169342,12.2376543 L15.8169342,9.55246914 C15.8169342,9.09105778 15.4938898,8.7925649 15.0598857,8.76626347 C14.6386429,8.74073539 14.3108164,8.98424317 14.306354,9.38263365 C14.3061394,9.40674968 14.3061394,9.40674968 14.3060216,9.44382653 C14.305333,9.69494305 14.1019281,9.89814815 13.8512531,9.89814815 C13.5999044,9.89814815 13.3961461,9.69403007 13.3961461,9.44223765 L13.3961461,8.88117284 C13.3961461,8.40907017 13.0689999,8.11445155 12.6409098,8.11467205 C12.2128904,8.11489252 11.885572,8.40977866 11.885572,8.88117284 L11.885572,9.44226852 C11.885572,9.69404389 11.6818275,9.89814815 11.4304958,9.89814815 C11.1791641,9.89814815 10.9754195,9.69404389 10.9754195,9.44226852 L10.9754195,8.43364198 C10.9754195,7.96151327 10.6482777,7.66689751 10.2201859,7.66712962 C9.79216869,7.66736168 9.46484551,7.96225904 9.46484551,8.43364198 L9.46484551,9.44222222 C9.46484551,9.69402316 9.26108024,9.89814815 9.00972305,9.89814815 C8.75836585,9.89814815 8.55460058,9.69402316 8.55460058,9.44222222 L8.55460058,3.95833333 C8.55460058,3.48620418 8.22746511,3.19158887 7.79938233,3.19182097 C7.37137414,3.19205304 7.04405736,3.48694996 7.04405736,3.95833333 L7.04405736,11.442948 C7.04405736,11.6259358 6.92611473,11.7879886 6.75220282,11.8439554 C6.57829131,11.899922 6.38820335,11.8370024 6.28181408,11.6882553 L5.54786469,10.6620917 C5.28463659,10.2940918 4.84633607,10.2515955 4.49699968,10.5017767 Z M8.55456977,14.1181481 L8.55456977,12.147284 C8.55456977,11.895483 8.75833504,11.691358 9.00969224,11.691358 C9.26104943,11.691358 9.4648147,11.895483 9.4648147,12.147284 L9.4648147,14.1181481 C9.4648147,14.3699491 9.26104943,14.5740741 9.00969224,14.5740741 C8.75833504,14.5740741 8.55456977,14.3699491 8.55456977,14.1181481 Z M11.430465,11.691358 C11.6818137,11.691358 11.885572,11.8954761 11.885572,12.1472685 L11.885572,14.1181636 C11.885572,14.369956 11.6818137,14.5740741 11.430465,14.5740741 C11.1791163,14.5740741 10.9753579,14.369956 10.9753579,14.1181636 L10.9753579,12.1472685 C10.9753579,11.8954761 11.1791163,11.691358 11.430465,11.691358 Z M13.3961461,12.1472685 C13.3961461,11.8954761 13.5999044,11.691358 13.8512531,11.691358 C14.1026018,11.691358 14.3063602,11.8954761 14.3063602,12.1472685 L14.3063602,14.1181636 C14.3063602,14.369956 14.1026018,14.5740741 13.8512531,14.5740741 C13.5999044,14.5740741 13.3961461,14.369956 13.3961461,14.1181636 L13.3961461,12.1472685 Z"/>
 </symbol>
@@ -245,6 +251,9 @@
 <symbol id="icon-permalink" viewBox="0 0 20 20" fill="currentColor">
   <path d="M10.5615959,13.5369661 C10.8614377,13.8374425 10.8642543,14.3226796 10.5667497,14.6286503 L8.2685409,16.9268589 C6.83317877,18.3588624 4.50959891,18.358811 3.07396303,16.9265337 C1.64197242,15.4911845 1.64199806,13.1676046 3.07412553,11.7321184 L6.3626967,8.44354747 C7.79863297,7.01168291 10.1217674,7.01250144 11.5618962,8.44873652 C11.8468297,8.75455932 11.8385338,9.23106215 11.5431274,9.52678116 C11.2472876,9.822934 10.7707684,9.83088531 10.4601369,9.54190764 C9.63066742,8.7145592 8.28806314,8.71453851 7.45871412,9.54176665 L4.16967211,12.8290741 C3.34245707,13.6582293 3.34240935,15.0005376 4.16934691,15.8294155 C4.99851217,16.6566405 6.34082045,16.6566682 7.1698246,15.8296041 L9.46873792,13.5298236 L9.47196244,13.5276684 C9.77670104,13.2324779 10.2619266,13.2366626 10.5615959,13.5369661 Z M16.9259063,8.26862645 L13.6363953,11.5572701 C12.2008541,12.9887407 9.87772165,12.9887096 8.44201443,11.5570732 C8.24603309,11.3610918 8.16949366,11.0754428 8.24122781,10.8077273 C8.31296195,10.5400118 8.52207155,10.3309022 8.78978704,10.2591681 C9.05747794,10.1874405 9.34313357,10.2639554 9.53890328,10.4597255 C10.3685766,11.2866611 11.7108665,11.286692 12.5403595,10.4599364 L15.8294199,7.17174346 C16.6566349,6.34258823 16.6566826,5.00027994 15.8297451,4.1714021 C15.0005779,3.34417513 13.6582696,3.34415128 12.8292412,4.17123959 L10.5304013,6.47007948 C10.3344462,6.66624196 10.0487247,6.74296275 9.78086551,6.67134189 C9.51300628,6.59972102 9.30370342,6.39063941 9.2317993,6.12285608 C9.1598923,5.85506205 9.23632156,5.56926251 9.43236841,5.37300829 L11.7322854,3.07395864 C13.1676218,1.64198086 15.4912017,1.64198086 16.9267356,3.07415623 C18.3580432,4.51021576 18.3577428,6.83343179 16.9259063,8.26862645 Z"/>
 </symbol>
+<symbol id="icon-phone" viewBox="0 0 24 24" fill="currentColor">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M19.6778 13.8315C20.373 14.1727 20.9373 14.9646 20.7506 15.9018C20.5593 16.8626 20.0759 18.1027 19.2595 19.0146C18.8437 19.4791 18.3082 19.895 17.6434 20.1102C16.9615 20.331 16.2147 20.3169 15.4442 20.0268C14.014 19.4884 12.4994 18.5009 11.2677 17.5778C10.2959 16.8494 9.45427 16.1261 8.90869 15.6204L8.88839 15.6163C8.83438 15.5623 8.77441 15.5009 8.70915 15.4327C8.64104 15.3676 8.57975 15.3077 8.5258 15.2537L8.52167 15.2334C8.01604 14.6879 7.2927 13.8463 6.56436 12.8745C5.64119 11.6427 4.65368 10.1281 4.1153 8.69791C3.82525 7.9274 3.81115 7.18059 4.0319 6.49877C4.24715 5.83394 4.66305 5.29839 5.12746 4.88265C6.03944 4.06626 7.27955 3.58283 8.24029 3.39149C9.17751 3.20484 9.96945 3.76911 10.3106 4.4643L11.6384 7.17003C12.0333 7.97481 11.8306 8.84495 11.397 9.43317C11.2857 9.58409 11.1964 9.72824 11.1403 9.84855C11.1279 9.87508 11.1183 9.89793 11.111 9.91715C11.1242 9.94287 11.1425 9.97648 11.1676 10.0186C11.2644 10.1811 11.4104 10.3851 11.5918 10.6133C11.7701 10.8375 12.1442 11.2426 12.5119 11.63C12.8994 11.9978 13.3046 12.372 13.5289 12.5503C13.757 12.7317 13.961 12.8777 14.1236 12.9745C14.1656 12.9996 14.1992 13.0179 14.225 13.0311C14.2442 13.0238 14.267 13.0142 14.2936 13.0018C14.4139 12.9457 14.558 12.8564 14.7089 12.7452C15.2972 12.3115 16.1673 12.1088 16.9721 12.5037L19.6778 13.8315ZM11.0598 13.082C11.1237 13.1482 11.184 13.2095 11.2396 13.2651L11.2766 13.2882C11.5674 13.5602 11.9153 13.8685 12.2643 14.146C12.5284 14.356 12.8132 14.5646 13.0872 14.7279C13.316 14.8643 13.699 15.0712 14.1144 15.0917C14.5292 15.1121 14.9043 14.9785 15.1693 14.8548C15.4507 14.7235 15.7129 14.5531 15.9297 14.3932C15.9769 14.3584 16.0235 14.3423 16.0554 14.3379C16.072 14.3356 16.0807 14.3367 16.0839 14.3374L18.7159 15.629C18.5566 16.3138 18.2095 17.1121 17.7323 17.6452C17.4846 17.9219 17.2363 18.0892 17.0006 18.1656C16.7818 18.2364 16.5113 18.2504 16.1514 18.115C14.996 17.68 13.667 16.8316 12.4853 15.9458C11.767 15.4075 10.8577 14.6035 10.1709 13.9711C9.5385 13.2843 8.73461 12.3751 8.19626 11.6568C7.31055 10.4751 6.46209 9.14607 6.02716 7.99067C5.89169 7.63082 5.90572 7.36031 5.97655 7.14154C6.05288 6.90578 6.22021 6.6575 6.49686 6.40984C7.03 5.93259 7.82826 5.5855 8.51313 5.42624L9.80469 8.0582C9.80541 8.06141 9.80651 8.07016 9.80421 8.08672C9.79979 8.11858 9.78369 8.16521 9.7489 8.21238C9.589 8.42926 9.41864 8.69138 9.28728 8.97284C9.16361 9.23784 9.02998 9.61292 9.05042 10.0277C9.0709 10.4431 9.27781 10.8261 9.41422 11.055C9.5775 11.3289 9.78609 11.6137 9.99607 11.8778C10.2736 12.2268 10.582 12.5748 10.854 12.8656L10.877 12.9025C10.9325 12.958 10.9938 13.0182 11.0598 13.082Z"/>
+</symbol>
 <symbol id="icon-pin" viewBox="0 0 20 20" fill="currentColor">
   <path d="M9.42996785,12.4576456 L5.03820001,8.06485857 L4.39915651,8.70390207 C4.25850578,8.84455279 4.0719907,8.92201261 3.87324511,8.92201261 C3.87324511,8.92201261 3.87324511,8.92201261 3.87324511,8.92201261 L3.87324511,8.92201261 C3.66536587,8.92201261 3.49356029,8.75988807 3.48151707,8.55235798 C3.48107838,8.54448527 3.48084998,8.53690545 3.48084998,8.52961748 C3.48084998,8.3318911 3.5583098,8.14843364 3.69386448,8.01084054 L8.01123013,3.6944941 C8.01123013,3.6944941 8.01123013,3.6944941 8.01123013,3.6944941 L8.01123013,3.6944941 C8.20290792,3.50281631 8.51367902,3.50281631 8.70535681,3.6944941 C8.8381036,3.82724089 8.88350188,4.02407983 8.82230421,4.20155733 C8.79466754,4.2817736 8.75532304,4.34750772 8.70429166,4.39876692 L8.06524816,5.03781042 L12.079909,9.05349046 L12.4559968,9.42040539 L12.9289094,9.19516039 C12.9851657,9.1686868 13.9802154,8.7124366 15.2534176,9.2114661 C15.3954837,9.26714868 15.5951631,9.37268051 15.852456,9.52806158 L15.8524016,9.52815155 C15.9941809,9.61377314 16.0397057,9.79811799 15.9540842,9.9398973 C15.9415573,9.96064036 15.9265625,9.97978868 15.9094277,9.99692341 L9.99822269,15.9082807 C9.88102335,16.0254801 9.69100569,16.0254801 9.57380635,15.9082807 C9.55648297,15.8909573 9.541346,15.8715779 9.52873335,15.850575 C9.36528629,15.5783991 9.25525114,15.3678629 9.19862793,15.2189665 C8.72086328,13.9626361 9.16871596,12.9864865 9.19249235,12.9356542 L9.42996785,12.4576456 Z M17.7833977,9.1706994 C15.7714808,7.15674413 13.730007,7.4033925 12.7943739,7.67348265 L10.1057028,4.9848116 C10.5154245,4.27340432 10.5001364,3.38465483 10.0618769,2.68853568 L9.71534612,2.34200491 C8.85513446,1.79978619 7.7075061,1.90272621 6.96246496,2.64776735 L2.64713773,6.96411379 C1.90209658,7.70915494 1.80017577,8.85882171 2.3423945,9.71495654 L2.68790605,10.0614873 C3.38606362,10.500766 4.27583232,10.5150349 4.98418197,10.1063325 L7.67387224,12.7960227 C7.40378208,13.7296174 7.15713371,15.7700721 9.17108898,17.7840273 L9.17108898,17.7840273 C9.45957211,18.0730728 9.92775155,18.0735287 10.216797,17.7850455 C10.2169669,17.784876 10.2171367,17.7847064 10.2173064,17.7845367 L13.4772433,14.5245997 L16.4454322,17.4927885 C16.7346597,17.7820161 17.2035551,17.7821302 17.4929234,17.4930434 L17.4929234,17.4930434 C17.7821097,17.2041384 17.7823377,16.7355028 17.4934327,16.4463165 C17.4933479,16.4462316 17.493263,16.4461467 17.4931781,16.4460618 L14.5239701,13.4768538 L17.7834681,10.2164774 C18.0722048,9.92766292 18.0721733,9.45947495 17.7833977,9.1706994 Z"/>
 </symbol>
diff --git a/app/ui-master/public/icons/phone.svg b/app/ui-master/public/icons/phone.svg
new file mode 100644
index 000000000000..b970b8bec4f6
--- /dev/null
+++ b/app/ui-master/public/icons/phone.svg
@@ -0,0 +1,3 @@
+<svg id="phone" viewBox="0 0 24 24">
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M19.6778 13.8315C20.373 14.1727 20.9373 14.9646 20.7506 15.9018C20.5593 16.8626 20.0759 18.1027 19.2595 19.0146C18.8437 19.4791 18.3082 19.895 17.6434 20.1102C16.9615 20.331 16.2147 20.3169 15.4442 20.0268C14.014 19.4884 12.4994 18.5009 11.2677 17.5778C10.2959 16.8494 9.45427 16.1261 8.90869 15.6204L8.88839 15.6163C8.83438 15.5623 8.77441 15.5009 8.70915 15.4327C8.64104 15.3676 8.57975 15.3077 8.5258 15.2537L8.52167 15.2334C8.01604 14.6879 7.2927 13.8463 6.56436 12.8745C5.64119 11.6427 4.65368 10.1281 4.1153 8.69791C3.82525 7.9274 3.81115 7.18059 4.0319 6.49877C4.24715 5.83394 4.66305 5.29839 5.12746 4.88265C6.03944 4.06626 7.27955 3.58283 8.24029 3.39149C9.17751 3.20484 9.96945 3.76911 10.3106 4.4643L11.6384 7.17003C12.0333 7.97481 11.8306 8.84495 11.397 9.43317C11.2857 9.58409 11.1964 9.72824 11.1403 9.84855C11.1279 9.87508 11.1183 9.89793 11.111 9.91715C11.1242 9.94287 11.1425 9.97648 11.1676 10.0186C11.2644 10.1811 11.4104 10.3851 11.5918 10.6133C11.7701 10.8375 12.1442 11.2426 12.5119 11.63C12.8994 11.9978 13.3046 12.372 13.5289 12.5503C13.757 12.7317 13.961 12.8777 14.1236 12.9745C14.1656 12.9996 14.1992 13.0179 14.225 13.0311C14.2442 13.0238 14.267 13.0142 14.2936 13.0018C14.4139 12.9457 14.558 12.8564 14.7089 12.7452C15.2972 12.3115 16.1673 12.1088 16.9721 12.5037L19.6778 13.8315ZM11.0598 13.082C11.1237 13.1482 11.184 13.2095 11.2396 13.2651L11.2766 13.2882C11.5674 13.5602 11.9153 13.8685 12.2643 14.146C12.5284 14.356 12.8132 14.5646 13.0872 14.7279C13.316 14.8643 13.699 15.0712 14.1144 15.0917C14.5292 15.1121 14.9043 14.9785 15.1693 14.8548C15.4507 14.7235 15.7129 14.5531 15.9297 14.3932C15.9769 14.3584 16.0235 14.3423 16.0554 14.3379C16.072 14.3356 16.0807 14.3367 16.0839 14.3374L18.7159 15.629C18.5566 16.3138 18.2095 17.1121 17.7323 17.6452C17.4846 17.9219 17.2363 18.0892 17.0006 18.1656C16.7818 18.2364 16.5113 18.2504 16.1514 18.115C14.996 17.68 13.667 16.8316 12.4853 15.9458C11.767 15.4075 10.8577 14.6035 10.1709 13.9711C9.5385 13.2843 8.73461 12.3751 8.19626 11.6568C7.31055 10.4751 6.46209 9.14607 6.02716 7.99067C5.89169 7.63082 5.90572 7.36031 5.97655 7.14154C6.05288 6.90578 6.22021 6.6575 6.49686 6.40984C7.03 5.93259 7.82826 5.5855 8.51313 5.42624L9.80469 8.0582C9.80541 8.06141 9.80651 8.07016 9.80421 8.08672C9.79979 8.11858 9.78369 8.16521 9.7489 8.21238C9.589 8.42926 9.41864 8.69138 9.28728 8.97284C9.16361 9.23784 9.02998 9.61292 9.05042 10.0277C9.0709 10.4431 9.27781 10.8261 9.41422 11.055C9.5775 11.3289 9.78609 11.6137 9.99607 11.8778C10.2736 12.2268 10.582 12.5748 10.854 12.8656L10.877 12.9025C10.9325 12.958 10.9938 13.0182 11.0598 13.082Z"/>
+</svg>
diff --git a/app/ui-utils/client/lib/TabBar.js b/app/ui-utils/client/lib/TabBar.js
index 15568d7be4e9..5117af3ad6b1 100644
--- a/app/ui-utils/client/lib/TabBar.js
+++ b/app/ui-utils/client/lib/TabBar.js
@@ -2,7 +2,7 @@ import _ from 'underscore';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
 
-export const TABBAR_DEFAULT_VISIBLE_ICON_COUNT = 4;
+export const TABBAR_DEFAULT_VISIBLE_ICON_COUNT = 6;
 
 export const TabBar = new class TabBar {
 	get size() {
diff --git a/app/videobridge/client/tabBar.js b/app/videobridge/client/tabBar.js
index a6617d8b8a58..99f9ef9f75ed 100644
--- a/app/videobridge/client/tabBar.js
+++ b/app/videobridge/client/tabBar.js
@@ -28,12 +28,12 @@ Meteor.startup(function() {
 		TabBar.addButton({
 			groups,
 			id: 'bbb_video',
-			i18nTitle: 'BBB Video Chat',
-			icon: 'video',
+			i18nTitle: 'BBB Video Call',
+			icon: 'phone',
 			iconColor: 'red',
 			template: 'videoFlexTabBbb',
 			width: 600,
-			order: live ? -1 : 15,
+			order: live ? -1 : 0,
 			class: () => live && 'live',
 		});
 	});
@@ -43,12 +43,12 @@ Meteor.startup(function() {
 			TabBar.addButton({
 				groups: ['direct', 'group'],
 				id: 'video',
-				i18nTitle: 'Video Chat',
-				icon: 'video',
+				i18nTitle: 'Call',
+				icon: 'phone',
 				iconColor: 'red',
 				template: 'videoFlexTab',
 				width: 600,
-				order: 12,
+				order: 0,
 			});
 		} else {
 			TabBar.removeButton('video');
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 110f01e9b262..48460e2dab0f 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -575,6 +575,7 @@
   "CAS_trust_username_description": "When enabled, Rocket.Chat will trust that any username from CAS belongs to the same user on Rocket.Chat.<br/>This may be needed if an user is renamed on CAS, but may also allow people to take control of Rocket.Chat accounts by renaming their own CAS users.",
   "CAS_version": "CAS Version",
   "CAS_version_Description": "Only use a supported CAS version supported by your CAS SSO service.",
+  "Call": "Call",
   "Categories": "Categories",
   "CDN_PREFIX": "CDN Prefix",
   "CDN_PREFIX_ALL": "Use CDN Prefix for all assets",
@@ -2258,7 +2259,7 @@
   "Maximum": "Maximum",
   "Media": "Media",
   "Medium": "Medium",
-  "Members_List": "Members List",
+  "Members": "Members",
   "mention-all": "Mention All",
   "mention-all_description": "Permission to use the @all mention",
   "mention-here": "Mention Here",
@@ -2879,7 +2880,6 @@
   "Room_type_changed_successfully": "Room type changed successfully",
   "Room_type_of_default_rooms_cant_be_changed": "This is a default room and the type can not be changed, please consult with your administrator.",
   "Room_unarchived": "Room unarchived",
-  "Room_uploaded_file_list": "Files List",
   "Room_uploaded_file_list_empty": "No files available.",
   "Rooms": "Rooms",
   "Routing": "Routing",
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index bc6301c49fc0..6381e33e89d4 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -526,6 +526,7 @@
   "CAS_Sync_User_Data_FieldMap_Description": "Use esta entrada JSON para criar atributos internos (chave) de atributos externos (valor). Os nomes de atributo externos incluídos com '%' serão interpolados em cadeias de valores.<br/>Exemplo, `{\"email\":\"%email%\", \"nome\":\"%firstname%, %lastname%\"}`<br/><br/>O mapa de atributos sempre é interpolado. No CAS 1.0, apenas o atributo `username` está disponível. Os atributos internos disponíveis são: nome de usuário, nome, email, salas; as salas são uma lista de salas separadas por vírgulas às quais o usuário será automaticamente incluso ao se registrar na plataforma, por exemplo: {\"rooms\": \"% team%,%department%\"} acompanhariam os usuários do CAS ao criar sua conta seu time e departamento.",
   "CAS_version": "Versão CAS",
   "CAS_version_Description": "Use apenas uma versão suportada do CAS suportada pelo seu serviço CAS SSO.",
+  "Call": "Ligação",
   "Categories": "Categorias",
   "CDN_PREFIX": "Prefixo CDN",
   "CDN_PREFIX_ALL": "Use o prefixo da CDN para todos os recursos",
@@ -2036,7 +2037,7 @@
   "Max_number_of_uses": "Número máximo de usos",
   "Media": "meios de comunicação",
   "Medium": "Médio",
-  "Members_List": "Lista de Membros",
+  "Members": "Membros",
   "mention-all": "Mencionar tudo",
   "mention-all_description": "Permissão para usar a menção @all",
   "mention-here": "Mencionar aqui",
diff --git a/private/public/icons.svg b/private/public/icons.svg
index aacb59953fa6..1895d7c09d23 100644
--- a/private/public/icons.svg
+++ b/private/public/icons.svg
@@ -158,6 +158,12 @@
 <symbol id="icon-google" viewBox="0 0 20 20" fill="currentColor">
   <path d="M18,10.1866641 C18,14.751996 14.8225871,17.999995 10.1310019,17.999995 C7.97379233,18.0023573 5.9042462,17.1602614 4.37886773,15.6594585 C2.85348926,14.1586555 1.99760413,12.1224521 2.00000504,9.99999752 C2.00000504,5.57422112 5.63275375,2 10.1310019,2 C12.3209504,2 14.1639764,2.79111087 15.583287,4.09333268 L13.369849,6.18666537 C10.4752141,3.43999955 5.09159074,5.50311003 5.09159074,9.99999752 C5.09159074,12.7911078 7.35742853,15.0515515 10.1310019,15.0515515 C13.3508767,15.0515515 14.557878,12.7804411 14.7476012,11.6026637 L10.1310019,11.6026637 L10.1310019,8.85244232 L17.8717109,8.85244232 C17.9476002,9.26221997 18,9.65599763 18,10.187553 L18,10.1866641 Z"/>
 </symbol>
+<symbol id="icon-group" viewBox="0 0 16 16" fill="currentColor">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M4.66669 0.666687C6.0474 0.666687 7.16669 1.78598 7.16669 3.16669C7.16669 4.5474 6.0474 5.66669 4.66669 5.66669C3.28598 5.66669 2.16669 4.5474 2.16669 3.16669C2.16669 1.78597 3.28598 0.666687 4.66669 0.666687ZM5.83336 3.16669C5.83336 2.52235 5.31102 2.00002 4.66669 2.00002C4.02236 2.00002 3.50002 2.52235 3.50002 3.16669C3.50002 3.81102 4.02236 4.33335 4.66669 4.33335C5.31102 4.33335 5.83336 3.81102 5.83336 3.16669Z"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M5.90093 6.27198C7.38054 5.96655 9.00002 7.0074 9.00002 8.6586V10.1111C9.00002 10.7862 8.45281 11.3334 7.7778 11.3334H1.55558C0.880562 11.3334 0.333353 10.7862 0.333353 10.1111V8.6586C0.333353 7.0074 1.95283 5.96655 3.43244 6.27198C3.88712 6.36583 4.3178 6.42504 4.66669 6.42504C5.01558 6.42504 5.44625 6.36583 5.90093 6.27198ZM7.66669 8.6586C7.66669 7.98969 6.96307 7.41417 6.17048 7.57778C5.67613 7.67982 5.14527 7.75837 4.66669 7.75837C4.1881 7.75837 3.65725 7.67982 3.1629 7.57778C2.37031 7.41417 1.66669 7.98969 1.66669 8.6586V10H7.66669V8.6586Z"/>
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M12 3.33335C12 2.22878 11.1046 1.33335 10 1.33335C8.89545 1.33335 8.00002 2.22878 8.00002 3.33335C8.00002 4.43792 8.89545 5.33335 10 5.33335C11.1046 5.33335 12 4.43792 12 3.33335ZM10 2.66669C10.3682 2.66669 10.6667 2.96516 10.6667 3.33335C10.6667 3.70154 10.3682 4.00002 10 4.00002C9.63183 4.00002 9.33335 3.70154 9.33335 3.33335C9.33335 2.96516 9.63183 2.66669 10 2.66669Z"/>
+  <path d="M10.8376 7.22276C11.6565 7.10237 12.3334 7.68142 12.3334 8.33107V8.66669H9.70217C9.72965 9.11069 9.72307 9.56509 9.70856 10H12.4445C13.1195 10 13.6667 9.45281 13.6667 8.7778V8.33107C13.6667 6.69484 12.0864 5.69151 10.6437 5.9036C10.4039 5.93885 10.1852 5.95835 10 5.95835C9.81486 5.95835 9.59617 5.93885 9.35637 5.9036C9.02127 5.85434 8.67876 5.87065 8.35034 5.94523C8.90819 6.22492 9.24568 6.69464 9.44613 7.25916C9.6332 7.27941 9.82019 7.29169 10 7.29169C10.271 7.29169 10.5583 7.26381 10.8376 7.22276Z"/>
+</symbol>
 <symbol id="icon-hand-pointer" viewBox="0 0 20 20" fill="currentColor">
   <path d="M14.2417329,7.77795608 C15.5093053,7.17491936 17,8.11224385 17,9.55243827 L17,12.2376252 C16.9999974,12.3876984 16.9829142,12.537282 16.9490818,12.6834766 L16.0688149,16.4874882 C15.8640008,17.3726073 15.0812798,18 14.181334,18 L8.45952151,18 C7.83900313,18 7.25183819,17.6967378 6.88839688,17.1886932 L3.36773318,12.2658589 C2.74327173,11.3928142 2.93292113,10.1753167 3.79391704,9.53856332 C4.40742498,9.08489233 5.21048892,9.0412048 5.86092997,9.39713504 L5.86092997,3.95833333 C5.86092997,2.87862304 6.73022656,2 7.79932897,2 C8.86842603,2 9.73769716,2.87861762 9.73769716,3.95833333 L9.73769716,6.53666154 C10.4505838,6.35106463 11.214621,6.59062057 11.6995587,7.16957508 C12.5709429,6.67805728 13.6757773,6.94064257 14.2417329,7.77795608 Z M4.49699968,10.5017767 C4.1443559,10.7543267 4.0493934,11.1845078 4.32907285,11.5755621 L7.85010469,16.4983942 C7.99186119,16.6965482 8.21988702,16.8148148 8.45952151,16.8148148 L14.1813648,16.8148148 C14.5329833,16.8148148 14.8351112,16.5707105 14.9162919,16.2198863 L15.7966142,12.4158704 C15.8100939,12.3575472 15.8169342,12.2975819 15.8169342,12.2376543 L15.8169342,9.55246914 C15.8169342,9.09105778 15.4938898,8.7925649 15.0598857,8.76626347 C14.6386429,8.74073539 14.3108164,8.98424317 14.306354,9.38263365 C14.3061394,9.40674968 14.3061394,9.40674968 14.3060216,9.44382653 C14.305333,9.69494305 14.1019281,9.89814815 13.8512531,9.89814815 C13.5999044,9.89814815 13.3961461,9.69403007 13.3961461,9.44223765 L13.3961461,8.88117284 C13.3961461,8.40907017 13.0689999,8.11445155 12.6409098,8.11467205 C12.2128904,8.11489252 11.885572,8.40977866 11.885572,8.88117284 L11.885572,9.44226852 C11.885572,9.69404389 11.6818275,9.89814815 11.4304958,9.89814815 C11.1791641,9.89814815 10.9754195,9.69404389 10.9754195,9.44226852 L10.9754195,8.43364198 C10.9754195,7.96151327 10.6482777,7.66689751 10.2201859,7.66712962 C9.79216869,7.66736168 9.46484551,7.96225904 9.46484551,8.43364198 L9.46484551,9.44222222 C9.46484551,9.69402316 9.26108024,9.89814815 9.00972305,9.89814815 C8.75836585,9.89814815 8.55460058,9.69402316 8.55460058,9.44222222 L8.55460058,3.95833333 C8.55460058,3.48620418 8.22746511,3.19158887 7.79938233,3.19182097 C7.37137414,3.19205304 7.04405736,3.48694996 7.04405736,3.95833333 L7.04405736,11.442948 C7.04405736,11.6259358 6.92611473,11.7879886 6.75220282,11.8439554 C6.57829131,11.899922 6.38820335,11.8370024 6.28181408,11.6882553 L5.54786469,10.6620917 C5.28463659,10.2940918 4.84633607,10.2515955 4.49699968,10.5017767 Z M8.55456977,14.1181481 L8.55456977,12.147284 C8.55456977,11.895483 8.75833504,11.691358 9.00969224,11.691358 C9.26104943,11.691358 9.4648147,11.895483 9.4648147,12.147284 L9.4648147,14.1181481 C9.4648147,14.3699491 9.26104943,14.5740741 9.00969224,14.5740741 C8.75833504,14.5740741 8.55456977,14.3699491 8.55456977,14.1181481 Z M11.430465,11.691358 C11.6818137,11.691358 11.885572,11.8954761 11.885572,12.1472685 L11.885572,14.1181636 C11.885572,14.369956 11.6818137,14.5740741 11.430465,14.5740741 C11.1791163,14.5740741 10.9753579,14.369956 10.9753579,14.1181636 L10.9753579,12.1472685 C10.9753579,11.8954761 11.1791163,11.691358 11.430465,11.691358 Z M13.3961461,12.1472685 C13.3961461,11.8954761 13.5999044,11.691358 13.8512531,11.691358 C14.1026018,11.691358 14.3063602,11.8954761 14.3063602,12.1472685 L14.3063602,14.1181636 C14.3063602,14.369956 14.1026018,14.5740741 13.8512531,14.5740741 C13.5999044,14.5740741 13.3961461,14.369956 13.3961461,14.1181636 L13.3961461,12.1472685 Z"/>
 </symbol>
@@ -245,6 +251,9 @@
 <symbol id="icon-permalink" viewBox="0 0 20 20" fill="currentColor">
   <path d="M10.5615959,13.5369661 C10.8614377,13.8374425 10.8642543,14.3226796 10.5667497,14.6286503 L8.2685409,16.9268589 C6.83317877,18.3588624 4.50959891,18.358811 3.07396303,16.9265337 C1.64197242,15.4911845 1.64199806,13.1676046 3.07412553,11.7321184 L6.3626967,8.44354747 C7.79863297,7.01168291 10.1217674,7.01250144 11.5618962,8.44873652 C11.8468297,8.75455932 11.8385338,9.23106215 11.5431274,9.52678116 C11.2472876,9.822934 10.7707684,9.83088531 10.4601369,9.54190764 C9.63066742,8.7145592 8.28806314,8.71453851 7.45871412,9.54176665 L4.16967211,12.8290741 C3.34245707,13.6582293 3.34240935,15.0005376 4.16934691,15.8294155 C4.99851217,16.6566405 6.34082045,16.6566682 7.1698246,15.8296041 L9.46873792,13.5298236 L9.47196244,13.5276684 C9.77670104,13.2324779 10.2619266,13.2366626 10.5615959,13.5369661 Z M16.9259063,8.26862645 L13.6363953,11.5572701 C12.2008541,12.9887407 9.87772165,12.9887096 8.44201443,11.5570732 C8.24603309,11.3610918 8.16949366,11.0754428 8.24122781,10.8077273 C8.31296195,10.5400118 8.52207155,10.3309022 8.78978704,10.2591681 C9.05747794,10.1874405 9.34313357,10.2639554 9.53890328,10.4597255 C10.3685766,11.2866611 11.7108665,11.286692 12.5403595,10.4599364 L15.8294199,7.17174346 C16.6566349,6.34258823 16.6566826,5.00027994 15.8297451,4.1714021 C15.0005779,3.34417513 13.6582696,3.34415128 12.8292412,4.17123959 L10.5304013,6.47007948 C10.3344462,6.66624196 10.0487247,6.74296275 9.78086551,6.67134189 C9.51300628,6.59972102 9.30370342,6.39063941 9.2317993,6.12285608 C9.1598923,5.85506205 9.23632156,5.56926251 9.43236841,5.37300829 L11.7322854,3.07395864 C13.1676218,1.64198086 15.4912017,1.64198086 16.9267356,3.07415623 C18.3580432,4.51021576 18.3577428,6.83343179 16.9259063,8.26862645 Z"/>
 </symbol>
+<symbol id="icon-phone" viewBox="0 0 24 24" fill="currentColor">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M19.6778 13.8315C20.373 14.1727 20.9373 14.9646 20.7506 15.9018C20.5593 16.8626 20.0759 18.1027 19.2595 19.0146C18.8437 19.4791 18.3082 19.895 17.6434 20.1102C16.9615 20.331 16.2147 20.3169 15.4442 20.0268C14.014 19.4884 12.4994 18.5009 11.2677 17.5778C10.2959 16.8494 9.45427 16.1261 8.90869 15.6204L8.88839 15.6163C8.83438 15.5623 8.77441 15.5009 8.70915 15.4327C8.64104 15.3676 8.57975 15.3077 8.5258 15.2537L8.52167 15.2334C8.01604 14.6879 7.2927 13.8463 6.56436 12.8745C5.64119 11.6427 4.65368 10.1281 4.1153 8.69791C3.82525 7.9274 3.81115 7.18059 4.0319 6.49877C4.24715 5.83394 4.66305 5.29839 5.12746 4.88265C6.03944 4.06626 7.27955 3.58283 8.24029 3.39149C9.17751 3.20484 9.96945 3.76911 10.3106 4.4643L11.6384 7.17003C12.0333 7.97481 11.8306 8.84495 11.397 9.43317C11.2857 9.58409 11.1964 9.72824 11.1403 9.84855C11.1279 9.87508 11.1183 9.89793 11.111 9.91715C11.1242 9.94287 11.1425 9.97648 11.1676 10.0186C11.2644 10.1811 11.4104 10.3851 11.5918 10.6133C11.7701 10.8375 12.1442 11.2426 12.5119 11.63C12.8994 11.9978 13.3046 12.372 13.5289 12.5503C13.757 12.7317 13.961 12.8777 14.1236 12.9745C14.1656 12.9996 14.1992 13.0179 14.225 13.0311C14.2442 13.0238 14.267 13.0142 14.2936 13.0018C14.4139 12.9457 14.558 12.8564 14.7089 12.7452C15.2972 12.3115 16.1673 12.1088 16.9721 12.5037L19.6778 13.8315ZM11.0598 13.082C11.1237 13.1482 11.184 13.2095 11.2396 13.2651L11.2766 13.2882C11.5674 13.5602 11.9153 13.8685 12.2643 14.146C12.5284 14.356 12.8132 14.5646 13.0872 14.7279C13.316 14.8643 13.699 15.0712 14.1144 15.0917C14.5292 15.1121 14.9043 14.9785 15.1693 14.8548C15.4507 14.7235 15.7129 14.5531 15.9297 14.3932C15.9769 14.3584 16.0235 14.3423 16.0554 14.3379C16.072 14.3356 16.0807 14.3367 16.0839 14.3374L18.7159 15.629C18.5566 16.3138 18.2095 17.1121 17.7323 17.6452C17.4846 17.9219 17.2363 18.0892 17.0006 18.1656C16.7818 18.2364 16.5113 18.2504 16.1514 18.115C14.996 17.68 13.667 16.8316 12.4853 15.9458C11.767 15.4075 10.8577 14.6035 10.1709 13.9711C9.5385 13.2843 8.73461 12.3751 8.19626 11.6568C7.31055 10.4751 6.46209 9.14607 6.02716 7.99067C5.89169 7.63082 5.90572 7.36031 5.97655 7.14154C6.05288 6.90578 6.22021 6.6575 6.49686 6.40984C7.03 5.93259 7.82826 5.5855 8.51313 5.42624L9.80469 8.0582C9.80541 8.06141 9.80651 8.07016 9.80421 8.08672C9.79979 8.11858 9.78369 8.16521 9.7489 8.21238C9.589 8.42926 9.41864 8.69138 9.28728 8.97284C9.16361 9.23784 9.02998 9.61292 9.05042 10.0277C9.0709 10.4431 9.27781 10.8261 9.41422 11.055C9.5775 11.3289 9.78609 11.6137 9.99607 11.8778C10.2736 12.2268 10.582 12.5748 10.854 12.8656L10.877 12.9025C10.9325 12.958 10.9938 13.0182 11.0598 13.082Z"/>
+</symbol>
 <symbol id="icon-pin" viewBox="0 0 20 20" fill="currentColor">
   <path d="M9.42996785,12.4576456 L5.03820001,8.06485857 L4.39915651,8.70390207 C4.25850578,8.84455279 4.0719907,8.92201261 3.87324511,8.92201261 C3.87324511,8.92201261 3.87324511,8.92201261 3.87324511,8.92201261 L3.87324511,8.92201261 C3.66536587,8.92201261 3.49356029,8.75988807 3.48151707,8.55235798 C3.48107838,8.54448527 3.48084998,8.53690545 3.48084998,8.52961748 C3.48084998,8.3318911 3.5583098,8.14843364 3.69386448,8.01084054 L8.01123013,3.6944941 C8.01123013,3.6944941 8.01123013,3.6944941 8.01123013,3.6944941 L8.01123013,3.6944941 C8.20290792,3.50281631 8.51367902,3.50281631 8.70535681,3.6944941 C8.8381036,3.82724089 8.88350188,4.02407983 8.82230421,4.20155733 C8.79466754,4.2817736 8.75532304,4.34750772 8.70429166,4.39876692 L8.06524816,5.03781042 L12.079909,9.05349046 L12.4559968,9.42040539 L12.9289094,9.19516039 C12.9851657,9.1686868 13.9802154,8.7124366 15.2534176,9.2114661 C15.3954837,9.26714868 15.5951631,9.37268051 15.852456,9.52806158 L15.8524016,9.52815155 C15.9941809,9.61377314 16.0397057,9.79811799 15.9540842,9.9398973 C15.9415573,9.96064036 15.9265625,9.97978868 15.9094277,9.99692341 L9.99822269,15.9082807 C9.88102335,16.0254801 9.69100569,16.0254801 9.57380635,15.9082807 C9.55648297,15.8909573 9.541346,15.8715779 9.52873335,15.850575 C9.36528629,15.5783991 9.25525114,15.3678629 9.19862793,15.2189665 C8.72086328,13.9626361 9.16871596,12.9864865 9.19249235,12.9356542 L9.42996785,12.4576456 Z M17.7833977,9.1706994 C15.7714808,7.15674413 13.730007,7.4033925 12.7943739,7.67348265 L10.1057028,4.9848116 C10.5154245,4.27340432 10.5001364,3.38465483 10.0618769,2.68853568 L9.71534612,2.34200491 C8.85513446,1.79978619 7.7075061,1.90272621 6.96246496,2.64776735 L2.64713773,6.96411379 C1.90209658,7.70915494 1.80017577,8.85882171 2.3423945,9.71495654 L2.68790605,10.0614873 C3.38606362,10.500766 4.27583232,10.5150349 4.98418197,10.1063325 L7.67387224,12.7960227 C7.40378208,13.7296174 7.15713371,15.7700721 9.17108898,17.7840273 L9.17108898,17.7840273 C9.45957211,18.0730728 9.92775155,18.0735287 10.216797,17.7850455 C10.2169669,17.784876 10.2171367,17.7847064 10.2173064,17.7845367 L13.4772433,14.5245997 L16.4454322,17.4927885 C16.7346597,17.7820161 17.2035551,17.7821302 17.4929234,17.4930434 L17.4929234,17.4930434 C17.7821097,17.2041384 17.7823377,16.7355028 17.4934327,16.4463165 C17.4933479,16.4462316 17.493263,16.4461467 17.4931781,16.4460618 L14.5239701,13.4768538 L17.7834681,10.2164774 C18.0722048,9.92766292 18.0721733,9.45947495 17.7833977,9.1706994 Z"/>
 </symbol>
@@ -374,4 +383,4 @@
 <symbol id="icon-warning" viewBox="0 0 20 20" fill="currentColor">
   <path d="M9.98344445,7.04264254 C10.4190789,7.04264254 10.7723523,7.39520794 10.7723523,7.83027001 L10.7723523,12.3994926 C10.7723523,12.8345547 10.4190789,13.1871201 9.98344445,13.1871201 C9.54780997,13.1871201 9.19453663,12.8345547 9.19453663,12.3994926 L9.19453663,7.83027001 C9.19453663,7.39520794 9.54780997,7.04264254 9.98344445,7.04264254 Z M0.959352356,16.870054 L9.04441459,2.40226256 C9.32933111,1.8924195 9.98368057,1.7021729 10.5098756,1.97341266 C10.6984618,2.07062387 10.853564,2.21970064 10.9555854,2.40226256 L19.0406476,16.870054 C19.3644696,17.4495162 18.9313899,18.15 18.2590107,18.15 L1.74098931,18.15 C1.06861014,18.15 0.635530413,17.4495162 0.959352356,16.870054 Z M9.96597455,13.7448416 C10.4490813,13.7448416 10.8196237,14.1257886 10.8196237,14.6151726 C10.8196237,15.1078483 10.450184,15.4898784 9.96597455,15.4898784 C9.48176512,15.4898784 9.11232535,15.1078483 9.11232535,14.6151726 C9.11232535,14.1257886 9.48286785,13.7448416 9.96597455,13.7448416 Z M2.73547986,16.7123645 L17.2645201,16.7123645 L10,3.71288982 L2.73547986,16.7123645 Z"/>
 </symbol>
-</svg>
+</svg>
\ No newline at end of file

From d83d6cae64004d5d6c9b8e280f3ddebf3bee920e Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Sun, 29 Mar 2020 17:19:04 -0300
Subject: [PATCH 095/223] Make DirectMessageRoomType.isGroupChat() accept null
 roomData (#17074)

---
 app/lib/lib/roomTypes/direct.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/lib/lib/roomTypes/direct.js b/app/lib/lib/roomTypes/direct.js
index 487c21d63891..01b6f962f444 100644
--- a/app/lib/lib/roomTypes/direct.js
+++ b/app/lib/lib/roomTypes/direct.js
@@ -181,9 +181,14 @@ export class DirectMessageRoomType extends RoomTypeConfig {
 	}
 
 	getAvatarPath(roomData, subData) {
-		if (roomData && this.isGroupChat(roomData)) {
+		if (this.isGroupChat(roomData)) {
 			return getAvatarURL({ username: roomData.uids.length + roomData.usernames.join() });
 		}
+
+		if (roomData) {
+			return getUserAvatarURL(roomData.name || this.roomName(roomData));
+		}
+
 		const sub = subData || Subscriptions.findOne({ rid: roomData._id }, { fields: { name: 1 } });
 		return getUserAvatarURL(sub.name || this.roomName(roomData));
 	}
@@ -193,6 +198,6 @@ export class DirectMessageRoomType extends RoomTypeConfig {
 	}
 
 	isGroupChat(room) {
-		return room.uids && room.uids.length > 2;
+		return room && room.uids && room.uids.length > 2;
 	}
 }

From c213684abcd5a1016a6f5d8e1191198340edfade Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sun, 29 Mar 2020 17:29:11 -0300
Subject: [PATCH 096/223] =?UTF-8?q?[IMPROVE]=20Repeat=20=E2=80=9CReply=20I?=
 =?UTF-8?q?n=20Thread=E2=80=9D=20and=20=E2=80=9CAdd=20Reaction=E2=80=9D=20?=
 =?UTF-8?q?inside=20the=20message=20actions=20menu=20(#17073)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/discussion/client/createDiscussionMessageAction.js | 2 +-
 app/reactions/client/init.js                           | 6 +++---
 app/threads/client/messageAction/follow.js             | 2 +-
 app/threads/client/messageAction/replyInThread.js      | 4 ++--
 app/threads/client/messageAction/unfollow.js           | 2 +-
 app/ui-utils/client/lib/MessageAction.js               | 4 ++--
 packages/rocketchat-i18n/i18n/en.i18n.json             | 9 +++++----
 packages/rocketchat-i18n/i18n/pt-BR.i18n.json          | 7 ++++---
 8 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/app/discussion/client/createDiscussionMessageAction.js b/app/discussion/client/createDiscussionMessageAction.js
index 79995fdbd49a..7d621bcfab50 100644
--- a/app/discussion/client/createDiscussionMessageAction.js
+++ b/app/discussion/client/createDiscussionMessageAction.js
@@ -45,7 +45,7 @@ Meteor.startup(function() {
 
 				return uid !== u._id ? hasPermission('start-discussion-other-user') : hasPermission('start-discussion');
 			},
-			order: 0,
+			order: 1,
 			group: 'menu',
 		});
 	});
diff --git a/app/reactions/client/init.js b/app/reactions/client/init.js
index e6c9acaf7d62..81d3c44ecb9f 100644
--- a/app/reactions/client/init.js
+++ b/app/reactions/client/init.js
@@ -57,7 +57,7 @@ Meteor.startup(function() {
 	MessageAction.addButton({
 		id: 'reaction-message',
 		icon: 'add-reaction',
-		label: 'Reactions',
+		label: 'Add_Reaction',
 		context: [
 			'message',
 			'message-mobile',
@@ -93,7 +93,7 @@ Meteor.startup(function() {
 
 			return true;
 		},
-		order: 22,
-		group: 'message',
+		order: -2,
+		group: ['message', 'menu'],
 	});
 });
diff --git a/app/threads/client/messageAction/follow.js b/app/threads/client/messageAction/follow.js
index b8cb361b4a30..9efd65b4421e 100644
--- a/app/threads/client/messageAction/follow.js
+++ b/app/threads/client/messageAction/follow.js
@@ -29,7 +29,7 @@ Meteor.startup(function() {
 				}
 				return !replies.includes(u._id);
 			},
-			order: 0,
+			order: 2,
 			group: 'menu',
 		});
 	});
diff --git a/app/threads/client/messageAction/replyInThread.js b/app/threads/client/messageAction/replyInThread.js
index 7c6f605bca41..6682bfce983a 100644
--- a/app/threads/client/messageAction/replyInThread.js
+++ b/app/threads/client/messageAction/replyInThread.js
@@ -33,8 +33,8 @@ Meteor.startup(function() {
 			condition({ subscription }) {
 				return Boolean(subscription);
 			},
-			order: 1,
-			group: 'message',
+			order: -1,
+			group: ['message', 'menu'],
 		});
 	});
 });
diff --git a/app/threads/client/messageAction/unfollow.js b/app/threads/client/messageAction/unfollow.js
index f02e4a6f9225..d209f1bf3e86 100644
--- a/app/threads/client/messageAction/unfollow.js
+++ b/app/threads/client/messageAction/unfollow.js
@@ -29,7 +29,7 @@ Meteor.startup(function() {
 				}
 				return replies.includes(u._id);
 			},
-			order: 0,
+			order: 2,
 			group: 'menu',
 		});
 	});
diff --git a/app/ui-utils/client/lib/MessageAction.js b/app/ui-utils/client/lib/MessageAction.js
index 5f201aa73e07..0aa6c7ed8d3b 100644
--- a/app/ui-utils/client/lib/MessageAction.js
+++ b/app/ui-utils/client/lib/MessageAction.js
@@ -99,7 +99,7 @@ export const MessageAction = new class {
 	})
 
 	_getButtonsByGroup = mem(function(group) {
-		return this._getButtons().filter((button) => button.group === group);
+		return this._getButtons().filter((button) => (Array.isArray(button.group) ? button.group.includes(group) : button.group === group));
 	})
 
 	getButtons(message, context, group) {
@@ -181,7 +181,7 @@ Meteor.startup(async function() {
 			}
 			return true;
 		},
-		order: 2,
+		order: 0,
 		group: 'menu',
 	});
 
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 48460e2dab0f..3da1beeaa3f7 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -252,6 +252,7 @@
   "Add_user": "Add user",
   "Add_User": "Add User",
   "Add_users": "Add users",
+  "Add_Reaction": "Add Reaction",
   "Adding_OAuth_Services": "Adding OAuth Services",
   "Adding_permission": "Adding permission",
   "Adding_user": "Adding user",
@@ -1184,7 +1185,7 @@
   "Discussion_name": "Discussion name",
   "Discussion": "Discussion",
   "Discussions": "Discussions",
-  "Discussion_start": "Start a discussion",
+  "Discussion_start": "Start a Discussion",
   "Discussion_target_channel_description": "Select a channel which is related to what you want to ask",
   "Discussion_target_channel_prefix": "You are creating a discussion in",
   "Discussion_target_channel": "Parent channel or group",
@@ -1583,7 +1584,7 @@
   "First_Channel_After_Login": "First Channel After Login",
   "First_response_time": "First Response Time",
   "Flags": "Flags",
-  "Follow_message": "Follow message",
+  "Follow_message": "Follow Message",
   "Following": "Following",
   "Follow_social_profiles": "Follow our social profiles, fork us on github and share your thoughts about the rocket.chat app on our trello board.",
   "Fonts": "Fonts",
@@ -1938,7 +1939,7 @@
   "Joined": "Joined",
   "Jump": "Jump",
   "Jump_to_first_unread": "Jump to first unread",
-  "Jump_to_message": "Jump to message",
+  "Jump_to_message": "Jump to Message",
   "Jump_to_recent_messages": "Jump to recent messages",
   "Just_invited_people_can_access_this_channel": "Just invited people can access this channel.",
   "Katex_Dollar_Syntax": "Allow Dollar Syntax",
@@ -3381,7 +3382,7 @@
   "Unblock_User": "Unblock User",
   "Undefined": "Undefined",
   "Unfavorite": "Unfavorite",
-  "Unfollow_message": "Unfollow message",
+  "Unfollow_message": "Unfollow Message",
   "Unignore": "Unignore",
   "Uninstall": "Uninstall",
   "Unknown_Import_State": "Unknown Import State",
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index 6381e33e89d4..251d03e647bd 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -235,6 +235,7 @@
   "Add_user": "Adicionar usuário",
   "Add_User": "Adicionar Usuário",
   "Add_users": "Adicionar usuários",
+  "Add_Reaction": "Adicionar reação",
   "Adding_OAuth_Services": "Adicionando Serviços OAuth",
   "Adding_permission": "Adicionando permissão",
   "Adding_user": "Adicionando usuário",
@@ -1090,7 +1091,7 @@
   "Displays_action_text": "Exibe texto da ação",
   "Discussion_name": "Nome da discussão",
   "Discussions": "Conversas",
-  "Discussion_start": "Iniciar uma discussão",
+  "Discussion_start": "Iniciar uma Discussão",
   "Discussion_target_channel_description": "Selecione um canal relacionado com o que deseja perguntar",
   "Discussion_target_channel_prefix": "Criando uma discussão em",
   "Discussion_target_channel": "Canal ou grupo pai",
@@ -1764,7 +1765,7 @@
   "Joined": "Entrou",
   "Jump": "Saltar",
   "Jump_to_first_unread": "Ir para primeira mensagem não lida",
-  "Jump_to_message": "Ir para mensagem",
+  "Jump_to_message": "Ir para Mensagem",
   "Jump_to_recent_messages": "Ir para mensagens recentes",
   "Just_invited_people_can_access_this_channel": "Apenas as pessoas convidadas podem acessar este canal.",
   "Katex_Dollar_Syntax": "Permitir sintaxe dólar",
@@ -3059,7 +3060,7 @@
   "Unblock_User": "Desbloquear Usuário",
   "Undefined": "Não definido",
   "Unfavorite": "Remover dos Favoritos",
-  "Unfollow_message": "Deixar de seguir mensagem",
+  "Unfollow_message": "Deixar de seguir Mensagem",
   "Unignore": "Unignore",
   "Uninstall": "Desinstalar",
   "Unlimited": "Ilimitado",

From c7623476cee6cd8480c4b600c30279548f2dd68d Mon Sep 17 00:00:00 2001
From: gabriellsh <40830821+gabriellsh@users.noreply.github.com>
Date: Sun, 29 Mar 2020 19:37:08 -0300
Subject: [PATCH 097/223] [NEW] Home button on sidebar (#17052)

---
 app/lib/server/startup/settings.js         | 4 ++++
 app/ui-master/public/icons.svg             | 7 +++++--
 app/ui-master/public/icons/game.svg        | 4 ++--
 app/ui-master/public/icons/group.svg       | 6 ------
 app/ui-master/public/icons/home.svg        | 3 +++
 app/ui-sidenav/client/sidebarHeader.js     | 8 ++++++++
 packages/rocketchat-i18n/i18n/en.i18n.json | 1 +
 private/public/icons.svg                   | 7 +++++--
 8 files changed, 28 insertions(+), 12 deletions(-)
 delete mode 100644 app/ui-master/public/icons/group.svg
 create mode 100644 app/ui-master/public/icons/home.svg

diff --git a/app/lib/server/startup/settings.js b/app/lib/server/startup/settings.js
index 2e87a40b2eb6..ede7feccac60 100644
--- a/app/lib/server/startup/settings.js
+++ b/app/lib/server/startup/settings.js
@@ -1295,6 +1295,10 @@ settings.addGroup('Layout', function() {
 			type: 'string',
 			public: true,
 		});
+		this.add('Layout_Show_Home_Button', true, {
+			type: 'boolean',
+			public: true,
+		});
 		this.add('Layout_Home_Body', '<p>Welcome to Rocket.Chat!</p>\n<p>The Rocket.Chat desktops apps for Windows, macOS and Linux are available to download <a title="Rocket.Chat desktop apps" href="https://rocket.chat/download" target="_blank" rel="noopener">here</a>.</p><p>The native mobile app, Rocket.Chat,\n  for Android and iOS is available from <a title="Rocket.Chat on Google Play" href="https://play.google.com/store/apps/details?id=chat.rocket.android" target="_blank" rel="noopener">Google Play</a> and the <a title="Rocket.Chat on the App Store" href="https://itunes.apple.com/app/rocket-chat/id1148741252" target="_blank" rel="noopener">App Store</a>.</p>\n<p>For further help, please consult the <a title="Rocket.Chat Documentation" href="https://rocket.chat/docs/" target="_blank" rel="noopener">documentation</a>.</p>\n<p>If you\'re an admin, feel free to change this content via <strong>Administration</strong> &rarr; <strong>Layout</strong> &rarr; <strong>Home Body</strong>. Or clicking <a title="Home Body Layout" href="/admin/Layout">here</a>.</p>', {
 			type: 'code',
 			code: 'text/html',
diff --git a/app/ui-master/public/icons.svg b/app/ui-master/public/icons.svg
index 1895d7c09d23..a72e44e9f668 100644
--- a/app/ui-master/public/icons.svg
+++ b/app/ui-master/public/icons.svg
@@ -146,8 +146,8 @@
 <symbol id="icon-folder" viewBox="0 0 20 20" fill="currentColor">
   <path d="M7.325376,4.5 L4,4.5 C3.72385763,4.5 3.5,4.72385763 3.5,5 L3.5,15 C3.5,15.2761424 3.72385763,15.5 4,15.5 L16,15.5 C16.2761424,15.5 16.5,15.2761424 16.5,15 L16.5,7 C16.5,6.72385763 16.2761424,6.5 16,6.5 L9.316214,6.5 L7.700244,4.66913179 C7.60533058,4.56159644 7.46880685,4.5 7.325376,4.5 Z M9.992979,5 L17,5 C17.5522847,5 18,5.44771525 18,6 L18,16 C18,16.5522847 17.5522847,17 17,17 L3,17 C2.44771525,17 2,16.5522847 2,16 L2,4 C2,3.44771525 2.44771525,3 3,3 L7.776552,3 C8.0634137,3 8.33646216,3.12319287 8.526289,3.33826358 L9.992979,5 Z"/>
 </symbol>
-<symbol id="icon-game" viewBox="0 0 20 20" fill="currentColor">
-  <path fill-rule="evenodd" d="M10 20C15.5229 20 20 15.5228 20 10C20 4.47715 15.5229 0 10 0C4.47716 0 7.62939e-06 4.47715 7.62939e-06 10C7.62939e-06 15.5228 4.47716 20 10 20ZM16.3276 14.8957C17.203 13.7658 17.7825 12.3952 17.9499 10.9H14.9439C15.0872 12.3612 15.5759 13.7203 16.3276 14.8957ZM15.042 16.2115C13.8851 17.1517 12.4604 17.7752 10.9 17.9499V10.9H13.1367C13.2973 12.8635 13.9787 14.6807 15.042 16.2115ZM14.9439 9.1H17.9499C17.7825 7.60479 17.203 6.23416 16.3276 5.10434C15.5759 6.27969 15.0872 7.63879 14.9439 9.1ZM15.042 3.7885C13.9787 5.31935 13.2973 7.13646 13.1367 9.1H10.9V2.05006C12.4604 2.22475 13.8851 2.84826 15.042 3.7885ZM9.10001 17.9499C7.53945 17.7752 6.1146 17.1516 4.9576 16.2111C6.02095 14.6803 6.70261 12.8633 6.86331 10.9H9.10001V17.9499ZM5.05607 10.9C4.91267 12.3612 4.42373 13.72 3.67202 14.8952C2.79682 13.7654 2.21744 12.395 2.05007 10.9H5.05607ZM9.10001 9.1H6.86333C6.70272 7.13674 6.02142 5.31947 4.95804 3.7885C6.11496 2.84826 7.53965 2.22475 9.10001 2.05006V9.1ZM5.0561 9.1C4.91278 7.63858 4.42402 6.2796 3.67238 5.10437C2.79698 6.23418 2.21747 7.6048 2.05007 9.1H5.0561Z"/>
+<symbol id="icon-game" viewBox="0 0 24 24" fill="currentColor">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M12.75 19.463C14.2643 19.3126 15.6461 18.7119 16.7595 17.7966C15.6994 16.3648 15.0217 14.6317 14.8784 12.75H12.75V19.463ZM19.463 12.75C19.3145 14.2453 18.7269 15.6114 17.8309 16.7175C17.0317 15.5731 16.5157 14.2173 16.3836 12.75H19.463ZM16.7595 6.20342C15.6994 7.63521 15.0217 9.36838 14.8784 11.25H12.75V4.53703C14.2643 4.68738 15.6461 5.28813 16.7595 6.20342ZM16.3836 11.25C16.5157 9.78269 17.0317 8.42685 17.8309 7.28252C18.7269 8.38861 19.3145 9.75471 19.463 11.25H16.3836ZM11.25 19.463V12.75H9.12675C8.99677 14.6397 8.32797 16.3822 7.27341 17.8235C8.3811 18.7236 9.7506 19.3141 11.25 19.463ZM6.19597 16.7504C5.28487 15.6386 4.68697 14.2602 4.53703 12.75H7.62254C7.50234 14.2283 6.99272 15.5956 6.19597 16.7504ZM7.60964 11.25H4.53703C4.684 9.76971 5.26138 8.41604 6.14224 7.3159C6.94359 8.44966 7.46579 9.79388 7.60964 11.25ZM9.11584 11.25C8.9594 9.37658 8.27295 7.65289 7.20746 6.23073C8.32654 5.30008 9.7207 4.68887 11.25 4.53703V11.25H9.11584ZM12 21C16.9706 21 21 16.9706 21 12C21 7.02944 16.9706 3 12 3C7.02944 3 3 7.02944 3 12C3 16.9706 7.02944 21 12 21Z"/>
 </symbol>
 <symbol id="icon-github" viewBox="0 0 20 20" fill="currentColor">
   <path d="M7.26894971,14.8834111 C7.26894971,14.9490684 7.19284523,15.001959 7.09565157,15.001959 C6.98562101,15.0119899 6.90951653,14.9590994 6.90951653,14.8834111 C6.90951653,14.816842 6.98653793,14.7648633 7.08281467,14.7648633 C7.1827591,14.7539205 7.26894971,14.806811 7.26894971,14.8834111 Z M6.23466241,14.7347704 C6.21082245,14.8004277 6.27775771,14.8770278 6.37770214,14.8961778 C6.46389275,14.9299184 6.56383718,14.8961778 6.58400945,14.8305206 C6.6032648,14.7639514 6.53999722,14.6882632 6.44096971,14.6581703 C6.35386218,14.6353727 6.25758544,14.6682013 6.23466241,14.7347704 Z M7.70448736,14.6782322 C7.60821061,14.7010299 7.54219228,14.7639514 7.55136149,14.8405516 C7.56144762,14.9062088 7.64855515,14.9499803 7.74758266,14.9262707 C7.84477633,14.9034731 7.91079467,14.8405516 7.90070853,14.7739824 C7.89153932,14.7110609 7.80168102,14.6682013 7.70448736,14.6782322 Z M9.89409558,2 C5.27923034,2 1.75,5.48348178 1.75,10.0731058 C1.75,13.7417045 4.0716449,16.8813977 7.38906641,17.986628 C7.81451792,18.0623162 7.9639761,17.8015111 7.9639761,17.5863012 C7.9639761,17.3811223 7.95480689,16.2494467 7.95480689,15.5545741 C7.95480689,15.5545741 5.62582662,16.051563 5.13619061,14.5697154 C5.13619061,14.5697154 4.75750208,13.6058305 4.21193387,13.357792 C4.21193387,13.357792 3.44997221,12.8380055 4.26511531,12.8489484 C4.26511531,12.8489484 5.0930953,12.9146056 5.54880522,13.7024926 C6.27775771,14.9791613 7.49818005,14.6116631 7.97406224,14.3937175 C8.05108363,13.8648119 8.26747708,13.4973137 8.50587663,13.2784562 C6.64727702,13.0732773 4.77033898,12.8051769 4.77033898,9.62262413 C4.77033898,8.71254172 5.02340928,8.25658861 5.55614059,7.67388053 C5.46903306,7.45867066 5.18662128,6.57229781 5.6423312,5.4278555 C6.3373576,5.21264563 7.93738538,6.3215236 7.93738538,6.3215236 C8.61789979,6.13383695 9.32085186,6.03874118 10.0270492,6.03883267 C10.7329655,6.0384409 11.4356553,6.13354292 12.1157961,6.3215236 C12.1157961,6.3215236 13.7158238,5.208998 14.4117672,5.4278555 C14.8674771,6.57594544 14.5841484,7.45867066 14.4979578,7.67388053 C15.0297722,8.25932433 15.3561962,8.71618935 15.3561962,9.62262413 C15.3561962,12.8152078 13.3967352,13.0696297 11.5372187,13.2793681 C11.8434704,13.5401733 12.1029592,14.0362503 12.1029592,14.8141063 C12.1029592,15.9284557 12.092873,17.3081698 12.092873,17.5799178 C12.092873,17.7951277 12.2459989,18.0559329 12.6677827,17.9802447 C15.9952904,16.8813977 18.25,13.7417045 18.25,10.0731058 C18.25,5.48348178 14.5080439,2 9.89409558,2 Z M4.98398166,13.4106826 C4.93996944,13.4444231 4.95005557,13.5201113 5.0069047,13.5830329 C5.06008614,13.6359234 5.13619061,13.6587211 5.18020283,13.6158615 C5.22329814,13.5830329 5.213212,13.5064327 5.15636288,13.4444231 C5.10318144,13.3915326 5.02707697,13.367823 4.98398166,13.4106826 Z M4.62454849,13.1425822 C4.60070853,13.1863537 4.6337177,13.2392442 4.70065296,13.2720728 C4.7538344,13.3049015 4.81985274,13.2948705 4.84369269,13.2492752 C4.86753265,13.2055037 4.83452348,13.1526131 4.76758822,13.1197845 C4.70065296,13.0997226 4.64838844,13.1106654 4.62454849,13.1425822 Z M5.70193109,14.320765 C5.64874965,14.3636246 5.66892192,14.4630224 5.7450264,14.5259439 C5.82204779,14.6016321 5.91832453,14.6116631 5.96141984,14.5587725 C6.00451514,14.5159129 5.98525979,14.4165152 5.91832453,14.3535936 C5.84497083,14.2779054 5.7450264,14.2678744 5.70193109,14.320765 Z M5.32324257,13.834719 C5.27006113,13.8675476 5.27006113,13.9532668 5.32324257,14.0298669 C5.37642401,14.1055551 5.4662823,14.1392957 5.5093776,14.1055551 C5.56255904,14.0626955 5.56255904,13.9769764 5.5093776,13.9003762 C5.46261462,13.824688 5.37642401,13.7909475 5.32324257,13.834719 Z"/>
@@ -173,6 +173,9 @@
 <symbol id="icon-help" viewBox="0 0 20 20" fill="currentColor">
   <path d="M10.6195556,16.728 L10.6195556,14.2462222 C11.68,14.0924444 12.6062222,13.5546667 13.2702222,12.7742222 L15.3715556,14.0871111 C14.2533333,15.5528889 12.5564444,16.5511111 10.6195556,16.728 M3.25955556,10.3848889 L5.73688889,10.4711111 C5.86666667,11.6444444 6.46044444,12.6684444 7.34133333,13.3653333 L6.10133333,15.512 C4.472,14.3564444 3.37866667,12.5004444 3.25955556,10.3848889 M9.37955556,3.27111111 L9.37955556,5.75288889 C8.31911111,5.90755556 7.39288889,6.44444444 6.72888889,7.22488889 L4.62844444,5.91288889 C5.74666667,4.44711111 7.44355556,3.44888889 9.37955556,3.27111111 M16.7377778,9.57066667 L14.2586667,9.48355556 C14.1182222,8.32888889 13.5271111,7.32088889 12.6586667,6.63377778 L13.8977778,4.48711111 C15.5164444,5.63466667 16.6044444,7.47288889 16.7377778,9.57066667 M14.2284444,10.8115556 L16.6924444,10.8977778 C16.5911111,11.6586667 16.3635556,12.3777778 16.0302222,13.0373333 L13.9404444,11.7315556 C14.0693333,11.44 14.1662222,11.1324444 14.2284444,10.8115556 M10.6195556,5.75288889 L10.6195556,3.27111111 C11.4017778,3.34222222 12.1431111,3.55111111 12.8248889,3.86666667 L11.592,6.00266667 C11.2844444,5.88 10.9573333,5.80177778 10.6195556,5.75288889 M5.76711111,9.23111111 L3.30044444,9.14488889 C3.39911111,8.36888889 3.62933333,7.63466667 3.96977778,6.96266667 L6.05866667,8.26755556 C5.92444444,8.57244444 5.82755556,8.89511111 5.76711111,9.23111111 M10,13.0693333 C8.30577778,13.0693333 6.92977778,11.6924444 6.92977778,10 C6.92977778,8.30666667 8.30577778,6.92977778 10,6.92977778 C11.6933333,6.92977778 13.0702222,8.30666667 13.0702222,10 C13.0702222,11.6924444 11.6933333,13.0693333 10,13.0693333 M9.37955556,14.2462222 L9.37955556,16.728 C8.59822222,16.6568889 7.85688889,16.4488889 7.17422222,16.1324444 L8.408,13.9964444 C8.71466667,14.1191111 9.04266667,14.1973333 9.37955556,14.2462222 M10,2 C5.58933333,2 2,5.58844444 2,10 C2,14.4106667 5.58933333,18 10,18 C14.4106667,18 18,14.4106667 18,10 C18,5.58844444 14.4106667,2 10,2"/>
 </symbol>
+<symbol id="icon-home" viewBox="0 0 24 24" fill="currentColor">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M12.1887 4.58677C12.089 4.47108 11.9097 4.47108 11.81 4.58677L6.56305 10.6734V19.251C6.56305 19.3891 6.67498 19.501 6.81305 19.501H10V16C10 15.4477 10.4477 15 11 15H13C13.5523 15 14 15.4477 14 16V19.501H17.187C17.3251 19.501 17.437 19.3891 17.437 19.251V10.675L12.1887 4.58677ZM3.75001 13.5379H5.06305V19.251C5.06305 20.2175 5.84655 21.001 6.81305 21.001H17.187C18.1535 21.001 18.937 20.2175 18.937 19.251V13.5379H20.2487C20.542 13.5379 20.8083 13.367 20.9305 13.1004C21.0527 12.8338 21.0082 12.5204 20.8167 12.2982L13.3248 3.60737C12.6267 2.79754 11.372 2.79754 10.6739 3.60737L3.18195 12.2982C2.99046 12.5204 2.94601 12.8338 3.06819 13.1004C3.19036 13.367 3.45673 13.5379 3.75001 13.5379Z"/>
+</symbol>
 <symbol id="icon-hubot" viewBox="0 0 20 20" fill="currentColor">
   <path d="M5.42895234,7.66636423 C4.79816416,7.66835922 4.28743215,8.19014656 4.28596823,8.83408944 L4.28596823,11.1677252 C4.28792007,11.8113138 4.7985099,12.3325505 5.42895234,12.3345431 L14.5710477,12.3345431 C15.2021819,12.332546 15.7130563,11.8102077 15.7140318,11.1659106 L15.7140318,8.83318211 C15.7120799,8.18959354 15.2014901,7.66835677 14.5710477,7.66636423 L5.42895234,7.66636423 Z M14.5710477,9.70784187 L13.1427619,11.1668179 L11.4282857,11.1668179 L10,9.70874919 L8.57171425,11.1659106 L6.85634929,11.1659106 L5.42984113,9.70874919 L5.42984113,8.83318211 L6.28663482,8.83318211 L7.71492056,10.2912508 L9.14231752,8.83408944 L10.8576825,8.83408944 L12.2859682,10.2921581 L13.714254,8.83408944 L14.5710477,8.83408944 L14.5710477,9.70965651 L14.5710477,9.70784187 Z M7.71403177,13.5004537 L12.2859682,13.5004537 L12.2859682,14.6663642 L7.71403177,14.6663642 L7.71403177,13.5004537 Z M10,3 C5.58893456,3 2,6.39520415 2,10.5834089 L2,15.8331821 C2.00195185,16.4767707 2.51254167,16.9980075 3.14298411,17 L16.8570159,17 C17.4874583,16.9980075 17.9980482,16.4767707 18,15.8331821 L18,10.5834089 C18,6.39520415 14.4110654,3 9.99911121,3 L10,3 Z M16.8570159,15.8331821 L3.14298411,15.8331821 L3.14298411,10.5834089 C3.14298411,6.97861309 6.15953783,4.06156837 9.99911121,4.06156837 C13.8386846,4.06156837 16.8561271,6.97861309 16.8561271,10.5834089 L16.8561271,15.8331821 L16.8570159,15.8331821 Z"/>
 </symbol>
diff --git a/app/ui-master/public/icons/game.svg b/app/ui-master/public/icons/game.svg
index 2fd484da958a..04826bc5919d 100644
--- a/app/ui-master/public/icons/game.svg
+++ b/app/ui-master/public/icons/game.svg
@@ -1,3 +1,3 @@
-<svg id="game" viewBox="0 0 20 20">
-    <path fill-rule="evenodd" d="M10 20C15.5229 20 20 15.5228 20 10C20 4.47715 15.5229 0 10 0C4.47716 0 7.62939e-06 4.47715 7.62939e-06 10C7.62939e-06 15.5228 4.47716 20 10 20ZM16.3276 14.8957C17.203 13.7658 17.7825 12.3952 17.9499 10.9H14.9439C15.0872 12.3612 15.5759 13.7203 16.3276 14.8957ZM15.042 16.2115C13.8851 17.1517 12.4604 17.7752 10.9 17.9499V10.9H13.1367C13.2973 12.8635 13.9787 14.6807 15.042 16.2115ZM14.9439 9.1H17.9499C17.7825 7.60479 17.203 6.23416 16.3276 5.10434C15.5759 6.27969 15.0872 7.63879 14.9439 9.1ZM15.042 3.7885C13.9787 5.31935 13.2973 7.13646 13.1367 9.1H10.9V2.05006C12.4604 2.22475 13.8851 2.84826 15.042 3.7885ZM9.10001 17.9499C7.53945 17.7752 6.1146 17.1516 4.9576 16.2111C6.02095 14.6803 6.70261 12.8633 6.86331 10.9H9.10001V17.9499ZM5.05607 10.9C4.91267 12.3612 4.42373 13.72 3.67202 14.8952C2.79682 13.7654 2.21744 12.395 2.05007 10.9H5.05607ZM9.10001 9.1H6.86333C6.70272 7.13674 6.02142 5.31947 4.95804 3.7885C6.11496 2.84826 7.53965 2.22475 9.10001 2.05006V9.1ZM5.0561 9.1C4.91278 7.63858 4.42402 6.2796 3.67238 5.10437C2.79698 6.23418 2.21747 7.6048 2.05007 9.1H5.0561Z"/>
+<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.75 19.463C14.2643 19.3126 15.6461 18.7119 16.7595 17.7966C15.6994 16.3648 15.0217 14.6317 14.8784 12.75H12.75V19.463ZM19.463 12.75C19.3145 14.2453 18.7269 15.6114 17.8309 16.7175C17.0317 15.5731 16.5157 14.2173 16.3836 12.75H19.463ZM16.7595 6.20342C15.6994 7.63521 15.0217 9.36838 14.8784 11.25H12.75V4.53703C14.2643 4.68738 15.6461 5.28813 16.7595 6.20342ZM16.3836 11.25C16.5157 9.78269 17.0317 8.42685 17.8309 7.28252C18.7269 8.38861 19.3145 9.75471 19.463 11.25H16.3836ZM11.25 19.463V12.75H9.12675C8.99677 14.6397 8.32797 16.3822 7.27341 17.8235C8.3811 18.7236 9.7506 19.3141 11.25 19.463ZM6.19597 16.7504C5.28487 15.6386 4.68697 14.2602 4.53703 12.75H7.62254C7.50234 14.2283 6.99272 15.5956 6.19597 16.7504ZM7.60964 11.25H4.53703C4.684 9.76971 5.26138 8.41604 6.14224 7.3159C6.94359 8.44966 7.46579 9.79388 7.60964 11.25ZM9.11584 11.25C8.9594 9.37658 8.27295 7.65289 7.20746 6.23073C8.32654 5.30008 9.7207 4.68887 11.25 4.53703V11.25H9.11584ZM12 21C16.9706 21 21 16.9706 21 12C21 7.02944 16.9706 3 12 3C7.02944 3 3 7.02944 3 12C3 16.9706 7.02944 21 12 21Z"/>
 </svg>
diff --git a/app/ui-master/public/icons/group.svg b/app/ui-master/public/icons/group.svg
deleted file mode 100644
index 987955ea978b..000000000000
--- a/app/ui-master/public/icons/group.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M4.66669 0.666687C6.0474 0.666687 7.16669 1.78598 7.16669 3.16669C7.16669 4.5474 6.0474 5.66669 4.66669 5.66669C3.28598 5.66669 2.16669 4.5474 2.16669 3.16669C2.16669 1.78597 3.28598 0.666687 4.66669 0.666687ZM5.83336 3.16669C5.83336 2.52235 5.31102 2.00002 4.66669 2.00002C4.02236 2.00002 3.50002 2.52235 3.50002 3.16669C3.50002 3.81102 4.02236 4.33335 4.66669 4.33335C5.31102 4.33335 5.83336 3.81102 5.83336 3.16669Z" />
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M5.90093 6.27198C7.38054 5.96655 9.00002 7.0074 9.00002 8.6586V10.1111C9.00002 10.7862 8.45281 11.3334 7.7778 11.3334H1.55558C0.880562 11.3334 0.333353 10.7862 0.333353 10.1111V8.6586C0.333353 7.0074 1.95283 5.96655 3.43244 6.27198C3.88712 6.36583 4.3178 6.42504 4.66669 6.42504C5.01558 6.42504 5.44625 6.36583 5.90093 6.27198ZM7.66669 8.6586C7.66669 7.98969 6.96307 7.41417 6.17048 7.57778C5.67613 7.67982 5.14527 7.75837 4.66669 7.75837C4.1881 7.75837 3.65725 7.67982 3.1629 7.57778C2.37031 7.41417 1.66669 7.98969 1.66669 8.6586V10H7.66669V8.6586Z" />
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M12 3.33335C12 2.22878 11.1046 1.33335 10 1.33335C8.89545 1.33335 8.00002 2.22878 8.00002 3.33335C8.00002 4.43792 8.89545 5.33335 10 5.33335C11.1046 5.33335 12 4.43792 12 3.33335ZM10 2.66669C10.3682 2.66669 10.6667 2.96516 10.6667 3.33335C10.6667 3.70154 10.3682 4.00002 10 4.00002C9.63183 4.00002 9.33335 3.70154 9.33335 3.33335C9.33335 2.96516 9.63183 2.66669 10 2.66669Z" />
-    <path d="M10.8376 7.22276C11.6565 7.10237 12.3334 7.68142 12.3334 8.33107V8.66669H9.70217C9.72965 9.11069 9.72307 9.56509 9.70856 10H12.4445C13.1195 10 13.6667 9.45281 13.6667 8.7778V8.33107C13.6667 6.69484 12.0864 5.69151 10.6437 5.9036C10.4039 5.93885 10.1852 5.95835 10 5.95835C9.81486 5.95835 9.59617 5.93885 9.35637 5.9036C9.02127 5.85434 8.67876 5.87065 8.35034 5.94523C8.90819 6.22492 9.24568 6.69464 9.44613 7.25916C9.6332 7.27941 9.82019 7.29169 10 7.29169C10.271 7.29169 10.5583 7.26381 10.8376 7.22276Z" />
-</svg>
diff --git a/app/ui-master/public/icons/home.svg b/app/ui-master/public/icons/home.svg
new file mode 100644
index 000000000000..3fbaf3e165cd
--- /dev/null
+++ b/app/ui-master/public/icons/home.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12.1887 4.58677C12.089 4.47108 11.9097 4.47108 11.81 4.58677L6.56305 10.6734V19.251C6.56305 19.3891 6.67498 19.501 6.81305 19.501H10V16C10 15.4477 10.4477 15 11 15H13C13.5523 15 14 15.4477 14 16V19.501H17.187C17.3251 19.501 17.437 19.3891 17.437 19.251V10.675L12.1887 4.58677ZM3.75001 13.5379H5.06305V19.251C5.06305 20.2175 5.84655 21.001 6.81305 21.001H17.187C18.1535 21.001 18.937 20.2175 18.937 19.251V13.5379H20.2487C20.542 13.5379 20.8083 13.367 20.9305 13.1004C21.0527 12.8338 21.0082 12.5204 20.8167 12.2982L13.3248 3.60737C12.6267 2.79754 11.372 2.79754 10.6739 3.60737L3.18195 12.2982C2.99046 12.5204 2.94601 12.8338 3.06819 13.1004C3.19036 13.367 3.45673 13.5379 3.75001 13.5379Z"/>
+</svg>
diff --git a/app/ui-sidenav/client/sidebarHeader.js b/app/ui-sidenav/client/sidebarHeader.js
index 1117e6460b5b..ef4139876f3f 100644
--- a/app/ui-sidenav/client/sidebarHeader.js
+++ b/app/ui-sidenav/client/sidebarHeader.js
@@ -58,6 +58,14 @@ export const toolbarSearch = {
 };
 
 const toolbarButtons = (user) => [{
+	name: t('Home'),
+	icon: 'home',
+	condition: () => settings.get('Layout_Show_Home_Button'),
+	action: () => {
+		FlowRouter.go('home');
+	},
+},
+{
 	name: t('Search'),
 	icon: 'magnifier',
 	action: () => {
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 3da1beeaa3f7..cf6c235a422a 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -3029,6 +3029,7 @@
   "Should_exists_a_user_with_this_username": "The user must already exist.",
   "Show_Setup_Wizard": "Show Setup Wizard",
   "UI_Show_top_navbar_embedded_layout": "Show top navbar in embedded layout",
+  "Layout_Show_Home_Button": "Show \"Home Button\"",
   "Show_agent_email": "Show agent email",
   "Show_agent_info": "Show agent information",
   "Show_all": "Show All",
diff --git a/private/public/icons.svg b/private/public/icons.svg
index 1895d7c09d23..a72e44e9f668 100644
--- a/private/public/icons.svg
+++ b/private/public/icons.svg
@@ -146,8 +146,8 @@
 <symbol id="icon-folder" viewBox="0 0 20 20" fill="currentColor">
   <path d="M7.325376,4.5 L4,4.5 C3.72385763,4.5 3.5,4.72385763 3.5,5 L3.5,15 C3.5,15.2761424 3.72385763,15.5 4,15.5 L16,15.5 C16.2761424,15.5 16.5,15.2761424 16.5,15 L16.5,7 C16.5,6.72385763 16.2761424,6.5 16,6.5 L9.316214,6.5 L7.700244,4.66913179 C7.60533058,4.56159644 7.46880685,4.5 7.325376,4.5 Z M9.992979,5 L17,5 C17.5522847,5 18,5.44771525 18,6 L18,16 C18,16.5522847 17.5522847,17 17,17 L3,17 C2.44771525,17 2,16.5522847 2,16 L2,4 C2,3.44771525 2.44771525,3 3,3 L7.776552,3 C8.0634137,3 8.33646216,3.12319287 8.526289,3.33826358 L9.992979,5 Z"/>
 </symbol>
-<symbol id="icon-game" viewBox="0 0 20 20" fill="currentColor">
-  <path fill-rule="evenodd" d="M10 20C15.5229 20 20 15.5228 20 10C20 4.47715 15.5229 0 10 0C4.47716 0 7.62939e-06 4.47715 7.62939e-06 10C7.62939e-06 15.5228 4.47716 20 10 20ZM16.3276 14.8957C17.203 13.7658 17.7825 12.3952 17.9499 10.9H14.9439C15.0872 12.3612 15.5759 13.7203 16.3276 14.8957ZM15.042 16.2115C13.8851 17.1517 12.4604 17.7752 10.9 17.9499V10.9H13.1367C13.2973 12.8635 13.9787 14.6807 15.042 16.2115ZM14.9439 9.1H17.9499C17.7825 7.60479 17.203 6.23416 16.3276 5.10434C15.5759 6.27969 15.0872 7.63879 14.9439 9.1ZM15.042 3.7885C13.9787 5.31935 13.2973 7.13646 13.1367 9.1H10.9V2.05006C12.4604 2.22475 13.8851 2.84826 15.042 3.7885ZM9.10001 17.9499C7.53945 17.7752 6.1146 17.1516 4.9576 16.2111C6.02095 14.6803 6.70261 12.8633 6.86331 10.9H9.10001V17.9499ZM5.05607 10.9C4.91267 12.3612 4.42373 13.72 3.67202 14.8952C2.79682 13.7654 2.21744 12.395 2.05007 10.9H5.05607ZM9.10001 9.1H6.86333C6.70272 7.13674 6.02142 5.31947 4.95804 3.7885C6.11496 2.84826 7.53965 2.22475 9.10001 2.05006V9.1ZM5.0561 9.1C4.91278 7.63858 4.42402 6.2796 3.67238 5.10437C2.79698 6.23418 2.21747 7.6048 2.05007 9.1H5.0561Z"/>
+<symbol id="icon-game" viewBox="0 0 24 24" fill="currentColor">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M12.75 19.463C14.2643 19.3126 15.6461 18.7119 16.7595 17.7966C15.6994 16.3648 15.0217 14.6317 14.8784 12.75H12.75V19.463ZM19.463 12.75C19.3145 14.2453 18.7269 15.6114 17.8309 16.7175C17.0317 15.5731 16.5157 14.2173 16.3836 12.75H19.463ZM16.7595 6.20342C15.6994 7.63521 15.0217 9.36838 14.8784 11.25H12.75V4.53703C14.2643 4.68738 15.6461 5.28813 16.7595 6.20342ZM16.3836 11.25C16.5157 9.78269 17.0317 8.42685 17.8309 7.28252C18.7269 8.38861 19.3145 9.75471 19.463 11.25H16.3836ZM11.25 19.463V12.75H9.12675C8.99677 14.6397 8.32797 16.3822 7.27341 17.8235C8.3811 18.7236 9.7506 19.3141 11.25 19.463ZM6.19597 16.7504C5.28487 15.6386 4.68697 14.2602 4.53703 12.75H7.62254C7.50234 14.2283 6.99272 15.5956 6.19597 16.7504ZM7.60964 11.25H4.53703C4.684 9.76971 5.26138 8.41604 6.14224 7.3159C6.94359 8.44966 7.46579 9.79388 7.60964 11.25ZM9.11584 11.25C8.9594 9.37658 8.27295 7.65289 7.20746 6.23073C8.32654 5.30008 9.7207 4.68887 11.25 4.53703V11.25H9.11584ZM12 21C16.9706 21 21 16.9706 21 12C21 7.02944 16.9706 3 12 3C7.02944 3 3 7.02944 3 12C3 16.9706 7.02944 21 12 21Z"/>
 </symbol>
 <symbol id="icon-github" viewBox="0 0 20 20" fill="currentColor">
   <path d="M7.26894971,14.8834111 C7.26894971,14.9490684 7.19284523,15.001959 7.09565157,15.001959 C6.98562101,15.0119899 6.90951653,14.9590994 6.90951653,14.8834111 C6.90951653,14.816842 6.98653793,14.7648633 7.08281467,14.7648633 C7.1827591,14.7539205 7.26894971,14.806811 7.26894971,14.8834111 Z M6.23466241,14.7347704 C6.21082245,14.8004277 6.27775771,14.8770278 6.37770214,14.8961778 C6.46389275,14.9299184 6.56383718,14.8961778 6.58400945,14.8305206 C6.6032648,14.7639514 6.53999722,14.6882632 6.44096971,14.6581703 C6.35386218,14.6353727 6.25758544,14.6682013 6.23466241,14.7347704 Z M7.70448736,14.6782322 C7.60821061,14.7010299 7.54219228,14.7639514 7.55136149,14.8405516 C7.56144762,14.9062088 7.64855515,14.9499803 7.74758266,14.9262707 C7.84477633,14.9034731 7.91079467,14.8405516 7.90070853,14.7739824 C7.89153932,14.7110609 7.80168102,14.6682013 7.70448736,14.6782322 Z M9.89409558,2 C5.27923034,2 1.75,5.48348178 1.75,10.0731058 C1.75,13.7417045 4.0716449,16.8813977 7.38906641,17.986628 C7.81451792,18.0623162 7.9639761,17.8015111 7.9639761,17.5863012 C7.9639761,17.3811223 7.95480689,16.2494467 7.95480689,15.5545741 C7.95480689,15.5545741 5.62582662,16.051563 5.13619061,14.5697154 C5.13619061,14.5697154 4.75750208,13.6058305 4.21193387,13.357792 C4.21193387,13.357792 3.44997221,12.8380055 4.26511531,12.8489484 C4.26511531,12.8489484 5.0930953,12.9146056 5.54880522,13.7024926 C6.27775771,14.9791613 7.49818005,14.6116631 7.97406224,14.3937175 C8.05108363,13.8648119 8.26747708,13.4973137 8.50587663,13.2784562 C6.64727702,13.0732773 4.77033898,12.8051769 4.77033898,9.62262413 C4.77033898,8.71254172 5.02340928,8.25658861 5.55614059,7.67388053 C5.46903306,7.45867066 5.18662128,6.57229781 5.6423312,5.4278555 C6.3373576,5.21264563 7.93738538,6.3215236 7.93738538,6.3215236 C8.61789979,6.13383695 9.32085186,6.03874118 10.0270492,6.03883267 C10.7329655,6.0384409 11.4356553,6.13354292 12.1157961,6.3215236 C12.1157961,6.3215236 13.7158238,5.208998 14.4117672,5.4278555 C14.8674771,6.57594544 14.5841484,7.45867066 14.4979578,7.67388053 C15.0297722,8.25932433 15.3561962,8.71618935 15.3561962,9.62262413 C15.3561962,12.8152078 13.3967352,13.0696297 11.5372187,13.2793681 C11.8434704,13.5401733 12.1029592,14.0362503 12.1029592,14.8141063 C12.1029592,15.9284557 12.092873,17.3081698 12.092873,17.5799178 C12.092873,17.7951277 12.2459989,18.0559329 12.6677827,17.9802447 C15.9952904,16.8813977 18.25,13.7417045 18.25,10.0731058 C18.25,5.48348178 14.5080439,2 9.89409558,2 Z M4.98398166,13.4106826 C4.93996944,13.4444231 4.95005557,13.5201113 5.0069047,13.5830329 C5.06008614,13.6359234 5.13619061,13.6587211 5.18020283,13.6158615 C5.22329814,13.5830329 5.213212,13.5064327 5.15636288,13.4444231 C5.10318144,13.3915326 5.02707697,13.367823 4.98398166,13.4106826 Z M4.62454849,13.1425822 C4.60070853,13.1863537 4.6337177,13.2392442 4.70065296,13.2720728 C4.7538344,13.3049015 4.81985274,13.2948705 4.84369269,13.2492752 C4.86753265,13.2055037 4.83452348,13.1526131 4.76758822,13.1197845 C4.70065296,13.0997226 4.64838844,13.1106654 4.62454849,13.1425822 Z M5.70193109,14.320765 C5.64874965,14.3636246 5.66892192,14.4630224 5.7450264,14.5259439 C5.82204779,14.6016321 5.91832453,14.6116631 5.96141984,14.5587725 C6.00451514,14.5159129 5.98525979,14.4165152 5.91832453,14.3535936 C5.84497083,14.2779054 5.7450264,14.2678744 5.70193109,14.320765 Z M5.32324257,13.834719 C5.27006113,13.8675476 5.27006113,13.9532668 5.32324257,14.0298669 C5.37642401,14.1055551 5.4662823,14.1392957 5.5093776,14.1055551 C5.56255904,14.0626955 5.56255904,13.9769764 5.5093776,13.9003762 C5.46261462,13.824688 5.37642401,13.7909475 5.32324257,13.834719 Z"/>
@@ -173,6 +173,9 @@
 <symbol id="icon-help" viewBox="0 0 20 20" fill="currentColor">
   <path d="M10.6195556,16.728 L10.6195556,14.2462222 C11.68,14.0924444 12.6062222,13.5546667 13.2702222,12.7742222 L15.3715556,14.0871111 C14.2533333,15.5528889 12.5564444,16.5511111 10.6195556,16.728 M3.25955556,10.3848889 L5.73688889,10.4711111 C5.86666667,11.6444444 6.46044444,12.6684444 7.34133333,13.3653333 L6.10133333,15.512 C4.472,14.3564444 3.37866667,12.5004444 3.25955556,10.3848889 M9.37955556,3.27111111 L9.37955556,5.75288889 C8.31911111,5.90755556 7.39288889,6.44444444 6.72888889,7.22488889 L4.62844444,5.91288889 C5.74666667,4.44711111 7.44355556,3.44888889 9.37955556,3.27111111 M16.7377778,9.57066667 L14.2586667,9.48355556 C14.1182222,8.32888889 13.5271111,7.32088889 12.6586667,6.63377778 L13.8977778,4.48711111 C15.5164444,5.63466667 16.6044444,7.47288889 16.7377778,9.57066667 M14.2284444,10.8115556 L16.6924444,10.8977778 C16.5911111,11.6586667 16.3635556,12.3777778 16.0302222,13.0373333 L13.9404444,11.7315556 C14.0693333,11.44 14.1662222,11.1324444 14.2284444,10.8115556 M10.6195556,5.75288889 L10.6195556,3.27111111 C11.4017778,3.34222222 12.1431111,3.55111111 12.8248889,3.86666667 L11.592,6.00266667 C11.2844444,5.88 10.9573333,5.80177778 10.6195556,5.75288889 M5.76711111,9.23111111 L3.30044444,9.14488889 C3.39911111,8.36888889 3.62933333,7.63466667 3.96977778,6.96266667 L6.05866667,8.26755556 C5.92444444,8.57244444 5.82755556,8.89511111 5.76711111,9.23111111 M10,13.0693333 C8.30577778,13.0693333 6.92977778,11.6924444 6.92977778,10 C6.92977778,8.30666667 8.30577778,6.92977778 10,6.92977778 C11.6933333,6.92977778 13.0702222,8.30666667 13.0702222,10 C13.0702222,11.6924444 11.6933333,13.0693333 10,13.0693333 M9.37955556,14.2462222 L9.37955556,16.728 C8.59822222,16.6568889 7.85688889,16.4488889 7.17422222,16.1324444 L8.408,13.9964444 C8.71466667,14.1191111 9.04266667,14.1973333 9.37955556,14.2462222 M10,2 C5.58933333,2 2,5.58844444 2,10 C2,14.4106667 5.58933333,18 10,18 C14.4106667,18 18,14.4106667 18,10 C18,5.58844444 14.4106667,2 10,2"/>
 </symbol>
+<symbol id="icon-home" viewBox="0 0 24 24" fill="currentColor">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M12.1887 4.58677C12.089 4.47108 11.9097 4.47108 11.81 4.58677L6.56305 10.6734V19.251C6.56305 19.3891 6.67498 19.501 6.81305 19.501H10V16C10 15.4477 10.4477 15 11 15H13C13.5523 15 14 15.4477 14 16V19.501H17.187C17.3251 19.501 17.437 19.3891 17.437 19.251V10.675L12.1887 4.58677ZM3.75001 13.5379H5.06305V19.251C5.06305 20.2175 5.84655 21.001 6.81305 21.001H17.187C18.1535 21.001 18.937 20.2175 18.937 19.251V13.5379H20.2487C20.542 13.5379 20.8083 13.367 20.9305 13.1004C21.0527 12.8338 21.0082 12.5204 20.8167 12.2982L13.3248 3.60737C12.6267 2.79754 11.372 2.79754 10.6739 3.60737L3.18195 12.2982C2.99046 12.5204 2.94601 12.8338 3.06819 13.1004C3.19036 13.367 3.45673 13.5379 3.75001 13.5379Z"/>
+</symbol>
 <symbol id="icon-hubot" viewBox="0 0 20 20" fill="currentColor">
   <path d="M5.42895234,7.66636423 C4.79816416,7.66835922 4.28743215,8.19014656 4.28596823,8.83408944 L4.28596823,11.1677252 C4.28792007,11.8113138 4.7985099,12.3325505 5.42895234,12.3345431 L14.5710477,12.3345431 C15.2021819,12.332546 15.7130563,11.8102077 15.7140318,11.1659106 L15.7140318,8.83318211 C15.7120799,8.18959354 15.2014901,7.66835677 14.5710477,7.66636423 L5.42895234,7.66636423 Z M14.5710477,9.70784187 L13.1427619,11.1668179 L11.4282857,11.1668179 L10,9.70874919 L8.57171425,11.1659106 L6.85634929,11.1659106 L5.42984113,9.70874919 L5.42984113,8.83318211 L6.28663482,8.83318211 L7.71492056,10.2912508 L9.14231752,8.83408944 L10.8576825,8.83408944 L12.2859682,10.2921581 L13.714254,8.83408944 L14.5710477,8.83408944 L14.5710477,9.70965651 L14.5710477,9.70784187 Z M7.71403177,13.5004537 L12.2859682,13.5004537 L12.2859682,14.6663642 L7.71403177,14.6663642 L7.71403177,13.5004537 Z M10,3 C5.58893456,3 2,6.39520415 2,10.5834089 L2,15.8331821 C2.00195185,16.4767707 2.51254167,16.9980075 3.14298411,17 L16.8570159,17 C17.4874583,16.9980075 17.9980482,16.4767707 18,15.8331821 L18,10.5834089 C18,6.39520415 14.4110654,3 9.99911121,3 L10,3 Z M16.8570159,15.8331821 L3.14298411,15.8331821 L3.14298411,10.5834089 C3.14298411,6.97861309 6.15953783,4.06156837 9.99911121,4.06156837 C13.8386846,4.06156837 16.8561271,6.97861309 16.8561271,10.5834089 L16.8561271,15.8331821 L16.8570159,15.8331821 Z"/>
 </symbol>

From be480b92581dc157c323a8f3d93e1cc225356940 Mon Sep 17 00:00:00 2001
From: Marcos Spessatto Defendi <marcos.defendi@ulbra.inf.br>
Date: Mon, 30 Mar 2020 01:14:21 -0300
Subject: [PATCH 098/223] Fix omnichannel agent activity monitor (#16979)

---
 .../server/statistics/LivechatAgentActivityMonitor.js       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/livechat/server/statistics/LivechatAgentActivityMonitor.js b/app/livechat/server/statistics/LivechatAgentActivityMonitor.js
index 2f0dd987bfbd..413a36014cb0 100644
--- a/app/livechat/server/statistics/LivechatAgentActivityMonitor.js
+++ b/app/livechat/server/statistics/LivechatAgentActivityMonitor.js
@@ -52,11 +52,11 @@ export class LivechatAgentActivityMonitor {
 			return;
 		}
 		const today = moment(new Date());
-		const yesterday = today.clone().subtract(1, 'days');
-		const stoppedAt = new Date(yesterday.year(), yesterday.month(), yesterday.date(), 23, 59, 59);
 		const startedAt = new Date(today.year(), today.month(), today.date());
 		for (const session of openLivechatAgentSessions) {
-			const data = { ...formatDate(yesterday), agentId: session.agentId };
+			const startDate = moment(session.lastStartedAt);
+			const stoppedAt = new Date(startDate.year(), startDate.month(), startDate.date(), 23, 59, 59);
+			const data = { ...formatDate(startDate.toDate()), agentId: session.agentId };
 			const availableTime = moment(stoppedAt).diff(moment(new Date(session.lastStartedAt)), 'seconds');
 			LivechatAgentActivity.updateLastStoppedAt({ ...data, availableTime, lastStoppedAt: stoppedAt });
 			LivechatAgentActivity.updateServiceHistory({ ...data, serviceHistory: { startedAt: session.lastStartedAt, stoppedAt } });

From 43c78e40bbcc6dbf5c647d45673b56b07ae0d067 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 30 Mar 2020 01:17:36 -0300
Subject: [PATCH 099/223] =?UTF-8?q?Add=20User=E2=80=99s=20index=20for=20fi?=
 =?UTF-8?q?eld=20`appId`=20(#17075)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/server/models/Users.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/server/models/Users.js b/app/models/server/models/Users.js
index c0bbea891b17..b7c59bc91666 100644
--- a/app/models/server/models/Users.js
+++ b/app/models/server/models/Users.js
@@ -36,6 +36,7 @@ export class Users extends Base {
 		this.tryEnsureIndex({ statusText: 1 });
 		this.tryEnsureIndex({ active: 1 }, { sparse: 1 });
 		this.tryEnsureIndex({ statusConnection: 1 }, { sparse: 1 });
+		this.tryEnsureIndex({ appId: 1 }, { sparse: 1 });
 		this.tryEnsureIndex({ type: 1 });
 		this.tryEnsureIndex({ 'visitorEmails.address': 1 });
 		this.tryEnsureIndex({ federation: 1 }, { sparse: true });

From 6935e49ff6efd6660a638cb1661fd8fb8aeb3dd4 Mon Sep 17 00:00:00 2001
From: Govind Dixit <GOVINDDIXIT93@GMAIL.COM>
Date: Mon, 30 Mar 2020 10:18:18 +0530
Subject: [PATCH 100/223] [FIX] Verification email body (#17062)

* fix: verification email description

* update verification email body

* Update en.i18n.json

Co-authored-by: Gabriel Engel <gabriel.engel@gmail.com>
---
 packages/rocketchat-i18n/i18n/en.i18n.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index cf6c235a422a..684b93902460 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -3427,7 +3427,7 @@
   "Use_initials_avatar": "Use your username initials",
   "Use_minor_colors": "Use minor color palette (defaults inherit major colors)",
   "Use_service_avatar": "Use %s avatar",
-  "Verification_Email": "Click <a href=\"[Verification_Url]\">here</a> to verify your account.",
+  "Verification_Email": "Click <a href=\"[Verification_Url]\">here</a> to verify your email address.",
   "Use_this_username": "Use this username",
   "Use_uploaded_avatar": "Use uploaded avatar",
   "Use_url_for_avatar": "Use URL for avatar",
@@ -3535,11 +3535,11 @@
   "Value_messages": "__value__ messages",
   "Value_users": "__value__ users",
   "Validate_email_address": "Validate Email Address",
-  "Verification_email_body": "You have succesfully created an account on [Site_Name]. Please, click on the button below to confirm your email address and finish registration.",
+  "Verification_email_body": "Please, click on the button below to confirm your email address.",
   "Verification": "Verification",
   "Verification_Description": "You may use the following placeholders: <br/><ul><li>[Verification_Url] for the verification URL.</li><li>[name], [fname], [lname] for the user's full name, first name or last name, respectively.</li><li>[email] for the user's email.</li><li>[Site_Name] and [Site_URL] for the Application Name and URL respectively.</li></ul>",
   "Verification_email_sent": "Verification email sent",
-  "Verification_Email_Subject": "[Site_Name] - Verify your account",
+  "Verification_Email_Subject": "[Site_Name] - Email address verification",
   "Verified": "Verified",
   "Verify": "Verify",
   "Verify_your_email": "Verify your email",

From bd8c31926ffc001e8b98cb7617303af1f1eda39f Mon Sep 17 00:00:00 2001
From: Douglas Gubert <d-gubert@users.noreply.github.com>
Date: Mon, 30 Mar 2020 09:47:36 -0300
Subject: [PATCH 101/223] [NEW] Add update method for user bridge (#17077)

---
 app/apps/server/bridges/users.js          |  24 +-
 app/lib/server/functions/index.js         |   2 +-
 app/lib/server/functions/setStatusText.js |  24 ++
 app/models/server/raw/Users.js            |  10 +
 package-lock.json                         | 254 +++++++++++-----------
 package.json                              |   2 +-
 tests/data/apps/apps-data.js              |   2 +-
 7 files changed, 187 insertions(+), 131 deletions(-)

diff --git a/app/apps/server/bridges/users.js b/app/apps/server/bridges/users.js
index a35a9502eb63..5aac0567bed6 100644
--- a/app/apps/server/bridges/users.js
+++ b/app/apps/server/bridges/users.js
@@ -1,7 +1,8 @@
 import { Random } from 'meteor/random';
 
-import { setUserAvatar, checkUsernameAvailability, deleteUser } from '../../../lib/server/functions';
+import { setUserAvatar, checkUsernameAvailability, deleteUser, _setStatusTextPromise } from '../../../lib/server/functions';
 import { Users } from '../../../models';
+import { Users as UsersRaw } from '../../../models/server/raw';
 
 
 export class AppUserBridge {
@@ -79,6 +80,27 @@ export class AppUserBridge {
 		return true;
 	}
 
+	async update(user, fields, appId) {
+		this.orch.debugLog(`The App ${ appId } is updating a user`);
+
+		if (!user) {
+			throw new Error('User not provided');
+		}
+
+		if (typeof fields.statusText === 'string') {
+			await _setStatusTextPromise(user.id, fields.statusText);
+			delete fields.statusText;
+		}
+
+		if (!Object.keys(fields).length) {
+			return true;
+		}
+
+		await UsersRaw.update({ _id: user.id }, { $set: fields });
+
+		return true;
+	}
+
 	async getActiveUserCount() {
 		return Users.getActiveLocalUserCount();
 	}
diff --git a/app/lib/server/functions/index.js b/app/lib/server/functions/index.js
index f318ad2ccbb1..768573671648 100644
--- a/app/lib/server/functions/index.js
+++ b/app/lib/server/functions/index.js
@@ -24,7 +24,7 @@ export { saveUser } from './saveUser';
 export { sendMessage } from './sendMessage';
 export { setEmail } from './setEmail';
 export { setRealName, _setRealName } from './setRealName';
-export { setStatusText, _setStatusText } from './setStatusText';
+export { setStatusText, _setStatusText, _setStatusTextPromise } from './setStatusText';
 export { getStatusText } from './getStatusText';
 export { setUserAvatar } from './setUserAvatar';
 export { _setUsername, setUsername } from './setUsername';
diff --git a/app/lib/server/functions/setStatusText.js b/app/lib/server/functions/setStatusText.js
index 3b06c36ab28d..1db1020bc18e 100644
--- a/app/lib/server/functions/setStatusText.js
+++ b/app/lib/server/functions/setStatusText.js
@@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import s from 'underscore.string';
 
 import { Users } from '../../../models';
+import { Users as UsersRaw } from '../../../models/server/raw';
 import { Notifications } from '../../../notifications';
 import { hasPermission } from '../../../authorization';
 import { RateLimiter } from '../lib';
@@ -14,6 +15,29 @@ const STATUS_MAP = {
 	busy: 3,
 };
 
+export const _setStatusTextPromise = async function(userId, statusText) {
+	if (!userId) { return false; }
+
+	statusText = s.trim(statusText).substr(0, 120);
+
+	const user = await UsersRaw.findOneById(userId);
+
+	if (!user) { return false; }
+
+	if (user.statusText === statusText) { return true; }
+
+	await UsersRaw.updateStatusText(user._id, statusText);
+
+	Notifications.notifyLogged('user-status', [
+		user._id,
+		user.username,
+		STATUS_MAP[user.status],
+		statusText,
+	]);
+
+	return true;
+};
+
 export const _setStatusText = function(userId, statusText) {
 	statusText = s.trim(statusText);
 	if (statusText.length > 120) {
diff --git a/app/models/server/raw/Users.js b/app/models/server/raw/Users.js
index 1984357c52db..30f45692d77e 100644
--- a/app/models/server/raw/Users.js
+++ b/app/models/server/raw/Users.js
@@ -214,4 +214,14 @@ export class UsersRaw extends BaseRaw {
 		params.push(group);
 		return this.col.aggregate(params).toArray();
 	}
+
+	updateStatusText(_id, statusText) {
+		const update = {
+			$set: {
+				statusText,
+			},
+		};
+
+		return this.update({ _id }, update);
+	}
 }
diff --git a/package-lock.json b/package-lock.json
index f9284e1d890b..53f7a877b7d5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2844,9 +2844,9 @@
 			}
 		},
 		"@rocket.chat/apps-engine": {
-			"version": "1.13.0-beta.2931",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/apps-engine/-/apps-engine-1.13.0-beta.2931.tgz",
-			"integrity": "sha512-+0imJAd/vb0Yfqg+FUTCZ9e0+wZyh9ZCwtCakOmuJN5hp40NtouiVnTqwzHwUHwfHd8NYmxQ8Vb35zLsvUiYbg==",
+			"version": "1.13.0-beta.3003",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/apps-engine/-/apps-engine-1.13.0-beta.3003.tgz",
+			"integrity": "sha512-RGegax9zaDzQta7U1v05JYUgJUhrGlYBYioMdCJRvKs6NrmJNbpdeJ6A0Bu6pNKF9ppMkG17hfxI6xT0MoSd0w==",
 			"requires": {
 				"adm-zip": "^0.4.9",
 				"cryptiles": "^4.1.3",
@@ -15343,28 +15343,28 @@
 			"dependencies": {
 				"abbrev": {
 					"version": "1.1.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
 					"integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
 					"dev": true,
 					"optional": true
 				},
 				"ansi-regex": {
 					"version": "2.1.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
 					"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
 					"dev": true,
 					"optional": true
 				},
 				"aproba": {
 					"version": "1.2.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
 					"integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
 					"dev": true,
 					"optional": true
 				},
 				"are-we-there-yet": {
 					"version": "1.1.5",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
 					"integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
 					"dev": true,
 					"optional": true,
@@ -15375,14 +15375,14 @@
 				},
 				"balanced-match": {
 					"version": "1.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
 					"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
 					"dev": true,
 					"optional": true
 				},
 				"brace-expansion": {
 					"version": "1.1.11",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
 					"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
 					"dev": true,
 					"optional": true,
@@ -15400,28 +15400,28 @@
 				},
 				"code-point-at": {
 					"version": "1.1.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
 					"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
 					"dev": true,
 					"optional": true
 				},
 				"concat-map": {
 					"version": "0.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
 					"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
 					"dev": true,
 					"optional": true
 				},
 				"console-control-strings": {
 					"version": "1.1.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
 					"integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
 					"dev": true,
 					"optional": true
 				},
 				"core-util-is": {
 					"version": "1.0.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
 					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
 					"dev": true,
 					"optional": true
@@ -15438,21 +15438,21 @@
 				},
 				"deep-extend": {
 					"version": "0.6.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
 					"integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
 					"dev": true,
 					"optional": true
 				},
 				"delegates": {
 					"version": "1.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
 					"integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
 					"dev": true,
 					"optional": true
 				},
 				"detect-libc": {
 					"version": "1.0.3",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
 					"integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
 					"dev": true,
 					"optional": true
@@ -15469,14 +15469,14 @@
 				},
 				"fs.realpath": {
 					"version": "1.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
 					"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
 					"dev": true,
 					"optional": true
 				},
 				"gauge": {
 					"version": "2.7.4",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
 					"integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
 					"dev": true,
 					"optional": true,
@@ -15508,14 +15508,14 @@
 				},
 				"has-unicode": {
 					"version": "2.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
 					"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
 					"dev": true,
 					"optional": true
 				},
 				"iconv-lite": {
 					"version": "0.4.24",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
 					"integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
 					"dev": true,
 					"optional": true,
@@ -15535,7 +15535,7 @@
 				},
 				"inflight": {
 					"version": "1.0.6",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
 					"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
 					"dev": true,
 					"optional": true,
@@ -15553,14 +15553,14 @@
 				},
 				"ini": {
 					"version": "1.3.5",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
 					"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
 					"dev": true,
 					"optional": true
 				},
 				"is-fullwidth-code-point": {
 					"version": "1.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
 					"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
 					"dev": true,
 					"optional": true,
@@ -15570,14 +15570,14 @@
 				},
 				"isarray": {
 					"version": "1.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
 					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
 					"dev": true,
 					"optional": true
 				},
 				"minimatch": {
 					"version": "3.0.4",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
 					"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
 					"dev": true,
 					"optional": true,
@@ -15587,7 +15587,7 @@
 				},
 				"minimist": {
 					"version": "0.0.8",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
 					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
 					"dev": true,
 					"optional": true
@@ -15615,7 +15615,7 @@
 				},
 				"mkdirp": {
 					"version": "0.5.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
 					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
 					"dev": true,
 					"optional": true,
@@ -15670,7 +15670,7 @@
 				},
 				"nopt": {
 					"version": "4.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
 					"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
 					"dev": true,
 					"optional": true,
@@ -15699,7 +15699,7 @@
 				},
 				"npmlog": {
 					"version": "4.1.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
 					"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
 					"dev": true,
 					"optional": true,
@@ -15712,21 +15712,21 @@
 				},
 				"number-is-nan": {
 					"version": "1.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
 					"integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
 					"dev": true,
 					"optional": true
 				},
 				"object-assign": {
 					"version": "4.1.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
 					"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
 					"dev": true,
 					"optional": true
 				},
 				"once": {
 					"version": "1.4.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
 					"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
 					"dev": true,
 					"optional": true,
@@ -15736,21 +15736,21 @@
 				},
 				"os-homedir": {
 					"version": "1.0.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
 					"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
 					"dev": true,
 					"optional": true
 				},
 				"os-tmpdir": {
 					"version": "1.0.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
 					"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
 					"dev": true,
 					"optional": true
 				},
 				"osenv": {
 					"version": "0.1.5",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
 					"integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
 					"dev": true,
 					"optional": true,
@@ -15761,7 +15761,7 @@
 				},
 				"path-is-absolute": {
 					"version": "1.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
 					"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
 					"dev": true,
 					"optional": true
@@ -15775,7 +15775,7 @@
 				},
 				"rc": {
 					"version": "1.2.8",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
 					"integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
 					"dev": true,
 					"optional": true,
@@ -15788,7 +15788,7 @@
 					"dependencies": {
 						"minimist": {
 							"version": "1.2.0",
-							"resolved": false,
+							"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
 							"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
 							"dev": true,
 							"optional": true
@@ -15797,7 +15797,7 @@
 				},
 				"readable-stream": {
 					"version": "2.3.6",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
 					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
 					"dev": true,
 					"optional": true,
@@ -15823,21 +15823,21 @@
 				},
 				"safe-buffer": {
 					"version": "5.1.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
 					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
 					"dev": true,
 					"optional": true
 				},
 				"safer-buffer": {
 					"version": "2.1.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
 					"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
 					"dev": true,
 					"optional": true
 				},
 				"sax": {
 					"version": "1.2.4",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
 					"integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
 					"dev": true,
 					"optional": true
@@ -15851,21 +15851,21 @@
 				},
 				"set-blocking": {
 					"version": "2.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
 					"integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
 					"dev": true,
 					"optional": true
 				},
 				"signal-exit": {
 					"version": "3.0.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
 					"integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
 					"dev": true,
 					"optional": true
 				},
 				"string-width": {
 					"version": "1.0.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
 					"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
 					"dev": true,
 					"optional": true,
@@ -15877,7 +15877,7 @@
 				},
 				"string_decoder": {
 					"version": "1.1.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
 					"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 					"dev": true,
 					"optional": true,
@@ -15887,7 +15887,7 @@
 				},
 				"strip-ansi": {
 					"version": "3.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
 					"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
 					"dev": true,
 					"optional": true,
@@ -15897,7 +15897,7 @@
 				},
 				"strip-json-comments": {
 					"version": "2.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
 					"integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
 					"dev": true,
 					"optional": true
@@ -15920,14 +15920,14 @@
 				},
 				"util-deprecate": {
 					"version": "1.0.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
 					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
 					"dev": true,
 					"optional": true
 				},
 				"wide-align": {
 					"version": "1.1.3",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
 					"integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
 					"dev": true,
 					"optional": true,
@@ -15937,7 +15937,7 @@
 				},
 				"wrappy": {
 					"version": "1.0.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
 					"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
 					"dev": true,
 					"optional": true
@@ -20399,7 +20399,7 @@
 			"dependencies": {
 				"asn1.js": {
 					"version": "4.10.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
 					"integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
 					"requires": {
 						"bn.js": "^4.0.0",
@@ -20409,7 +20409,7 @@
 				},
 				"assert": {
 					"version": "1.4.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz",
 					"integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=",
 					"requires": {
 						"util": "0.10.3"
@@ -20417,7 +20417,7 @@
 					"dependencies": {
 						"util": {
 							"version": "0.10.3",
-							"resolved": false,
+							"resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
 							"integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
 							"requires": {
 								"inherits": "2.0.1"
@@ -20427,22 +20427,22 @@
 				},
 				"base64-js": {
 					"version": "1.3.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz",
 					"integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw=="
 				},
 				"bn.js": {
 					"version": "4.11.8",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
 					"integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA=="
 				},
 				"brorand": {
 					"version": "1.1.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
 					"integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8="
 				},
 				"browserify-aes": {
 					"version": "1.2.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
 					"integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
 					"requires": {
 						"buffer-xor": "^1.0.3",
@@ -20455,7 +20455,7 @@
 				},
 				"browserify-cipher": {
 					"version": "1.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
 					"integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
 					"requires": {
 						"browserify-aes": "^1.0.4",
@@ -20465,7 +20465,7 @@
 				},
 				"browserify-des": {
 					"version": "1.0.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
 					"integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
 					"requires": {
 						"cipher-base": "^1.0.1",
@@ -20476,7 +20476,7 @@
 				},
 				"browserify-rsa": {
 					"version": "4.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
 					"integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
 					"requires": {
 						"bn.js": "^4.1.0",
@@ -20485,7 +20485,7 @@
 				},
 				"browserify-sign": {
 					"version": "4.0.4",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
 					"integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
 					"requires": {
 						"bn.js": "^4.1.1",
@@ -20499,7 +20499,7 @@
 				},
 				"browserify-zlib": {
 					"version": "0.2.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
 					"integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
 					"requires": {
 						"pako": "~1.0.5"
@@ -20507,7 +20507,7 @@
 				},
 				"buffer": {
 					"version": "5.2.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz",
 					"integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==",
 					"requires": {
 						"base64-js": "^1.0.2",
@@ -20516,17 +20516,17 @@
 				},
 				"buffer-xor": {
 					"version": "1.0.3",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
 					"integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
 				},
 				"builtin-status-codes": {
 					"version": "3.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
 					"integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug="
 				},
 				"cipher-base": {
 					"version": "1.0.4",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
 					"integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
 					"requires": {
 						"inherits": "^2.0.1",
@@ -20535,7 +20535,7 @@
 				},
 				"console-browserify": {
 					"version": "1.1.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
 					"integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
 					"requires": {
 						"date-now": "^0.1.4"
@@ -20543,17 +20543,17 @@
 				},
 				"constants-browserify": {
 					"version": "1.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
 					"integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U="
 				},
 				"core-util-is": {
 					"version": "1.0.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
 					"integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
 				},
 				"create-ecdh": {
 					"version": "4.0.3",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
 					"integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
 					"requires": {
 						"bn.js": "^4.1.0",
@@ -20562,7 +20562,7 @@
 				},
 				"create-hash": {
 					"version": "1.2.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
 					"integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
 					"requires": {
 						"cipher-base": "^1.0.1",
@@ -20574,7 +20574,7 @@
 				},
 				"create-hmac": {
 					"version": "1.1.7",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
 					"integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
 					"requires": {
 						"cipher-base": "^1.0.3",
@@ -20587,7 +20587,7 @@
 				},
 				"crypto-browserify": {
 					"version": "3.12.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
 					"integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
 					"requires": {
 						"browserify-cipher": "^1.0.0",
@@ -20605,12 +20605,12 @@
 				},
 				"date-now": {
 					"version": "0.1.4",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz",
 					"integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs="
 				},
 				"des.js": {
 					"version": "1.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz",
 					"integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=",
 					"requires": {
 						"inherits": "^2.0.1",
@@ -20619,7 +20619,7 @@
 				},
 				"diffie-hellman": {
 					"version": "5.0.3",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
 					"integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
 					"requires": {
 						"bn.js": "^4.1.0",
@@ -20629,12 +20629,12 @@
 				},
 				"domain-browser": {
 					"version": "1.2.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
 					"integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA=="
 				},
 				"elliptic": {
 					"version": "6.4.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.1.tgz",
 					"integrity": "sha512-BsXLz5sqX8OHcsh7CqBMztyXARmGQ3LWPtGjJi6DiJHq5C/qvi9P3OqgswKSDftbu8+IoI/QDTAm2fFnQ9SZSQ==",
 					"requires": {
 						"bn.js": "^4.4.0",
@@ -20648,12 +20648,12 @@
 				},
 				"events": {
 					"version": "3.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
 					"integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA=="
 				},
 				"evp_bytestokey": {
 					"version": "1.0.3",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
 					"integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
 					"requires": {
 						"md5.js": "^1.3.4",
@@ -20662,7 +20662,7 @@
 				},
 				"hash-base": {
 					"version": "3.0.4",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
 					"integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
 					"requires": {
 						"inherits": "^2.0.1",
@@ -20671,7 +20671,7 @@
 				},
 				"hash.js": {
 					"version": "1.1.7",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
 					"integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
 					"requires": {
 						"inherits": "^2.0.3",
@@ -20680,14 +20680,14 @@
 					"dependencies": {
 						"inherits": {
 							"version": "2.0.3",
-							"resolved": false,
+							"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
 							"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
 						}
 					}
 				},
 				"hmac-drbg": {
 					"version": "1.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
 					"integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
 					"requires": {
 						"hash.js": "^1.0.3",
@@ -20697,27 +20697,27 @@
 				},
 				"https-browserify": {
 					"version": "1.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
 					"integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM="
 				},
 				"ieee754": {
 					"version": "1.1.13",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
 					"integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
 				},
 				"inherits": {
 					"version": "2.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
 					"integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE="
 				},
 				"isarray": {
 					"version": "1.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
 					"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
 				},
 				"md5.js": {
 					"version": "1.3.5",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
 					"integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
 					"requires": {
 						"hash-base": "^3.0.0",
@@ -20727,7 +20727,7 @@
 				},
 				"miller-rabin": {
 					"version": "4.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
 					"integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
 					"requires": {
 						"bn.js": "^4.0.0",
@@ -20736,27 +20736,27 @@
 				},
 				"minimalistic-assert": {
 					"version": "1.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
 					"integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
 				},
 				"minimalistic-crypto-utils": {
 					"version": "1.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
 					"integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo="
 				},
 				"os-browserify": {
 					"version": "0.3.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
 					"integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc="
 				},
 				"pako": {
 					"version": "1.0.10",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
 					"integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw=="
 				},
 				"parse-asn1": {
 					"version": "5.1.4",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz",
 					"integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==",
 					"requires": {
 						"asn1.js": "^4.0.0",
@@ -20769,12 +20769,12 @@
 				},
 				"path-browserify": {
 					"version": "1.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.0.tgz",
 					"integrity": "sha512-Hkavx/nY4/plImrZPHRk2CL9vpOymZLgEbMNX1U0bjcBL7QN9wODxyx0yaMZURSQaUtSEvDrfAvxa9oPb0at9g=="
 				},
 				"pbkdf2": {
 					"version": "3.0.17",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
 					"integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
 					"requires": {
 						"create-hash": "^1.1.2",
@@ -20786,17 +20786,17 @@
 				},
 				"process": {
 					"version": "0.11.10",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
 					"integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
 				},
 				"process-nextick-args": {
 					"version": "2.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
 					"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
 				},
 				"public-encrypt": {
 					"version": "4.0.3",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
 					"integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
 					"requires": {
 						"bn.js": "^4.1.0",
@@ -20809,22 +20809,22 @@
 				},
 				"punycode": {
 					"version": "2.1.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
 					"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
 				},
 				"querystring": {
 					"version": "0.2.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
 					"integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA="
 				},
 				"querystring-es3": {
 					"version": "0.2.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
 					"integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM="
 				},
 				"randombytes": {
 					"version": "2.1.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
 					"integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
 					"requires": {
 						"safe-buffer": "^5.1.0"
@@ -20832,7 +20832,7 @@
 				},
 				"randomfill": {
 					"version": "1.0.4",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
 					"integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
 					"requires": {
 						"randombytes": "^2.0.5",
@@ -20841,7 +20841,7 @@
 				},
 				"readable-stream": {
 					"version": "3.3.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.3.0.tgz",
 					"integrity": "sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==",
 					"requires": {
 						"inherits": "^2.0.3",
@@ -20851,14 +20851,14 @@
 					"dependencies": {
 						"inherits": {
 							"version": "2.0.3",
-							"resolved": false,
+							"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
 							"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
 						}
 					}
 				},
 				"ripemd160": {
 					"version": "2.0.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
 					"integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
 					"requires": {
 						"hash-base": "^3.0.0",
@@ -20867,17 +20867,17 @@
 				},
 				"safe-buffer": {
 					"version": "5.1.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
 					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
 				},
 				"setimmediate": {
 					"version": "1.0.5",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
 					"integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
 				},
 				"sha.js": {
 					"version": "2.4.11",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
 					"integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
 					"requires": {
 						"inherits": "^2.0.1",
@@ -20886,7 +20886,7 @@
 				},
 				"stream-browserify": {
 					"version": "2.0.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
 					"integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
 					"requires": {
 						"inherits": "~2.0.1",
@@ -20895,7 +20895,7 @@
 					"dependencies": {
 						"readable-stream": {
 							"version": "2.3.6",
-							"resolved": false,
+							"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
 							"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
 							"requires": {
 								"core-util-is": "~1.0.0",
@@ -20909,14 +20909,14 @@
 							"dependencies": {
 								"inherits": {
 									"version": "2.0.3",
-									"resolved": false,
+									"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
 									"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
 								}
 							}
 						},
 						"string_decoder": {
 							"version": "1.1.1",
-							"resolved": false,
+							"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
 							"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 							"requires": {
 								"safe-buffer": "~5.1.0"
@@ -20926,7 +20926,7 @@
 				},
 				"stream-http": {
 					"version": "3.0.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.0.0.tgz",
 					"integrity": "sha512-JELJfd+btL9GHtxU3+XXhg9NLYrKFnhybfvRuDghtyVkOFydz3PKNT1df07AMr88qW03WHF+FSV0PySpXignCA==",
 					"requires": {
 						"builtin-status-codes": "^3.0.0",
@@ -20937,7 +20937,7 @@
 				},
 				"string_decoder": {
 					"version": "1.2.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.2.0.tgz",
 					"integrity": "sha512-6YqyX6ZWEYguAxgZzHGL7SsCeGx3V2TtOTqZz1xSTSWnqsbWwbptafNyvf/ACquZUXV3DANr5BDIwNYe1mN42w==",
 					"requires": {
 						"safe-buffer": "~5.1.0"
@@ -20945,7 +20945,7 @@
 				},
 				"timers-browserify": {
 					"version": "2.0.10",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz",
 					"integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==",
 					"requires": {
 						"setimmediate": "^1.0.4"
@@ -20953,12 +20953,12 @@
 				},
 				"tty-browserify": {
 					"version": "0.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.1.tgz",
 					"integrity": "sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw=="
 				},
 				"url": {
 					"version": "0.11.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
 					"integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
 					"requires": {
 						"punycode": "1.3.2",
@@ -20967,14 +20967,14 @@
 					"dependencies": {
 						"punycode": {
 							"version": "1.3.2",
-							"resolved": false,
+							"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
 							"integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
 						}
 					}
 				},
 				"util": {
 					"version": "0.11.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
 					"integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
 					"requires": {
 						"inherits": "2.0.3"
@@ -20982,24 +20982,24 @@
 					"dependencies": {
 						"inherits": {
 							"version": "2.0.3",
-							"resolved": false,
+							"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
 							"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
 						}
 					}
 				},
 				"util-deprecate": {
 					"version": "1.0.2",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
 					"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
 				},
 				"vm-browserify": {
 					"version": "1.1.0",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz",
 					"integrity": "sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw=="
 				},
 				"xtend": {
 					"version": "4.0.1",
-					"resolved": false,
+					"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
 					"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
 				}
 			}
diff --git a/package.json b/package.json
index 44a87bc90d54..4cef01785a23 100644
--- a/package.json
+++ b/package.json
@@ -128,7 +128,7 @@
 		"@nivo/heatmap": "^0.61.0",
 		"@nivo/line": "^0.61.1",
 		"@nivo/pie": "^0.61.1",
-		"@rocket.chat/apps-engine": "^1.13.0-beta.2931",
+		"@rocket.chat/apps-engine": "^1.13.0-beta.3003",
 		"@rocket.chat/fuselage": "^0.6.1",
 		"@rocket.chat/fuselage-hooks": "^0.6.1",
 		"@rocket.chat/fuselage-ui-kit": "^0.6.1",
diff --git a/tests/data/apps/apps-data.js b/tests/data/apps/apps-data.js
index 1602396ed790..26b6137c79e8 100644
--- a/tests/data/apps/apps-data.js
+++ b/tests/data/apps/apps-data.js
@@ -1,4 +1,4 @@
 export const APP_URL = 'https://github.com/RocketChat/Apps.RocketChat.Tester/blob/master/dist/appsrocketchattester_0.0.1.zip?raw=true';
 export const APP_NAME = 'Apps.RocketChat.Tester';
-export const APP_USERNAME = 'app.appsrocketchattester';
+export const APP_USERNAME = 'appsrocketchattester.bot';
 export const apps = (path = '') => `/api/apps${ path }`;

From 8f9a85552cbf94f04a100cf0da049eb7ef8ca031 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Mon, 30 Mar 2020 09:59:26 -0300
Subject: [PATCH 102/223] Bump version to 3.1.0-rc.3

---
 .docker/Dockerfile.rhel   |  2 +-
 .github/history.json      | 89 +++++++++++++++++++++++++++++++++++++++
 HISTORY.md                | 47 +++++++++++++++++++++
 app/utils/rocketchat.info |  2 +-
 package.json              |  2 +-
 5 files changed, 139 insertions(+), 3 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index d745754463e2..aeff4306f56c 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.1.0-rc.2
+ENV RC_VERSION 3.1.0-rc.3
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index e9d5e2eb343b..834d6a29aaa5 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -41424,6 +41424,95 @@
           ]
         }
       ]
+    },
+    "3.1.0-rc.3": {
+      "node_version": "12.16.1",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "17077",
+          "title": "[NEW] Add update method for user bridge",
+          "userLogin": "d-gubert",
+          "milestone": "3.1.0",
+          "contributors": [
+            "d-gubert",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "17062",
+          "title": "[FIX] Verification email body",
+          "userLogin": "GOVINDDIXIT",
+          "milestone": "3.1.0",
+          "contributors": [
+            "GOVINDDIXIT",
+            "web-flow",
+            "engelgabriel"
+          ]
+        },
+        {
+          "pr": "17075",
+          "title": "Add User’s index for field `appId`",
+          "userLogin": "rodrigok",
+          "milestone": "3.1.0",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "16979",
+          "title": "Regression: OmniChannel agent activity monitor was counting time wrongly",
+          "userLogin": "MarcosSpessatto",
+          "milestone": "3.1.0",
+          "contributors": [
+            "MarcosSpessatto",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "17052",
+          "title": "[NEW] Home button on sidebar",
+          "userLogin": "gabriellsh",
+          "milestone": "3.2.0",
+          "contributors": [
+            "gabriellsh",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "17073",
+          "title": "[IMPROVE] Repeat “Reply In Thread” and “Add Reaction” inside the message actions menu",
+          "userLogin": "rodrigok",
+          "milestone": "3.1.0",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "17074",
+          "title": "Regression: Broken Search if users without DM subscriptions are listed",
+          "userLogin": "tassoevan",
+          "milestone": "3.1.0",
+          "contributors": [
+            "tassoevan"
+          ]
+        },
+        {
+          "pr": "17072",
+          "title": "[IMPROVE] Tab Bar actions reorder",
+          "userLogin": "rodrigok",
+          "milestone": "3.1.0",
+          "contributors": [
+            "rodrigok",
+            "tassoevan"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/HISTORY.md b/HISTORY.md
index c6d6ba155b57..377a86f4b3f2 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,6 +1,53 @@
 
 # 3.1.0 (Under Release Candidate Process)
 
+## 3.1.0-rc.3
+`2020-03-30  ·  2 🎉  ·  2 🚀  ·  1 🐛  ·  3 🔍  ·  7 👩‍💻👨‍💻`
+
+### 🎉 New features
+
+
+- Add update method for user bridge ([#17077](https://github.com/RocketChat/Rocket.Chat/pull/17077))
+
+- Home button on sidebar ([#17052](https://github.com/RocketChat/Rocket.Chat/pull/17052))
+
+### 🚀 Improvements
+
+
+- Repeat “Reply In Thread” and “Add Reaction” inside the message actions menu ([#17073](https://github.com/RocketChat/Rocket.Chat/pull/17073))
+
+- Tab Bar actions reorder ([#17072](https://github.com/RocketChat/Rocket.Chat/pull/17072))
+
+### 🐛 Bug fixes
+
+
+- Verification email body ([#17062](https://github.com/RocketChat/Rocket.Chat/pull/17062) by [@GOVINDDIXIT](https://github.com/GOVINDDIXIT))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Add User’s index for field `appId` ([#17075](https://github.com/RocketChat/Rocket.Chat/pull/17075))
+
+- Regression: OmniChannel agent activity monitor was counting time wrongly ([#16979](https://github.com/RocketChat/Rocket.Chat/pull/16979))
+
+- Regression: Broken Search if users without DM subscriptions are listed ([#17074](https://github.com/RocketChat/Rocket.Chat/pull/17074))
+
+</details>
+
+### 👩‍💻👨‍💻 Contributors 😍
+
+- [@GOVINDDIXIT](https://github.com/GOVINDDIXIT)
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+- [@d-gubert](https://github.com/d-gubert)
+- [@engelgabriel](https://github.com/engelgabriel)
+- [@gabriellsh](https://github.com/gabriellsh)
+- [@rodrigok](https://github.com/rodrigok)
+- [@tassoevan](https://github.com/tassoevan)
+
 ## 3.1.0-rc.2
 `2020-03-29  ·  9 🔍  ·  5 👩‍💻👨‍💻`
 
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index ce1762217111..04d13e2d8e18 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.1.0-rc.2"
+	"version": "3.1.0-rc.3"
 }
diff --git a/package.json b/package.json
index 5ab41575b5a5..6b623ada5fc2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.1.0-rc.2",
+	"version": "3.1.0-rc.3",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

From cbad300a5a2c9212ae5b6cbd56b0f6563b559b27 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Mon, 30 Mar 2020 14:12:53 -0300
Subject: [PATCH 103/223] [FIX] Emit livechat events to instace only (#17086)

---
 app/livechat/server/lib/stream/queueManager.js | 2 +-
 server/stream/rooms/index.js                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/livechat/server/lib/stream/queueManager.js b/app/livechat/server/lib/stream/queueManager.js
index dd1a088fec57..ea40e9ed30d1 100644
--- a/app/livechat/server/lib/stream/queueManager.js
+++ b/app/livechat/server/lib/stream/queueManager.js
@@ -10,7 +10,7 @@ queueDataStreamer.allowRead(function() {
 	return this.userId ? hasPermission(this.userId, 'view-l-room') : false;
 });
 
-const emitQueueDataEvent = (event, data) => queueDataStreamer.emit(event, data);
+const emitQueueDataEvent = (event, data) => queueDataStreamer.emitWithoutBroadcast(event, data);
 const mountDataToEmit = (type, data) => ({ type, ...data });
 
 LivechatInquiry.on('change', ({ clientAction, id: _id, data: record }) => {
diff --git a/server/stream/rooms/index.js b/server/stream/rooms/index.js
index c65df05ea631..5b33c403111c 100644
--- a/server/stream/rooms/index.js
+++ b/server/stream/rooms/index.js
@@ -35,5 +35,5 @@ export function emitRoomDataEvent(id, data) {
 		return;
 	}
 
-	roomDataStream.emit(id, data);
+	roomDataStream.emitWithoutBroadcast(id, data);
 }

From 41eaec221604f982267c0dc63aa273b7e8ba8980 Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Mon, 30 Mar 2020 14:57:28 -0300
Subject: [PATCH 104/223] Regression: Check Omnichannel routing system before
 emitting queue changes (#17087)

---
 app/livechat/client/lib/stream/queueManager.js | 7 +++++++
 app/livechat/server/lib/stream/queueManager.js | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/app/livechat/client/lib/stream/queueManager.js b/app/livechat/client/lib/stream/queueManager.js
index efe6727d2756..08bde581c577 100644
--- a/app/livechat/client/lib/stream/queueManager.js
+++ b/app/livechat/client/lib/stream/queueManager.js
@@ -2,6 +2,7 @@ import { APIClient } from '../../../../utils/client';
 import { LivechatInquiry } from '../../collections/LivechatInquiry';
 import { inquiryDataStream } from './inquiry';
 import { hasRole } from '../../../../authorization/client';
+import { call } from '../../../../ui-utils/client';
 
 let agentDepartments = [];
 
@@ -59,6 +60,12 @@ export const initializeLivechatInquiryStream = async (userId) => {
 		removeDepartmentsListeners(agentDepartments);
 	}
 	removeGlobalListener();
+
+	const config = await call('livechat:getRoutingConfig');
+	if (config && config.autoAssignAgent) {
+		return;
+	}
+
 	await updateInquiries(await getInquiriesFromAPI('livechat/inquiries.queued?sort={"ts": 1}'));
 
 	agentDepartments = (await getAgentsDepartments(userId)).map((department) => department.departmentId);
diff --git a/app/livechat/server/lib/stream/queueManager.js b/app/livechat/server/lib/stream/queueManager.js
index ea40e9ed30d1..bf30b8397ff8 100644
--- a/app/livechat/server/lib/stream/queueManager.js
+++ b/app/livechat/server/lib/stream/queueManager.js
@@ -3,6 +3,7 @@ import { Meteor } from 'meteor/meteor';
 import { hasPermission } from '../../../../authorization/server';
 import { LivechatInquiry } from '../../../../models/server';
 import { LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER } from '../../../lib/stream/constants';
+import { RoutingManager } from '../RoutingManager';
 
 const queueDataStreamer = new Meteor.Streamer(LIVECHAT_INQUIRY_QUEUE_STREAM_OBSERVER);
 queueDataStreamer.allowWrite('none');
@@ -14,6 +15,10 @@ const emitQueueDataEvent = (event, data) => queueDataStreamer.emitWithoutBroadca
 const mountDataToEmit = (type, data) => ({ type, ...data });
 
 LivechatInquiry.on('change', ({ clientAction, id: _id, data: record }) => {
+	if (RoutingManager.getConfig().autoAssignAgent) {
+		return;
+	}
+
 	switch (clientAction) {
 		case 'inserted':
 			emitQueueDataEvent(_id, { ...record, clientAction });

From 9b4cfd708e0c1dbf67ad232d5ba14c56ca238f31 Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Mon, 30 Mar 2020 15:28:25 -0300
Subject: [PATCH 105/223] Regression: Remove model observe that was used to
 control the status of the Omnichannel agents (#17078)

---
 app/livechat/server/index.js                  |   2 +-
 app/livechat/server/lib/stream/agentStatus.ts | 105 ++++++++++++++++++
 app/livechat/server/methods/takeInquiry.js    |   4 +
 app/livechat/server/unclosedLivechats.js      |  95 ----------------
 app/models/server/models/Users.js             |   9 ++
 app/settings/server/functions/settings.d.ts   |   2 +-
 packages/rocketchat-i18n/i18n/en.i18n.json    |   1 +
 packages/rocketchat-i18n/i18n/pt-BR.i18n.json |   1 +
 8 files changed, 122 insertions(+), 97 deletions(-)
 create mode 100644 app/livechat/server/lib/stream/agentStatus.ts
 delete mode 100644 app/livechat/server/unclosedLivechats.js

diff --git a/app/livechat/server/index.js b/app/livechat/server/index.js
index 541cfb16ab4c..cc3c0b8fb927 100644
--- a/app/livechat/server/index.js
+++ b/app/livechat/server/index.js
@@ -75,10 +75,10 @@ import './lib/RoutingManager';
 import './lib/routing/External';
 import './lib/routing/ManualSelection';
 import './lib/routing/AutoSelection';
+import './lib/stream/agentStatus';
 import './lib/stream/departmentAgents';
 import './lib/stream/queueManager';
 import './sendMessageBySMS';
-import './unclosedLivechats';
 import './api';
 import './api/rest';
 
diff --git a/app/livechat/server/lib/stream/agentStatus.ts b/app/livechat/server/lib/stream/agentStatus.ts
new file mode 100644
index 000000000000..00ae13968d3b
--- /dev/null
+++ b/app/livechat/server/lib/stream/agentStatus.ts
@@ -0,0 +1,105 @@
+import { Meteor } from 'meteor/meteor';
+
+import { Livechat } from '../Livechat';
+import { settings } from '../../../../settings/server';
+import { Users } from '../../../../models/server';
+
+let monitorAgents = false;
+let actionTimeout = 60000;
+let action = 'none';
+let comment = '';
+
+settings.get('Livechat_agent_leave_action_timeout', function(_key: string, value: number) {
+	actionTimeout = value * 1000;
+});
+
+settings.get('Livechat_agent_leave_action', function(_key: string, value: boolean) {
+	monitorAgents = value;
+});
+
+settings.get('Livechat_agent_leave_action', function(_key: string, value: string) {
+	action = value;
+});
+
+settings.get('Livechat_agent_leave_comment', function(_key: string, value: string) {
+	comment = value;
+});
+
+const onlineAgents = {
+	users: new Set(),
+	queue: new Map(),
+
+	add(userId: string): void {
+		if (this.exists(userId)) {
+			return;
+		}
+
+		if (this.queue.has(userId)) {
+			clearTimeout(this.queue.get(userId));
+			this.queue.delete(userId);
+		}
+		this.users.add(userId);
+	},
+
+	remove(userId: string): void {
+		if (!this.exists(userId)) {
+			return;
+		}
+
+		if (this.queue.has(userId)) {
+			clearTimeout(this.queue.get(userId));
+		}
+
+		this.queue.set(userId, setTimeout(this.runAgentLeaveAction, actionTimeout, userId));
+	},
+
+	exists(userId: string): boolean {
+		return this.users.has(userId);
+	},
+
+	runAgentLeaveAction: Meteor.bindEnvironment((userId: string) => {
+		onlineAgents.users.delete(userId);
+		onlineAgents.queue.delete(userId);
+
+		if (action === 'close') {
+			return Livechat.closeOpenChats(userId, comment);
+		}
+
+		if (action === 'forward') {
+			return Livechat.forwardOpenChats(userId);
+		}
+	}),
+};
+
+Users.on('change', ({ clientAction, id, diff }) => {
+	if (!monitorAgents) {
+		return;
+	}
+
+	if (clientAction !== 'removed' && diff && !diff.status && !diff.statusLivechat) {
+		return;
+	}
+
+	switch (clientAction) {
+		case 'updated':
+		case 'inserted':
+			const agent = Users.findOneAgentById(id, {
+				fields: {
+					status: 1,
+					statusLivechat: 1,
+				},
+			});
+			const serviceOnline = agent && agent.status !== 'offline' && agent.statusLivechat === 'available';
+
+			if (serviceOnline) {
+				return onlineAgents.add(id);
+			}
+
+			onlineAgents.remove(id);
+
+			break;
+		case 'removed':
+			onlineAgents.remove(id);
+			break;
+	}
+});
diff --git a/app/livechat/server/methods/takeInquiry.js b/app/livechat/server/methods/takeInquiry.js
index cfc52636b34f..e6a557eee011 100644
--- a/app/livechat/server/methods/takeInquiry.js
+++ b/app/livechat/server/methods/takeInquiry.js
@@ -17,6 +17,10 @@ Meteor.methods({
 		}
 
 		const user = Users.findOneById(Meteor.userId());
+		const { status, statusLivechat } = user;
+		if (status === 'offline' || statusLivechat !== 'available') {
+			throw new Meteor.Error('error-agent-offline', 'Agent offline', { method: 'livechat:takeInquiry' });
+		}
 
 		const agent = {
 			agentId: user._id,
diff --git a/app/livechat/server/unclosedLivechats.js b/app/livechat/server/unclosedLivechats.js
deleted file mode 100644
index 29c96b68e1be..000000000000
--- a/app/livechat/server/unclosedLivechats.js
+++ /dev/null
@@ -1,95 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { UserPresenceMonitor } from 'meteor/konecty:user-presence';
-
-import { Livechat } from './lib/Livechat';
-import { settings } from '../../settings';
-import { Users } from '../../models';
-
-let agentsHandler;
-let monitorAgents = false;
-let actionTimeout = 60000;
-
-const onlineAgents = {
-	users: {},
-	queue: {},
-
-	add(userId) {
-		if (this.queue[userId]) {
-			clearTimeout(this.queue[userId]);
-			delete this.queue[userId];
-		}
-		this.users[userId] = 1;
-	},
-
-	remove(userId, callback) {
-		if (this.queue[userId]) {
-			clearTimeout(this.queue[userId]);
-		}
-		this.queue[userId] = setTimeout(Meteor.bindEnvironment(() => {
-			callback();
-
-			delete this.users[userId];
-			delete this.queue[userId];
-		}), actionTimeout);
-	},
-
-	exists(userId) {
-		return !!this.users[userId];
-	},
-};
-
-function runAgentLeaveAction(userId) {
-	const action = settings.get('Livechat_agent_leave_action');
-	if (action === 'close') {
-		return Livechat.closeOpenChats(userId, settings.get('Livechat_agent_leave_comment'));
-	} if (action === 'forward') {
-		return Livechat.forwardOpenChats(userId);
-	}
-}
-
-settings.get('Livechat_agent_leave_action_timeout', function(key, value) {
-	actionTimeout = value * 1000;
-});
-
-settings.get('Livechat_agent_leave_action', function(key, value) {
-	monitorAgents = value;
-	if (value !== 'none') {
-		if (!agentsHandler) {
-			agentsHandler = Users.findOnlineAgents().observeChanges({
-				added(id) {
-					onlineAgents.add(id);
-				},
-				changed(id, fields) {
-					if (fields.statusLivechat && fields.statusLivechat === 'not-available') {
-						onlineAgents.remove(id, () => {
-							runAgentLeaveAction(id);
-						});
-					} else {
-						onlineAgents.add(id);
-					}
-				},
-				removed(id) {
-					onlineAgents.remove(id, () => {
-						runAgentLeaveAction(id);
-					});
-				},
-			});
-		}
-	} else if (agentsHandler) {
-		agentsHandler.stop();
-		agentsHandler = null;
-	}
-});
-
-UserPresenceMonitor.onSetUserStatus((user, status/* , statusConnection*/) => {
-	if (!monitorAgents) {
-		return;
-	}
-	if (onlineAgents.exists(user._id)) {
-		if (status === 'offline' || user.statusLivechat === 'not-available') {
-			onlineAgents.remove(user._id, () => {
-				runAgentLeaveAction(user._id);
-			});
-		}
-	}
-});
diff --git a/app/models/server/models/Users.js b/app/models/server/models/Users.js
index b7c59bc91666..6ace2d3a9c94 100644
--- a/app/models/server/models/Users.js
+++ b/app/models/server/models/Users.js
@@ -135,6 +135,15 @@ export class Users extends Base {
 		return this.findOne(query);
 	}
 
+	findOneAgentById(_id, options) {
+		const query = {
+			_id,
+			roles: 'livechat-agent',
+		};
+
+		return this.findOne(query, options);
+	}
+
 	findAgents() {
 		const query = {
 			roles: 'livechat-agent',
diff --git a/app/settings/server/functions/settings.d.ts b/app/settings/server/functions/settings.d.ts
index 8748685d0bb7..9576e32719a8 100644
--- a/app/settings/server/functions/settings.d.ts
+++ b/app/settings/server/functions/settings.d.ts
@@ -1,3 +1,3 @@
 export namespace settings {
-	export function get(name: string): string;
+	export function get(name: string, callback: (key: string, value: any) => void): string;
 }
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 684b93902460..6e1ec0c127c6 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1322,6 +1322,7 @@
   "Entertainment": "Entertainment",
   "Error": "Error",
   "error-action-not-allowed": "__action__ is not allowed",
+  "error-agent-offline": "Agent is offline",
   "error-application-not-found": "Application not found",
   "error-archived-duplicate-name": "There's an archived channel with name '__room_name__'",
   "error-avatar-invalid-url": "Invalid avatar URL: __url__",
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index 251d03e647bd..763b1c634ded 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -1213,6 +1213,7 @@
   "Entertainment": "Diversão",
   "Error": "Erro",
   "error-action-not-allowed": "__action__ não é permitido",
+  "error-agent-offline": "Agente está offline",
   "error-application-not-found": "Aplicação não encontrada",
   "error-archived-duplicate-name": "Já há um canal arquivado com o nome '__room_name__'",
   "error-avatar-invalid-url": "URL inválida de avatar: __url__",

From 6776b0e6aec535ab0a98df15dfc545d186c3c3c1 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 30 Mar 2020 18:12:02 -0300
Subject: [PATCH 106/223] Reduce notifyUser propagation (#17088)

---
 app/lib/server/startup/userDataStream.js           | 6 +++---
 app/livechat/server/lib/stream/departmentAgents.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/lib/server/startup/userDataStream.js b/app/lib/server/startup/userDataStream.js
index 09d3db52083c..8cdc95e4b66b 100644
--- a/app/lib/server/startup/userDataStream.js
+++ b/app/lib/server/startup/userDataStream.js
@@ -4,13 +4,13 @@ import { Notifications } from '../../../notifications/server';
 Users.on('change', ({ clientAction, id, data, diff }) => {
 	switch (clientAction) {
 		case 'updated':
-			Notifications.notifyUser(id, 'userData', { diff, type: clientAction });
+			Notifications.notifyUserInThisInstance(id, 'userData', { diff, type: clientAction });
 			break;
 		case 'inserted':
-			Notifications.notifyUser(id, 'userData', { data, type: clientAction });
+			Notifications.notifyUserInThisInstance(id, 'userData', { data, type: clientAction });
 			break;
 		case 'removed':
-			Notifications.notifyUser(id, 'userData', { id, type: clientAction });
+			Notifications.notifyUserInThisInstance(id, 'userData', { id, type: clientAction });
 			break;
 	}
 });
diff --git a/app/livechat/server/lib/stream/departmentAgents.js b/app/livechat/server/lib/stream/departmentAgents.js
index 24800d16461f..a6c6fab75122 100644
--- a/app/livechat/server/lib/stream/departmentAgents.js
+++ b/app/livechat/server/lib/stream/departmentAgents.js
@@ -9,7 +9,7 @@ const emitNotification = (action, payload = {}) => {
 		return;
 	}
 
-	Notifications.notifyUser(agentId, 'departmentAgentData', {
+	Notifications.notifyUserInThisInstance(agentId, 'departmentAgentData', {
 		action,
 		...payload,
 	});

From b0c2cbb2d8b13252b8a4cd29a5108092d92635cd Mon Sep 17 00:00:00 2001
From: Douglas Gubert <d-gubert@users.noreply.github.com>
Date: Mon, 30 Mar 2020 18:13:03 -0300
Subject: [PATCH 107/223] [FIX] Error when websocket received status update
 event (#17089)

---
 app/apps/server/communication/websockets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/apps/server/communication/websockets.js b/app/apps/server/communication/websockets.js
index 857158ddd3bb..ec3f54b662a9 100644
--- a/app/apps/server/communication/websockets.js
+++ b/app/apps/server/communication/websockets.js
@@ -41,7 +41,7 @@ export class AppServerListener {
 	async onAppStatusUpdated({ appId, status }) {
 		const app = this.orch.getManager().getOneById(appId);
 
-		if (app.getStatus() === status) {
+		if (!app || app.getStatus() === status) {
 			return;
 		}
 

From 3e24ae26367ef1707dca4fc1e1566d4a2f013d6e Mon Sep 17 00:00:00 2001
From: Douglas Gubert <d-gubert@users.noreply.github.com>
Date: Mon, 30 Mar 2020 18:13:03 -0300
Subject: [PATCH 108/223] [FIX] Error when websocket received status update
 event (#17089)

---
 app/apps/server/communication/websockets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/apps/server/communication/websockets.js b/app/apps/server/communication/websockets.js
index 857158ddd3bb..ec3f54b662a9 100644
--- a/app/apps/server/communication/websockets.js
+++ b/app/apps/server/communication/websockets.js
@@ -41,7 +41,7 @@ export class AppServerListener {
 	async onAppStatusUpdated({ appId, status }) {
 		const app = this.orch.getManager().getOneById(appId);
 
-		if (app.getStatus() === status) {
+		if (!app || app.getStatus() === status) {
 			return;
 		}
 

From fd7eb4b06fe53944f00831fcce1f52d7f5815880 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 30 Mar 2020 18:12:02 -0300
Subject: [PATCH 109/223] Reduce notifyUser propagation (#17088)

---
 app/lib/server/startup/userDataStream.js           | 6 +++---
 app/livechat/server/lib/stream/departmentAgents.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/lib/server/startup/userDataStream.js b/app/lib/server/startup/userDataStream.js
index 09d3db52083c..8cdc95e4b66b 100644
--- a/app/lib/server/startup/userDataStream.js
+++ b/app/lib/server/startup/userDataStream.js
@@ -4,13 +4,13 @@ import { Notifications } from '../../../notifications/server';
 Users.on('change', ({ clientAction, id, data, diff }) => {
 	switch (clientAction) {
 		case 'updated':
-			Notifications.notifyUser(id, 'userData', { diff, type: clientAction });
+			Notifications.notifyUserInThisInstance(id, 'userData', { diff, type: clientAction });
 			break;
 		case 'inserted':
-			Notifications.notifyUser(id, 'userData', { data, type: clientAction });
+			Notifications.notifyUserInThisInstance(id, 'userData', { data, type: clientAction });
 			break;
 		case 'removed':
-			Notifications.notifyUser(id, 'userData', { id, type: clientAction });
+			Notifications.notifyUserInThisInstance(id, 'userData', { id, type: clientAction });
 			break;
 	}
 });
diff --git a/app/livechat/server/lib/stream/departmentAgents.js b/app/livechat/server/lib/stream/departmentAgents.js
index 24800d16461f..a6c6fab75122 100644
--- a/app/livechat/server/lib/stream/departmentAgents.js
+++ b/app/livechat/server/lib/stream/departmentAgents.js
@@ -9,7 +9,7 @@ const emitNotification = (action, payload = {}) => {
 		return;
 	}
 
-	Notifications.notifyUser(agentId, 'departmentAgentData', {
+	Notifications.notifyUserInThisInstance(agentId, 'departmentAgentData', {
 		action,
 		...payload,
 	});

From a84edc77b07f4ca3db65b93333d7ca2f10affc48 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Mon, 30 Mar 2020 14:12:53 -0300
Subject: [PATCH 110/223] [FIX] Emit livechat events to instace only (#17086)

---
 app/livechat/server/lib/stream/queueManager.js | 2 +-
 server/stream/rooms/index.js                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/livechat/server/lib/stream/queueManager.js b/app/livechat/server/lib/stream/queueManager.js
index dd1a088fec57..ea40e9ed30d1 100644
--- a/app/livechat/server/lib/stream/queueManager.js
+++ b/app/livechat/server/lib/stream/queueManager.js
@@ -10,7 +10,7 @@ queueDataStreamer.allowRead(function() {
 	return this.userId ? hasPermission(this.userId, 'view-l-room') : false;
 });
 
-const emitQueueDataEvent = (event, data) => queueDataStreamer.emit(event, data);
+const emitQueueDataEvent = (event, data) => queueDataStreamer.emitWithoutBroadcast(event, data);
 const mountDataToEmit = (type, data) => ({ type, ...data });
 
 LivechatInquiry.on('change', ({ clientAction, id: _id, data: record }) => {
diff --git a/server/stream/rooms/index.js b/server/stream/rooms/index.js
index c65df05ea631..5b33c403111c 100644
--- a/server/stream/rooms/index.js
+++ b/server/stream/rooms/index.js
@@ -35,5 +35,5 @@ export function emitRoomDataEvent(id, data) {
 		return;
 	}
 
-	roomDataStream.emit(id, data);
+	roomDataStream.emitWithoutBroadcast(id, data);
 }

From 0758bb7ba395bd8a9e6a8da6d1d488b2192dedec Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Mon, 30 Mar 2020 15:28:25 -0300
Subject: [PATCH 111/223] Regression: Remove model observe that was used to
 control the status of the Omnichannel agents (#17078)

---
 app/livechat/server/index.js                  |   2 +-
 app/livechat/server/lib/stream/agentStatus.ts | 105 ++++++++++++++++++
 app/livechat/server/methods/takeInquiry.js    |   4 +
 app/livechat/server/unclosedLivechats.js      |  95 ----------------
 app/models/server/models/Users.js             |   9 ++
 app/settings/server/functions/settings.d.ts   |   3 +
 packages/rocketchat-i18n/i18n/en.i18n.json    |   1 +
 packages/rocketchat-i18n/i18n/pt-BR.i18n.json |   1 +
 8 files changed, 124 insertions(+), 96 deletions(-)
 create mode 100644 app/livechat/server/lib/stream/agentStatus.ts
 delete mode 100644 app/livechat/server/unclosedLivechats.js
 create mode 100644 app/settings/server/functions/settings.d.ts

diff --git a/app/livechat/server/index.js b/app/livechat/server/index.js
index 541cfb16ab4c..cc3c0b8fb927 100644
--- a/app/livechat/server/index.js
+++ b/app/livechat/server/index.js
@@ -75,10 +75,10 @@ import './lib/RoutingManager';
 import './lib/routing/External';
 import './lib/routing/ManualSelection';
 import './lib/routing/AutoSelection';
+import './lib/stream/agentStatus';
 import './lib/stream/departmentAgents';
 import './lib/stream/queueManager';
 import './sendMessageBySMS';
-import './unclosedLivechats';
 import './api';
 import './api/rest';
 
diff --git a/app/livechat/server/lib/stream/agentStatus.ts b/app/livechat/server/lib/stream/agentStatus.ts
new file mode 100644
index 000000000000..00ae13968d3b
--- /dev/null
+++ b/app/livechat/server/lib/stream/agentStatus.ts
@@ -0,0 +1,105 @@
+import { Meteor } from 'meteor/meteor';
+
+import { Livechat } from '../Livechat';
+import { settings } from '../../../../settings/server';
+import { Users } from '../../../../models/server';
+
+let monitorAgents = false;
+let actionTimeout = 60000;
+let action = 'none';
+let comment = '';
+
+settings.get('Livechat_agent_leave_action_timeout', function(_key: string, value: number) {
+	actionTimeout = value * 1000;
+});
+
+settings.get('Livechat_agent_leave_action', function(_key: string, value: boolean) {
+	monitorAgents = value;
+});
+
+settings.get('Livechat_agent_leave_action', function(_key: string, value: string) {
+	action = value;
+});
+
+settings.get('Livechat_agent_leave_comment', function(_key: string, value: string) {
+	comment = value;
+});
+
+const onlineAgents = {
+	users: new Set(),
+	queue: new Map(),
+
+	add(userId: string): void {
+		if (this.exists(userId)) {
+			return;
+		}
+
+		if (this.queue.has(userId)) {
+			clearTimeout(this.queue.get(userId));
+			this.queue.delete(userId);
+		}
+		this.users.add(userId);
+	},
+
+	remove(userId: string): void {
+		if (!this.exists(userId)) {
+			return;
+		}
+
+		if (this.queue.has(userId)) {
+			clearTimeout(this.queue.get(userId));
+		}
+
+		this.queue.set(userId, setTimeout(this.runAgentLeaveAction, actionTimeout, userId));
+	},
+
+	exists(userId: string): boolean {
+		return this.users.has(userId);
+	},
+
+	runAgentLeaveAction: Meteor.bindEnvironment((userId: string) => {
+		onlineAgents.users.delete(userId);
+		onlineAgents.queue.delete(userId);
+
+		if (action === 'close') {
+			return Livechat.closeOpenChats(userId, comment);
+		}
+
+		if (action === 'forward') {
+			return Livechat.forwardOpenChats(userId);
+		}
+	}),
+};
+
+Users.on('change', ({ clientAction, id, diff }) => {
+	if (!monitorAgents) {
+		return;
+	}
+
+	if (clientAction !== 'removed' && diff && !diff.status && !diff.statusLivechat) {
+		return;
+	}
+
+	switch (clientAction) {
+		case 'updated':
+		case 'inserted':
+			const agent = Users.findOneAgentById(id, {
+				fields: {
+					status: 1,
+					statusLivechat: 1,
+				},
+			});
+			const serviceOnline = agent && agent.status !== 'offline' && agent.statusLivechat === 'available';
+
+			if (serviceOnline) {
+				return onlineAgents.add(id);
+			}
+
+			onlineAgents.remove(id);
+
+			break;
+		case 'removed':
+			onlineAgents.remove(id);
+			break;
+	}
+});
diff --git a/app/livechat/server/methods/takeInquiry.js b/app/livechat/server/methods/takeInquiry.js
index cfc52636b34f..e6a557eee011 100644
--- a/app/livechat/server/methods/takeInquiry.js
+++ b/app/livechat/server/methods/takeInquiry.js
@@ -17,6 +17,10 @@ Meteor.methods({
 		}
 
 		const user = Users.findOneById(Meteor.userId());
+		const { status, statusLivechat } = user;
+		if (status === 'offline' || statusLivechat !== 'available') {
+			throw new Meteor.Error('error-agent-offline', 'Agent offline', { method: 'livechat:takeInquiry' });
+		}
 
 		const agent = {
 			agentId: user._id,
diff --git a/app/livechat/server/unclosedLivechats.js b/app/livechat/server/unclosedLivechats.js
deleted file mode 100644
index 29c96b68e1be..000000000000
--- a/app/livechat/server/unclosedLivechats.js
+++ /dev/null
@@ -1,95 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { UserPresenceMonitor } from 'meteor/konecty:user-presence';
-
-import { Livechat } from './lib/Livechat';
-import { settings } from '../../settings';
-import { Users } from '../../models';
-
-let agentsHandler;
-let monitorAgents = false;
-let actionTimeout = 60000;
-
-const onlineAgents = {
-	users: {},
-	queue: {},
-
-	add(userId) {
-		if (this.queue[userId]) {
-			clearTimeout(this.queue[userId]);
-			delete this.queue[userId];
-		}
-		this.users[userId] = 1;
-	},
-
-	remove(userId, callback) {
-		if (this.queue[userId]) {
-			clearTimeout(this.queue[userId]);
-		}
-		this.queue[userId] = setTimeout(Meteor.bindEnvironment(() => {
-			callback();
-
-			delete this.users[userId];
-			delete this.queue[userId];
-		}), actionTimeout);
-	},
-
-	exists(userId) {
-		return !!this.users[userId];
-	},
-};
-
-function runAgentLeaveAction(userId) {
-	const action = settings.get('Livechat_agent_leave_action');
-	if (action === 'close') {
-		return Livechat.closeOpenChats(userId, settings.get('Livechat_agent_leave_comment'));
-	} if (action === 'forward') {
-		return Livechat.forwardOpenChats(userId);
-	}
-}
-
-settings.get('Livechat_agent_leave_action_timeout', function(key, value) {
-	actionTimeout = value * 1000;
-});
-
-settings.get('Livechat_agent_leave_action', function(key, value) {
-	monitorAgents = value;
-	if (value !== 'none') {
-		if (!agentsHandler) {
-			agentsHandler = Users.findOnlineAgents().observeChanges({
-				added(id) {
-					onlineAgents.add(id);
-				},
-				changed(id, fields) {
-					if (fields.statusLivechat && fields.statusLivechat === 'not-available') {
-						onlineAgents.remove(id, () => {
-							runAgentLeaveAction(id);
-						});
-					} else {
-						onlineAgents.add(id);
-					}
-				},
-				removed(id) {
-					onlineAgents.remove(id, () => {
-						runAgentLeaveAction(id);
-					});
-				},
-			});
-		}
-	} else if (agentsHandler) {
-		agentsHandler.stop();
-		agentsHandler = null;
-	}
-});
-
-UserPresenceMonitor.onSetUserStatus((user, status/* , statusConnection*/) => {
-	if (!monitorAgents) {
-		return;
-	}
-	if (onlineAgents.exists(user._id)) {
-		if (status === 'offline' || user.statusLivechat === 'not-available') {
-			onlineAgents.remove(user._id, () => {
-				runAgentLeaveAction(user._id);
-			});
-		}
-	}
-});
diff --git a/app/models/server/models/Users.js b/app/models/server/models/Users.js
index 2e0fd8dc82c3..0724bb8b2c6b 100644
--- a/app/models/server/models/Users.js
+++ b/app/models/server/models/Users.js
@@ -134,6 +134,15 @@ export class Users extends Base {
 		return this.findOne(query);
 	}
 
+	findOneAgentById(_id, options) {
+		const query = {
+			_id,
+			roles: 'livechat-agent',
+		};
+
+		return this.findOne(query, options);
+	}
+
 	findAgents() {
 		const query = {
 			roles: 'livechat-agent',
diff --git a/app/settings/server/functions/settings.d.ts b/app/settings/server/functions/settings.d.ts
new file mode 100644
index 000000000000..9576e32719a8
--- /dev/null
+++ b/app/settings/server/functions/settings.d.ts
@@ -0,0 +1,3 @@
+export namespace settings {
+	export function get(name: string, callback: (key: string, value: any) => void): string;
+}
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 72312faa2831..5044a004a72e 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1279,6 +1279,7 @@
   "Entertainment": "Entertainment",
   "Error": "Error",
   "error-action-not-allowed": "__action__ is not allowed",
+  "error-agent-offline": "Agent is offline",
   "error-application-not-found": "Application not found",
   "error-archived-duplicate-name": "There's an archived channel with name '__room_name__'",
   "error-avatar-invalid-url": "Invalid avatar URL: __url__",
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index dc91ec7e3360..f2c53d5c23d2 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -1192,6 +1192,7 @@
   "Entertainment": "Diversão",
   "Error": "Erro",
   "error-action-not-allowed": "__action__ não é permitido",
+  "error-agent-offline": "Agente está offline",
   "error-application-not-found": "Aplicação não encontrada",
   "error-archived-duplicate-name": "Já há um canal arquivado com o nome '__room_name__'",
   "error-avatar-invalid-url": "URL inválida de avatar: __url__",

From 863ee740c1aa785876566d212753fddd38f371a9 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Mon, 30 Mar 2020 18:18:20 -0300
Subject: [PATCH 112/223] Bump version to 3.0.8

---
 .docker/Dockerfile.rhel   |    2 +-
 .github/history.json      |   49 +
 HISTORY.md                | 3168 +++++++++++++++++++++++++++++++++++++
 app/utils/rocketchat.info |    2 +-
 package.json              |    2 +-
 5 files changed, 3220 insertions(+), 3 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 6da776c4700f..1c275a564352 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.0.7
+ENV RC_VERSION 3.0.8
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index 8352e9effef3..8cfc9224330c 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -40067,6 +40067,55 @@
           ]
         }
       ]
+    },
+    "3.0.8": {
+      "node_version": "12.14.0",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "17078",
+          "title": "Regression: Remove model observe that was used to control the status of the Omnichannel agents",
+          "userLogin": "renatobecker",
+          "milestone": "3.0.8",
+          "contributors": [
+            "renatobecker",
+            "web-flow",
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "17086",
+          "title": "[FIX] Emit livechat events to instace only",
+          "userLogin": "sampaiodiego",
+          "milestone": "3.0.8",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "17088",
+          "title": "Reduce notifyUser propagation",
+          "userLogin": "rodrigok",
+          "milestone": "3.0.8",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "17089",
+          "title": "[FIX] Error when websocket received status update event",
+          "userLogin": "d-gubert",
+          "milestone": "3.0.8",
+          "contributors": [
+            "d-gubert"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/HISTORY.md b/HISTORY.md
index e5eea1c8a5c0..b01aa11ac67d 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,36 @@
 
+# 3.0.8
+`2020-03-30  ·  2 🐛  ·  2 🔍  ·  4 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `12.14.0`
+- NPM: `6.13.4`
+- MongoDB: `3.4, 3.6, 4.0`
+
+### 🐛 Bug fixes
+
+
+- Emit livechat events to instace only ([#17086](https://github.com/RocketChat/Rocket.Chat/pull/17086))
+
+- Error when websocket received status update event ([#17089](https://github.com/RocketChat/Rocket.Chat/pull/17089))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Regression: Remove model observe that was used to control the status of the Omnichannel agents ([#17078](https://github.com/RocketChat/Rocket.Chat/pull/17078))
+
+- Reduce notifyUser propagation ([#17088](https://github.com/RocketChat/Rocket.Chat/pull/17088))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@d-gubert](https://github.com/d-gubert)
+- [@renatobecker](https://github.com/renatobecker)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 3.0.7
 `2020-03-25  ·  1 🔍  ·  1 👩‍💻👨‍💻`
 
@@ -10,6 +42,7 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Regression: Remove deprecated Omnichannel setting used to fetch the queue data through subscription  ([#17017](https://github.com/RocketChat/Rocket.Chat/pull/17017))
 
 </details>
@@ -28,11 +61,13 @@
 
 ### 🐛 Bug fixes
 
+
 - Keeps the agent in the room after accepting a new Omnichannel request ([#16787](https://github.com/RocketChat/Rocket.Chat/pull/16787))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Regression: Replace the Omnichannel queue model observe with Stream ([#16999](https://github.com/RocketChat/Rocket.Chat/pull/16999))
 
 </details>
@@ -51,6 +86,7 @@
 
 ### 🐛 Bug fixes
 
+
 - Race conditions on/before login ([#16989](https://github.com/RocketChat/Rocket.Chat/pull/16989))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -67,11 +103,14 @@
 
 ### 🚀 Improvements
 
+
 - Send files over REST API ([#16617](https://github.com/RocketChat/Rocket.Chat/pull/16617))
 
 ### 🐛 Bug fixes
 
+
 - Integrations page pagination ([#16838](https://github.com/RocketChat/Rocket.Chat/pull/16838))
+
 - TypeError when trying to load avatar of an invalid room. ([#16699](https://github.com/RocketChat/Rocket.Chat/pull/16699))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -90,10 +129,15 @@
 
 ### 🐛 Bug fixes
 
+
 - Language country has been ignored on translation load ([#16757](https://github.com/RocketChat/Rocket.Chat/pull/16757))
+
 - Manual Register use correct state for determining registered ([#16726](https://github.com/RocketChat/Rocket.Chat/pull/16726))
+
 - Rocket.Chat takes too long to set the username when it fails to send enrollment email ([#16723](https://github.com/RocketChat/Rocket.Chat/pull/16723))
+
 - LDAP sync admin action was not syncing existent users ([#16671](https://github.com/RocketChat/Rocket.Chat/pull/16671))
+
 - Check agent status when starting a new conversation with an agent assigned ([#16618](https://github.com/RocketChat/Rocket.Chat/pull/16618))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -114,8 +158,11 @@
 
 ### 🐛 Bug fixes
 
+
 - ie11 support ([#16682](https://github.com/RocketChat/Rocket.Chat/pull/16682))
+
 - Omnichannel Inquiry queues when removing chats ([#16603](https://github.com/RocketChat/Rocket.Chat/pull/16603))
+
 - Clear unread red line when the ESC key is pressed  ([#16668](https://github.com/RocketChat/Rocket.Chat/pull/16668))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -134,12 +181,19 @@
 
 ### 🐛 Bug fixes
 
+
 - UiKit not updating new actionIds received as responses from actions ([#16624](https://github.com/RocketChat/Rocket.Chat/pull/16624))
+
 - Regression: Jitsi on external window infinite loop ([#16625](https://github.com/RocketChat/Rocket.Chat/pull/16625))
+
 - livechat/rooms endpoint not working with big amount of livechats ([#16623](https://github.com/RocketChat/Rocket.Chat/pull/16623))
+
 - Regression: New 'app' role with no permissions when updating to 3.0.0 ([#16637](https://github.com/RocketChat/Rocket.Chat/pull/16637))
+
 - Block user option inside admin view ([#16626](https://github.com/RocketChat/Rocket.Chat/pull/16626))
+
 - Data converters overriding fields added by apps ([#16639](https://github.com/RocketChat/Rocket.Chat/pull/16639))
+
 - Admin height if the blue banner is opened ([#16629](https://github.com/RocketChat/Rocket.Chat/pull/16629))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -159,121 +213,224 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Filter System messages per room ([#16369](https://github.com/RocketChat/Rocket.Chat/pull/16369))
+
 - Remove deprecated publications ([#16351](https://github.com/RocketChat/Rocket.Chat/pull/16351))
+
 - Hide system messages ([#16243](https://github.com/RocketChat/Rocket.Chat/pull/16243))
+
 - Upgrade to Meteor 1.9 and NodeJS 12 ([#16252](https://github.com/RocketChat/Rocket.Chat/pull/16252))
+
 - Removed room counter from sidebar ([#16036](https://github.com/RocketChat/Rocket.Chat/pull/16036))
+
 - Change apps/icon endpoint to return app's icon and use it to show on Ui Kit modal ([#16522](https://github.com/RocketChat/Rocket.Chat/pull/16522))
+
 - TLS v1.0 and TLS v1.1 were disabled by due to NodeJS update to v12. You can still enable them by using flags like `--tls-min-v1.0` and `--tls-min-v1.1`
 
 ### 🎉 New features
 
+
 - Button to download admin server info ([#16059](https://github.com/RocketChat/Rocket.Chat/pull/16059))
+
 - UiKit - Interactive UI elements for Rocket.Chat Apps ([#16048](https://github.com/RocketChat/Rocket.Chat/pull/16048))
+
 - Sort the Omnichannel Chat list according to the user preferences ([#16437](https://github.com/RocketChat/Rocket.Chat/pull/16437))
+
 - Setting to only send plain text emails ([#16065](https://github.com/RocketChat/Rocket.Chat/pull/16065))
+
 - Check the Omnichannel service status per Department ([#16425](https://github.com/RocketChat/Rocket.Chat/pull/16425))
+
 - Create a user for the Apps during installation ([#15896](https://github.com/RocketChat/Rocket.Chat/pull/15896) by [@Cool-fire](https://github.com/Cool-fire))
+
 - Add GUI for customFields in Omnichannel conversations ([#15840](https://github.com/RocketChat/Rocket.Chat/pull/15840) by [@antkaz](https://github.com/antkaz))
+
 - update on mongo, node and caddy on snap ([#16167](https://github.com/RocketChat/Rocket.Chat/pull/16167))
+
 - Enforce plain text emails converting from HTML when no text version supplied ([#16063](https://github.com/RocketChat/Rocket.Chat/pull/16063))
+
 - Setting Top navbar in embedded mode  ([#16064](https://github.com/RocketChat/Rocket.Chat/pull/16064))
 
 ### 🚀 Improvements
 
+
 - Request user presence on demand ([#16348](https://github.com/RocketChat/Rocket.Chat/pull/16348))
+
 - Major overhaul on data importers ([#16279](https://github.com/RocketChat/Rocket.Chat/pull/16279))
+
 - Changes App user's status when the app was enabled/disabled ([#16392](https://github.com/RocketChat/Rocket.Chat/pull/16392))
+
 - Log as info level when Method Rate Limiters are reached ([#16446](https://github.com/RocketChat/Rocket.Chat/pull/16446))
+
 - Show more information related to the Omnichannel room closing data ([#16414](https://github.com/RocketChat/Rocket.Chat/pull/16414))
+
 - Update katex version ([#16393](https://github.com/RocketChat/Rocket.Chat/pull/16393))
+
 - Prevent "App user" from being deleted by the admin ([#16373](https://github.com/RocketChat/Rocket.Chat/pull/16373))
+
 - Improve function to check if setting has changed ([#16181](https://github.com/RocketChat/Rocket.Chat/pull/16181))
+
 - Status Text form validation ([#16121](https://github.com/RocketChat/Rocket.Chat/pull/16121))
+
 - Set the color of the cancel button on modals to #bdbebf for enhanced  visibiity ([#15913](https://github.com/RocketChat/Rocket.Chat/pull/15913) by [@ritwizsinha](https://github.com/ritwizsinha))
+
 - Remove NRR ([#16071](https://github.com/RocketChat/Rocket.Chat/pull/16071))
 
 ### 🐛 Bug fixes
 
+
 - Result of get avatar from url can be null ([#16123](https://github.com/RocketChat/Rocket.Chat/pull/16123))
+
 - Rooms not being marked as read sometimes ([#16397](https://github.com/RocketChat/Rocket.Chat/pull/16397))
+
 - Container heights ([#16388](https://github.com/RocketChat/Rocket.Chat/pull/16388))
+
 - Mail Msg Cancel button not closing the flexbar ([#16263](https://github.com/RocketChat/Rocket.Chat/pull/16263) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
 - Highlight freezing the UI ([#16378](https://github.com/RocketChat/Rocket.Chat/pull/16378))
+
 - Adding 'lang' tag ([#16375](https://github.com/RocketChat/Rocket.Chat/pull/16375))
+
 - Role tags missing - Description field explanation ([#16356](https://github.com/RocketChat/Rocket.Chat/pull/16356))
+
 - The "click to load" text is hard-coded and not translated. ([#16142](https://github.com/RocketChat/Rocket.Chat/pull/16142) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
 - FileUpload.getBuffer was not working through the Apps-Engine ([#16234](https://github.com/RocketChat/Rocket.Chat/pull/16234))
+
 - Integrations admin page ([#16183](https://github.com/RocketChat/Rocket.Chat/pull/16183))
+
 - Readme Help wanted section ([#16197](https://github.com/RocketChat/Rocket.Chat/pull/16197))
+
 - auto translate cache ([#15768](https://github.com/RocketChat/Rocket.Chat/pull/15768) by [@vickyokrm](https://github.com/vickyokrm))
+
 - Save password without confirmation ([#16060](https://github.com/RocketChat/Rocket.Chat/pull/16060) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
 - Break message-attachment text to the next line ([#16039](https://github.com/RocketChat/Rocket.Chat/pull/16039) by [@ritwizsinha](https://github.com/ritwizsinha))
+
 - SafePorts: Ports 80, 8080 & 443 linked to respective protocols (#16108) ([#16108](https://github.com/RocketChat/Rocket.Chat/pull/16108))
+
 - Drag and drop disabled when file upload is disabled ([#16049](https://github.com/RocketChat/Rocket.Chat/pull/16049))
+
 - Video message sent to wrong room ([#16113](https://github.com/RocketChat/Rocket.Chat/pull/16113))
+
 - "User not found" for direct messages ([#16047](https://github.com/RocketChat/Rocket.Chat/pull/16047))
+
 - Embedded style when using 'go' command ([#16051](https://github.com/RocketChat/Rocket.Chat/pull/16051))
+
 - Thread message icon overlapping text ([#16083](https://github.com/RocketChat/Rocket.Chat/pull/16083))
+
 - Login change language button ([#16085](https://github.com/RocketChat/Rocket.Chat/pull/16085))
+
 - api-bypass-rate-limiter permission was not working ([#16080](https://github.com/RocketChat/Rocket.Chat/pull/16080))
+
 - Missing edited icon in newly created messages ([#16484](https://github.com/RocketChat/Rocket.Chat/pull/16484))
+
 - Read Message after receive a message and the room is opened ([#16473](https://github.com/RocketChat/Rocket.Chat/pull/16473))
+
 - Send message with pending messages ([#16474](https://github.com/RocketChat/Rocket.Chat/pull/16474))
+
 - Do not stop on DM imports if one of users was not found ([#16547](https://github.com/RocketChat/Rocket.Chat/pull/16547))
+
 - Introduce AppLivechatBridge.isOnlineAsync method ([#16467](https://github.com/RocketChat/Rocket.Chat/pull/16467))
+
 - When copying invite links, multiple toastr messages ([#16578](https://github.com/RocketChat/Rocket.Chat/pull/16578))
+
 - Livechat Widget version 1.3.1 ([#16580](https://github.com/RocketChat/Rocket.Chat/pull/16580))
+
 - Error when successfully joining room by invite link ([#16571](https://github.com/RocketChat/Rocket.Chat/pull/16571))
+
 - Invite links proxy URLs not working when using CDN ([#16581](https://github.com/RocketChat/Rocket.Chat/pull/16581))
+
 - Bug on starting Jitsi video calls , multiple messages ([#16601](https://github.com/RocketChat/Rocket.Chat/pull/16601))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Revert importer streamed uploads ([#16465](https://github.com/RocketChat/Rocket.Chat/pull/16465))
+
 - Regression: Fix app user status change for non-existing user ([#16458](https://github.com/RocketChat/Rocket.Chat/pull/16458))
+
 - Regression: Fix sending a message not scrolling to bottom ([#16451](https://github.com/RocketChat/Rocket.Chat/pull/16451))
+
 - LingoHub based on develop ([#16450](https://github.com/RocketChat/Rocket.Chat/pull/16450))
+
 - Regression: Fix sequential messages grouping ([#16386](https://github.com/RocketChat/Rocket.Chat/pull/16386))
+
 - Use GitHub Actions to store builds ([#16443](https://github.com/RocketChat/Rocket.Chat/pull/16443))
+
 - Regression: recent opened rooms being marked as read ([#16442](https://github.com/RocketChat/Rocket.Chat/pull/16442))
+
 - Regression: Fix status bar margins ([#16438](https://github.com/RocketChat/Rocket.Chat/pull/16438))
+
 - Update apps engine to 1.12.0-beta.2496 ([#16398](https://github.com/RocketChat/Rocket.Chat/pull/16398))
+
 - Regression: App deletion wasn’t returning the correct information ([#16360](https://github.com/RocketChat/Rocket.Chat/pull/16360))
+
 - Lint: Resolve complexity warnings ([#16114](https://github.com/RocketChat/Rocket.Chat/pull/16114))
+
 - Fix Preview Docker image build ([#16379](https://github.com/RocketChat/Rocket.Chat/pull/16379))
+
 - Fix assets download on CI ([#16352](https://github.com/RocketChat/Rocket.Chat/pull/16352))
+
 - Send build artifacts to S3 ([#16237](https://github.com/RocketChat/Rocket.Chat/pull/16237))
+
 - Add missing translations ([#16150](https://github.com/RocketChat/Rocket.Chat/pull/16150) by [@ritwizsinha](https://github.com/ritwizsinha))
+
 - Disable PR Docker image build ([#16141](https://github.com/RocketChat/Rocket.Chat/pull/16141))
+
 - Add Cloud Info to translation dictionary ([#16122](https://github.com/RocketChat/Rocket.Chat/pull/16122) by [@aviral243](https://github.com/aviral243))
+
 - Merge master into develop & Set version to 2.5.0-develop ([#16107](https://github.com/RocketChat/Rocket.Chat/pull/16107))
+
 - Fix tests ([#16469](https://github.com/RocketChat/Rocket.Chat/pull/16469))
+
 - Regression: prevent submit modal ([#16488](https://github.com/RocketChat/Rocket.Chat/pull/16488))
+
 - Regression: allow private channels to hide system messages ([#16483](https://github.com/RocketChat/Rocket.Chat/pull/16483))
+
 - Regression: Fix uikit modal closing on click ([#16475](https://github.com/RocketChat/Rocket.Chat/pull/16475))
+
 - Regression: Fix undefined presence after reconnect ([#16477](https://github.com/RocketChat/Rocket.Chat/pull/16477))
+
 - Remove users.info being called without need ([#16504](https://github.com/RocketChat/Rocket.Chat/pull/16504))
+
 - Add Ui Kit container ([#16503](https://github.com/RocketChat/Rocket.Chat/pull/16503))
+
 - Catch zip errors on import file load ([#16494](https://github.com/RocketChat/Rocket.Chat/pull/16494))
+
 - Fix: License missing from manual register handler ([#16505](https://github.com/RocketChat/Rocket.Chat/pull/16505))
+
 - Exclude federated and app users from active user count ([#16489](https://github.com/RocketChat/Rocket.Chat/pull/16489))
+
 - Regression: Update Uikit ([#16515](https://github.com/RocketChat/Rocket.Chat/pull/16515))
+
 - Regression: UIKit - Send container info on block actions triggered on a message ([#16514](https://github.com/RocketChat/Rocket.Chat/pull/16514))
+
 - Use base64 for import files upload to prevent file corruption ([#16516](https://github.com/RocketChat/Rocket.Chat/pull/16516))
+
 - Regression: Send app info along with interaction payload to the UI ([#16511](https://github.com/RocketChat/Rocket.Chat/pull/16511))
+
 - Regression: Ui Kit messaging issues (#16513) ([#16513](https://github.com/RocketChat/Rocket.Chat/pull/16513))
+
 - Regression: update package-lock ([#16528](https://github.com/RocketChat/Rocket.Chat/pull/16528))
+
 - Regression: UIkit input states ([#16552](https://github.com/RocketChat/Rocket.Chat/pull/16552))
+
 - Regression: UIKit missing select states: error/disabled ([#16540](https://github.com/RocketChat/Rocket.Chat/pull/16540))
+
 - Regression: fix read unread messages ([#16562](https://github.com/RocketChat/Rocket.Chat/pull/16562))
+
 - Regression: UIKit update modal actions ([#16570](https://github.com/RocketChat/Rocket.Chat/pull/16570))
+
 - Update Apps-Engine version ([#16584](https://github.com/RocketChat/Rocket.Chat/pull/16584))
+
 - Add breaking notice regarding TLS ([#16575](https://github.com/RocketChat/Rocket.Chat/pull/16575))
+
 - Regression: Modal onSubmit ([#16556](https://github.com/RocketChat/Rocket.Chat/pull/16556))
+
 - Regression: send file modal not working via keyboard ([#16607](https://github.com/RocketChat/Rocket.Chat/pull/16607))
+
 - Fix github actions accessing the github registry ([#16521](https://github.com/RocketChat/Rocket.Chat/pull/16521) by [@mrsimpson](https://github.com/mrsimpson))
 
 </details>
@@ -315,6 +472,7 @@
 
 ### 🐛 Bug fixes
 
+
 - users.info endpoint not handling the error if the user does not exist ([#16495](https://github.com/RocketChat/Rocket.Chat/pull/16495))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -332,11 +490,13 @@
 
 ### 🐛 Bug fixes
 
+
 - `stdout` streamer infinite loop ([#16452](https://github.com/RocketChat/Rocket.Chat/pull/16452))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 2.4.9 ([#16544](https://github.com/RocketChat/Rocket.Chat/pull/16544))
 
 </details>
@@ -356,7 +516,9 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 2.4.8 ([#16506](https://github.com/RocketChat/Rocket.Chat/pull/16506))
+
 - Update presence package to 2.6.1 ([#16486](https://github.com/RocketChat/Rocket.Chat/pull/16486))
 
 </details>
@@ -375,11 +537,13 @@
 
 ### 🐛 Bug fixes
 
+
 - Option to make a channel default ([#16433](https://github.com/RocketChat/Rocket.Chat/pull/16433))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 2.4.7 ([#16444](https://github.com/RocketChat/Rocket.Chat/pull/16444))
 
 </details>
@@ -400,8 +564,11 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 2.4.6 ([#16402](https://github.com/RocketChat/Rocket.Chat/pull/16402))
+
 - Revert message properties validation ([#16395](https://github.com/RocketChat/Rocket.Chat/pull/16395))
+
 - Fix index creation for apps_logs collection ([#16401](https://github.com/RocketChat/Rocket.Chat/pull/16401))
 
 </details>
@@ -423,6 +590,7 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 2.4.5 ([#16380](https://github.com/RocketChat/Rocket.Chat/pull/16380))
 
 </details>
@@ -441,12 +609,15 @@
 
 ### 🐛 Bug fixes
 
+
 - App removal was moving logs to the trash collection ([#16362](https://github.com/RocketChat/Rocket.Chat/pull/16362))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 2.4.4 ([#16377](https://github.com/RocketChat/Rocket.Chat/pull/16377))
+
 - Regression: Rate limiter was not working due to Meteor internal changes ([#16361](https://github.com/RocketChat/Rocket.Chat/pull/16361))
 
 </details>
@@ -466,12 +637,15 @@
 
 ### 🐛 Bug fixes
 
+
 - Unknown error when sending message if 'Set a User Name to Alias in Message' setting is enabled ([#16347](https://github.com/RocketChat/Rocket.Chat/pull/16347))
+
 - Invite links usage by channel owners/moderators ([#16176](https://github.com/RocketChat/Rocket.Chat/pull/16176))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 2.4.3 ([#16358](https://github.com/RocketChat/Rocket.Chat/pull/16358))
 
 </details>
@@ -491,14 +665,19 @@
 
 ### 🐛 Bug fixes
 
+
 - Setup Wizard inputs and Admin Settings ([#16147](https://github.com/RocketChat/Rocket.Chat/pull/16147))
+
 - Slack CSV User Importer ([#16253](https://github.com/RocketChat/Rocket.Chat/pull/16253))
+
 - Integrations list without pagination and outgoing integration creation ([#16233](https://github.com/RocketChat/Rocket.Chat/pull/16233))
+
 - User stuck after reset password ([#16184](https://github.com/RocketChat/Rocket.Chat/pull/16184))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 2.4.2 ([#16274](https://github.com/RocketChat/Rocket.Chat/pull/16274))
 
 </details>
@@ -520,12 +699,15 @@
 
 ### 🐛 Bug fixes
 
+
 - Enable apps change properties of the sender on the message as before ([#16189](https://github.com/RocketChat/Rocket.Chat/pull/16189))
+
 - JS errors on Administration page ([#16139](https://github.com/RocketChat/Rocket.Chat/pull/16139))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 2.4.1 ([#16195](https://github.com/RocketChat/Rocket.Chat/pull/16195))
 
 </details>
@@ -547,87 +729,159 @@
 
 ### 🎉 New features
 
+
 - Invite links: share a link to invite users ([#15933](https://github.com/RocketChat/Rocket.Chat/pull/15933))
+
 - Logout other clients when changing password ([#15927](https://github.com/RocketChat/Rocket.Chat/pull/15927))
+
 - Do not print emails in console on production mode ([#15928](https://github.com/RocketChat/Rocket.Chat/pull/15928))
+
 - Apps-Engine event for when a livechat room is closed ([#15837](https://github.com/RocketChat/Rocket.Chat/pull/15837))
 
 ### 🚀 Improvements
 
+
 - Replace livechat:inquiry publication by REST and Streamer ([#15977](https://github.com/RocketChat/Rocket.Chat/pull/15977))
+
 - Sorting on livechat analytics queries were wrong ([#16021](https://github.com/RocketChat/Rocket.Chat/pull/16021))
+
 - Replace fullUserData publication by REST ([#15650](https://github.com/RocketChat/Rocket.Chat/pull/15650))
+
 - Replace integrations and integrationHistory publications by REST ([#15885](https://github.com/RocketChat/Rocket.Chat/pull/15885))
+
 - Notify logged agents when their departments change ([#16033](https://github.com/RocketChat/Rocket.Chat/pull/16033))
+
 - Replace fullEmojiData publication by REST ([#15901](https://github.com/RocketChat/Rocket.Chat/pull/15901))
+
 - Replace adminRooms publication by REST ([#15948](https://github.com/RocketChat/Rocket.Chat/pull/15948))
+
 - Replace webdavAccounts publication by REST ([#15926](https://github.com/RocketChat/Rocket.Chat/pull/15926))
+
 - Replace oauth publications by REST ([#15878](https://github.com/RocketChat/Rocket.Chat/pull/15878))
+
 - Replace userAutocomplete publication by REST ([#15956](https://github.com/RocketChat/Rocket.Chat/pull/15956))
+
 - Replace discussionsOfARoom publication by REST ([#15908](https://github.com/RocketChat/Rocket.Chat/pull/15908))
+
 - Move 'Reply in Thread' button from menu to message actions ([#15685](https://github.com/RocketChat/Rocket.Chat/pull/15685) by [@antkaz](https://github.com/antkaz))
+
 - Replace customSounds publication by REST ([#15907](https://github.com/RocketChat/Rocket.Chat/pull/15907))
+
 - Replace stdout publication by REST ([#16004](https://github.com/RocketChat/Rocket.Chat/pull/16004))
+
 - Replace fullUserStatusData publication by REST ([#15942](https://github.com/RocketChat/Rocket.Chat/pull/15942))
+
 - Replace userData subscriptions by REST ([#15916](https://github.com/RocketChat/Rocket.Chat/pull/15916))
+
 - Replace roles publication by REST ([#15910](https://github.com/RocketChat/Rocket.Chat/pull/15910))
+
 - Livechat realtime dashboard ([#15792](https://github.com/RocketChat/Rocket.Chat/pull/15792))
+
 - Replace livechat:rooms publication by REST ([#15968](https://github.com/RocketChat/Rocket.Chat/pull/15968))
+
 - Replace livechat:officeHour publication to REST ([#15503](https://github.com/RocketChat/Rocket.Chat/pull/15503))
+
 - Replace forgotten livechat:departmentAgents subscriptions ([#15970](https://github.com/RocketChat/Rocket.Chat/pull/15970))
+
 - Replace livechat:managers publication by REST ([#15944](https://github.com/RocketChat/Rocket.Chat/pull/15944))
+
 - Replace livechat:visitorHistory publication by REST ([#15943](https://github.com/RocketChat/Rocket.Chat/pull/15943))
+
 - Replace livechat:queue subscription ([#15612](https://github.com/RocketChat/Rocket.Chat/pull/15612))
+
 - Add deprecate warning in some unused publications ([#15935](https://github.com/RocketChat/Rocket.Chat/pull/15935))
+
 - Replace livechat:customFields to REST ([#15496](https://github.com/RocketChat/Rocket.Chat/pull/15496))
+
 - Validate user identity on send message process ([#15887](https://github.com/RocketChat/Rocket.Chat/pull/15887))
+
 - Update ui for Roles field ([#15888](https://github.com/RocketChat/Rocket.Chat/pull/15888) by [@antkaz](https://github.com/antkaz))
 
 ### 🐛 Bug fixes
 
+
 - Importer: Variable name appearing instead of it's value ([#16010](https://github.com/RocketChat/Rocket.Chat/pull/16010) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
 - Add time format for latest message on the sidebar ([#15930](https://github.com/RocketChat/Rocket.Chat/pull/15930) by [@ritwizsinha](https://github.com/ritwizsinha))
+
 - Admin Setting descriptions and Storybook ([#15994](https://github.com/RocketChat/Rocket.Chat/pull/15994))
+
 - width of upload-progress-text ([#16023](https://github.com/RocketChat/Rocket.Chat/pull/16023))
+
 - Message list scrolling to bottom on reactions ([#16018](https://github.com/RocketChat/Rocket.Chat/pull/16018))
+
 - SAML logout error ([#15978](https://github.com/RocketChat/Rocket.Chat/pull/15978))
+
 - Added Join button to Read Only rooms. ([#16016](https://github.com/RocketChat/Rocket.Chat/pull/16016))
+
 - z-index of new message button ([#16013](https://github.com/RocketChat/Rocket.Chat/pull/16013))
+
 - new message popup ([#16017](https://github.com/RocketChat/Rocket.Chat/pull/16017))
+
 - Changed renderMessage priority, fixed Katex on/off setting ([#16012](https://github.com/RocketChat/Rocket.Chat/pull/16012))
+
 - Empty security section when 2fa is disabled ([#16009](https://github.com/RocketChat/Rocket.Chat/pull/16009))
+
 - Dropzone being stuck when dragging to thread ([#16006](https://github.com/RocketChat/Rocket.Chat/pull/16006))
+
 - Fix sort livechat rooms ([#16001](https://github.com/RocketChat/Rocket.Chat/pull/16001))
+
 - Guest's name field missing when forwarding livechat rooms ([#15991](https://github.com/RocketChat/Rocket.Chat/pull/15991))
+
 - Error of bind environment on user data export ([#15985](https://github.com/RocketChat/Rocket.Chat/pull/15985))
+
 - Incorrect translation key on Livechat Appearance template ([#15975](https://github.com/RocketChat/Rocket.Chat/pull/15975) by [@ritwizsinha](https://github.com/ritwizsinha))
+
 - Livechat build without NodeJS installed ([#15903](https://github.com/RocketChat/Rocket.Chat/pull/15903) by [@localguru](https://github.com/localguru))
+
 - Server crash on sync with no response ([#15919](https://github.com/RocketChat/Rocket.Chat/pull/15919))
+
 - Don't throw an error when a message is prevented from apps engine ([#15850](https://github.com/RocketChat/Rocket.Chat/pull/15850) by [@wreiske](https://github.com/wreiske))
+
 - Thread Replies in Search ([#15841](https://github.com/RocketChat/Rocket.Chat/pull/15841))
+
 - Registration form was hidden when login form was disabled ([#16062](https://github.com/RocketChat/Rocket.Chat/pull/16062))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Update NodeJS to 8.17.0 ([#16043](https://github.com/RocketChat/Rocket.Chat/pull/16043))
+
 - Fix typo in Italian translation ([#15998](https://github.com/RocketChat/Rocket.Chat/pull/15998) by [@iannuzzelli](https://github.com/iannuzzelli))
+
 - Update Meteor to 1.8.3 ([#16037](https://github.com/RocketChat/Rocket.Chat/pull/16037))
+
 - Some performance improvements ([#15886](https://github.com/RocketChat/Rocket.Chat/pull/15886))
+
 - Fixed Grammatical Mistakes. ([#15570](https://github.com/RocketChat/Rocket.Chat/pull/15570) by [@breaking-let](https://github.com/breaking-let))
+
 - Upgrade limax to 2.0.0 ([#16020](https://github.com/RocketChat/Rocket.Chat/pull/16020))
+
 - Remove unnecessary cron starts ([#15989](https://github.com/RocketChat/Rocket.Chat/pull/15989))
+
 - Enable typescript lint ([#15979](https://github.com/RocketChat/Rocket.Chat/pull/15979))
+
 - LingoHub based on develop ([#15988](https://github.com/RocketChat/Rocket.Chat/pull/15988))
+
 - Fix 'How it all started' link on README ([#15962](https://github.com/RocketChat/Rocket.Chat/pull/15962) by [@zdumitru](https://github.com/zdumitru))
+
 - Check package-lock consistency with package.json on CI ([#15961](https://github.com/RocketChat/Rocket.Chat/pull/15961))
+
 - Meteor update to 1.8.2 ([#15873](https://github.com/RocketChat/Rocket.Chat/pull/15873))
+
 - GitHub CI ([#15918](https://github.com/RocketChat/Rocket.Chat/pull/15918))
+
 - Change migration number 169 <-> 170 ([#15940](https://github.com/RocketChat/Rocket.Chat/pull/15940))
+
 - LingoHub based on develop ([#15939](https://github.com/RocketChat/Rocket.Chat/pull/15939))
+
 - [CHORE] Replace findOne with findOneById methods (Omnichannel) ([#15894](https://github.com/RocketChat/Rocket.Chat/pull/15894))
+
 - Merge master into develop & Set version to 3.0.0-develop ([#15872](https://github.com/RocketChat/Rocket.Chat/pull/15872))
+
 - Regression: Update components ([#16053](https://github.com/RocketChat/Rocket.Chat/pull/16053))
+
 - Regression: Missing button to copy Invite links ([#16084](https://github.com/RocketChat/Rocket.Chat/pull/16084))
 
 </details>
@@ -669,6 +923,7 @@
 
 ### 🐛 Bug fixes
 
+
 - Add missing password field back to administration area ([#16171](https://github.com/RocketChat/Rocket.Chat/pull/16171))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -686,7 +941,9 @@
 
 ### 🐛 Bug fixes
 
+
 - Invalid Redirect URI on Custom OAuth ([#15957](https://github.com/RocketChat/Rocket.Chat/pull/15957))
+
 - Livechat Widget version 1.3.0 ([#15966](https://github.com/RocketChat/Rocket.Chat/pull/15966))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -704,11 +961,17 @@
 
 ### 🐛 Bug fixes
 
+
 - Default value of the Livechat WebhookUrl setting ([#15898](https://github.com/RocketChat/Rocket.Chat/pull/15898))
+
 - Admin menu not showing after renamed integration permissions ([#15937](https://github.com/RocketChat/Rocket.Chat/pull/15937) by [@n-se](https://github.com/n-se))
+
 - Administration UI issues ([#15934](https://github.com/RocketChat/Rocket.Chat/pull/15934))
+
 - Livechat permissions being overwrite on server restart ([#15915](https://github.com/RocketChat/Rocket.Chat/pull/15915))
+
 - Livechat triggers not firing ([#15897](https://github.com/RocketChat/Rocket.Chat/pull/15897))
+
 - Auto load image user preference ([#15895](https://github.com/RocketChat/Rocket.Chat/pull/15895))
 
 ### 👩‍💻👨‍💻 Contributors 😍
@@ -731,90 +994,165 @@
 
 ### 🎉 New features
 
+
 - Add forms to view and edit Livechat agents info ([#15703](https://github.com/RocketChat/Rocket.Chat/pull/15703))
+
 - Workspace Manual Registration ([#15442](https://github.com/RocketChat/Rocket.Chat/pull/15442))
+
 - Option on livechat departments to ensure a chat has tags before closing ([#15752](https://github.com/RocketChat/Rocket.Chat/pull/15752))
+
 - Setting to dismiss desktop notification only after interaction ([#14807](https://github.com/RocketChat/Rocket.Chat/pull/14807) by [@mpdbl](https://github.com/mpdbl))
+
 - Option for admins to set a random password to a user ([#15818](https://github.com/RocketChat/Rocket.Chat/pull/15818))
+
 - SAML login without popup windows ([#15836](https://github.com/RocketChat/Rocket.Chat/pull/15836))
+
 - Add ability to users reset their own E2E key ([#15777](https://github.com/RocketChat/Rocket.Chat/pull/15777))
+
 - Notify users when their email address change ([#15828](https://github.com/RocketChat/Rocket.Chat/pull/15828))
+
 - Add a new stream to emit and listen room data events ([#15770](https://github.com/RocketChat/Rocket.Chat/pull/15770))
+
 - Livechat analytics ([#15230](https://github.com/RocketChat/Rocket.Chat/pull/15230))
+
 - Allow Regexes on SAML user field mapping ([#15743](https://github.com/RocketChat/Rocket.Chat/pull/15743))
+
 - Livechat analytics functions ([#15666](https://github.com/RocketChat/Rocket.Chat/pull/15666))
+
 - add delete-own-message permission ([#15512](https://github.com/RocketChat/Rocket.Chat/pull/15512))
 
 ### 🚀 Improvements
 
+
 - Make push notification batchsize and interval configurable ([#15804](https://github.com/RocketChat/Rocket.Chat/pull/15804) by [@Exordian](https://github.com/Exordian))
+
 - Add more fields to iframe integration event `unread-changed-by-subscription` ([#15786](https://github.com/RocketChat/Rocket.Chat/pull/15786))
+
 - Allow dragging of images and text from browsers ([#15691](https://github.com/RocketChat/Rocket.Chat/pull/15691))
+
 - Unfollow own threads ([#15740](https://github.com/RocketChat/Rocket.Chat/pull/15740))
+
 - Administration UI - React and Fuselage components ([#15452](https://github.com/RocketChat/Rocket.Chat/pull/15452))
+
 - Replace livechat:pagesvisited publication by REST ([#15629](https://github.com/RocketChat/Rocket.Chat/pull/15629))
+
 - Replace livechat:externalMessages publication by REST ([#15643](https://github.com/RocketChat/Rocket.Chat/pull/15643))
+
 - dynamic import  livechat views ([#15775](https://github.com/RocketChat/Rocket.Chat/pull/15775))
+
 - Replace livechat:visitorInfo publication by REST ([#15639](https://github.com/RocketChat/Rocket.Chat/pull/15639))
+
 - Lazyload Chart.js ([#15764](https://github.com/RocketChat/Rocket.Chat/pull/15764))
+
 - Lazyload qrcode lib ([#15741](https://github.com/RocketChat/Rocket.Chat/pull/15741))
+
 - Replace personalAccessTokens publication by REST ([#15644](https://github.com/RocketChat/Rocket.Chat/pull/15644))
+
 - Replace livechat:departmentAgents subscription to REST ([#15529](https://github.com/RocketChat/Rocket.Chat/pull/15529))
+
 - remove computations inside messageAttachment ([#15716](https://github.com/RocketChat/Rocket.Chat/pull/15716))
+
 - Replace snippetedMessage publication by REST ([#15679](https://github.com/RocketChat/Rocket.Chat/pull/15679))
+
 - Replace snipptedMessages publication by REST ([#15678](https://github.com/RocketChat/Rocket.Chat/pull/15678))
+
 - Remove "EmojiCustom" unused subscription ([#15658](https://github.com/RocketChat/Rocket.Chat/pull/15658))
 
 ### 🐛 Bug fixes
 
+
 - Missing Privacy Policy Agree on register ([#15832](https://github.com/RocketChat/Rocket.Chat/pull/15832))
+
 - Push: fix notification priority for google (FCM) ([#15803](https://github.com/RocketChat/Rocket.Chat/pull/15803) by [@Exordian](https://github.com/Exordian))
+
 - Not valid relative URLs on message attachments ([#15651](https://github.com/RocketChat/Rocket.Chat/pull/15651))
+
 - REST endpoint `chat.syncMessages` returning an error with deleted messages ([#15824](https://github.com/RocketChat/Rocket.Chat/pull/15824))
+
 - Channel notification audio preferences ([#15771](https://github.com/RocketChat/Rocket.Chat/pull/15771))
+
 - Pasting images on reply as thread ([#15811](https://github.com/RocketChat/Rocket.Chat/pull/15811))
+
 - Prevent agent last message undefined ([#15809](https://github.com/RocketChat/Rocket.Chat/pull/15809))
+
 - Livechat transfer history messages ([#15780](https://github.com/RocketChat/Rocket.Chat/pull/15780))
+
 - Add button to reset.css ([#15773](https://github.com/RocketChat/Rocket.Chat/pull/15773))
+
 - Mentions before blockquote ([#15774](https://github.com/RocketChat/Rocket.Chat/pull/15774))
+
 - Sidebar font color was not respecting theming ([#15745](https://github.com/RocketChat/Rocket.Chat/pull/15745))
+
 - Add livechat agents into departments ([#15732](https://github.com/RocketChat/Rocket.Chat/pull/15732))
+
 - Changed cmsPage Style ([#15632](https://github.com/RocketChat/Rocket.Chat/pull/15632))
+
 - Forward Livechat UI and the related permissions  ([#15718](https://github.com/RocketChat/Rocket.Chat/pull/15718))
+
 - line-height to show entire letters ([#15581](https://github.com/RocketChat/Rocket.Chat/pull/15581) by [@nstseek](https://github.com/nstseek))
+
 - Apply server side filters on Livechat lists ([#15717](https://github.com/RocketChat/Rocket.Chat/pull/15717))
+
 - Error when exporting user data ([#15654](https://github.com/RocketChat/Rocket.Chat/pull/15654))
+
 - Livechat webhook broken when sending an image ([#15699](https://github.com/RocketChat/Rocket.Chat/pull/15699) by [@tatosjb](https://github.com/tatosjb))
+
 - Sending messages to livechat rooms without a subscription ([#15707](https://github.com/RocketChat/Rocket.Chat/pull/15707))
+
 - Duplicate label 'Hide Avatars' in accounts ([#15694](https://github.com/RocketChat/Rocket.Chat/pull/15694) by [@rajvaibhavdubey](https://github.com/rajvaibhavdubey))
+
 - Block Show_Setup_Wizard Option ([#15623](https://github.com/RocketChat/Rocket.Chat/pull/15623))
+
 - Use Media Devices API to guess if a microphone is not available ([#15636](https://github.com/RocketChat/Rocket.Chat/pull/15636))
+
 - Ignore file uploads from message box if text/plain content is being pasted ([#15631](https://github.com/RocketChat/Rocket.Chat/pull/15631))
+
 - typo on PT-BR translation ([#15645](https://github.com/RocketChat/Rocket.Chat/pull/15645))
+
 - Null value at Notifications Preferences tab ([#15638](https://github.com/RocketChat/Rocket.Chat/pull/15638))
+
 - Edit in thread ([#15640](https://github.com/RocketChat/Rocket.Chat/pull/15640))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 2.2.0 ([#15681](https://github.com/RocketChat/Rocket.Chat/pull/15681) by [@Montel](https://github.com/Montel) & [@antkaz](https://github.com/antkaz) & [@hmagarotto](https://github.com/hmagarotto) & [@nstseek](https://github.com/nstseek) & [@oguhpereira](https://github.com/oguhpereira) & [@rodrigokamada](https://github.com/rodrigokamada) & [@yusukeh0710](https://github.com/yusukeh0710))
+
 - LingoHub based on develop ([#15822](https://github.com/RocketChat/Rocket.Chat/pull/15822))
+
 - [REGRESSION] Add livechat room type to the room's file list ([#15795](https://github.com/RocketChat/Rocket.Chat/pull/15795))
+
 - Fix notification migration ([#15783](https://github.com/RocketChat/Rocket.Chat/pull/15783))
+
 - Regression: fix admin instances info page ([#15772](https://github.com/RocketChat/Rocket.Chat/pull/15772))
+
 - LingoHub based on develop ([#15763](https://github.com/RocketChat/Rocket.Chat/pull/15763))
+
 - Regression: messageAttachments inside messageAttachments not receiving settings ([#15733](https://github.com/RocketChat/Rocket.Chat/pull/15733))
+
 - Improve LDAP Login Fallback setting description in portuguese ([#15655](https://github.com/RocketChat/Rocket.Chat/pull/15655))
+
 - Update moment-timezone ([#15729](https://github.com/RocketChat/Rocket.Chat/pull/15729))
+
 - LingoHub based on develop ([#15728](https://github.com/RocketChat/Rocket.Chat/pull/15728))
+
 - Regression: Fix hide avatars in side bar preference ([#15709](https://github.com/RocketChat/Rocket.Chat/pull/15709))
+
 - Remove yarn.lock ([#15689](https://github.com/RocketChat/Rocket.Chat/pull/15689))
+
 - LingoHub based on develop ([#15688](https://github.com/RocketChat/Rocket.Chat/pull/15688))
+
 - Merge master into develop & Set version to 2.3.0-develop ([#15683](https://github.com/RocketChat/Rocket.Chat/pull/15683))
+
 - Release 2.2.0 ([#15681](https://github.com/RocketChat/Rocket.Chat/pull/15681) by [@Montel](https://github.com/Montel) & [@antkaz](https://github.com/antkaz) & [@hmagarotto](https://github.com/hmagarotto) & [@nstseek](https://github.com/nstseek) & [@oguhpereira](https://github.com/oguhpereira) & [@rodrigokamada](https://github.com/rodrigokamada) & [@yusukeh0710](https://github.com/yusukeh0710))
+
 - Fix Livechat duplicated templates error ([#15869](https://github.com/RocketChat/Rocket.Chat/pull/15869))
+
 - Improvements to random password field on user edit/creation ([#15870](https://github.com/RocketChat/Rocket.Chat/pull/15870))
+
 - Remove unused permission to reset users' E2E key ([#15860](https://github.com/RocketChat/Rocket.Chat/pull/15860))
+
 - [CHORE] Add lingohub to readme ([#15849](https://github.com/RocketChat/Rocket.Chat/pull/15849))
 
 </details>
@@ -868,94 +1206,173 @@
 
 ### 🎉 New features
 
+
 - Accept GIFs and SVGs for Avatars converting them to PNG and keep transparency of PNGs ([#11385](https://github.com/RocketChat/Rocket.Chat/pull/11385))
+
 - Thread support to apps slashcommands and slashcommand previews ([#15574](https://github.com/RocketChat/Rocket.Chat/pull/15574))
+
 - Remove all closed Livechat chats ([#13991](https://github.com/RocketChat/Rocket.Chat/pull/13991) by [@knrt10](https://github.com/knrt10))
+
 - Separate integration roles ([#13902](https://github.com/RocketChat/Rocket.Chat/pull/13902))
+
 - Add users.requestDataDownload API endpoint ([#14428](https://github.com/RocketChat/Rocket.Chat/pull/14428) by [@Hudell](https://github.com/Hudell) & [@ubarsaiyan](https://github.com/ubarsaiyan))
+
 - Check if agent can receive new livechat conversations when its status is away/idle ([#15451](https://github.com/RocketChat/Rocket.Chat/pull/15451))
+
 - Import SAML language and auto join SAML channels ([#14203](https://github.com/RocketChat/Rocket.Chat/pull/14203) by [@Hudell](https://github.com/Hudell) & [@unixtam](https://github.com/unixtam))
+
 - Add option to enable X-Frame-options header to avoid loading inside any Iframe ([#14698](https://github.com/RocketChat/Rocket.Chat/pull/14698))
+
 - Assign new Livechat conversations to bot agents first ([#15317](https://github.com/RocketChat/Rocket.Chat/pull/15317))
+
 - Added file type filter to RoomFiles ([#15289](https://github.com/RocketChat/Rocket.Chat/pull/15289) by [@juanpetterson](https://github.com/juanpetterson))
+
 - Add new Livechat appearance setting to set the conversation finished message ([#15577](https://github.com/RocketChat/Rocket.Chat/pull/15577))
+
 - close emoji box using Keyboard Escape key ([#13956](https://github.com/RocketChat/Rocket.Chat/pull/13956) by [@mohamedar97](https://github.com/mohamedar97))
+
 - Update livechat widget version to 1.2.5 ([#15600](https://github.com/RocketChat/Rocket.Chat/pull/15600))
+
 - Import DMs from CSV files ([#15534](https://github.com/RocketChat/Rocket.Chat/pull/15534))
 
 ### 🚀 Improvements
 
+
 - Replace livechat:integration publication by REST ([#15607](https://github.com/RocketChat/Rocket.Chat/pull/15607))
+
 - Replace livechat:appearance pub to REST ([#15510](https://github.com/RocketChat/Rocket.Chat/pull/15510))
+
 - Cache hasPermissions ([#15589](https://github.com/RocketChat/Rocket.Chat/pull/15589))
+
 - Disable edit visitor's phone number in SMS conversations ([#15593](https://github.com/RocketChat/Rocket.Chat/pull/15593))
+
 - Lazyload Katex Package ([#15398](https://github.com/RocketChat/Rocket.Chat/pull/15398))
+
 - Replace `livechat:triggers` publication by REST calls ([#15507](https://github.com/RocketChat/Rocket.Chat/pull/15507))
+
 - Replace roomFilesWithSearchText subscription ([#15550](https://github.com/RocketChat/Rocket.Chat/pull/15550))
+
 - Replace starred messages subscription ([#15548](https://github.com/RocketChat/Rocket.Chat/pull/15548))
+
 - Replace some livechat:rooms subscriptions ([#15532](https://github.com/RocketChat/Rocket.Chat/pull/15532))
+
 - Replace pinned messages subscription ([#15544](https://github.com/RocketChat/Rocket.Chat/pull/15544))
+
 - Replace mentionedMessages publication to REST ([#15540](https://github.com/RocketChat/Rocket.Chat/pull/15540))
+
 - Detach React components from Meteor API ([#15482](https://github.com/RocketChat/Rocket.Chat/pull/15482))
+
 - Replace livechat:agents pub by REST calls ([#15490](https://github.com/RocketChat/Rocket.Chat/pull/15490))
+
 - Replace `livechat:departments` publication by REST Calls ([#15478](https://github.com/RocketChat/Rocket.Chat/pull/15478))
+
 - Secure cookies when using HTTPS connection ([#15500](https://github.com/RocketChat/Rocket.Chat/pull/15500))
+
 - Update Fuselage components on SetupWizard ([#15457](https://github.com/RocketChat/Rocket.Chat/pull/15457))
 
 ### 🐛 Bug fixes
 
+
 - Issues saving audio notifications ([#15428](https://github.com/RocketChat/Rocket.Chat/pull/15428) by [@scrivna](https://github.com/scrivna))
+
 - Fix a typo on Alpha API `e2e.setUserPublicAndPivateKeys` renaming to `e2e.setUserPublicAndPrivateKeys` ([#13334](https://github.com/RocketChat/Rocket.Chat/pull/13334))
+
 - Showing announcement back ([#15615](https://github.com/RocketChat/Rocket.Chat/pull/15615))
+
 - adjustments for tooltips to show room name instead of id ([#14084](https://github.com/RocketChat/Rocket.Chat/pull/14084) by [@mohamedar97](https://github.com/mohamedar97))
+
 - Deny editing visitor's phone number in SMS conversations ([#15602](https://github.com/RocketChat/Rocket.Chat/pull/15602))
+
 - Incorrect display of the button "Invite users" ([#15594](https://github.com/RocketChat/Rocket.Chat/pull/15594))
+
 - Compact view ([#15416](https://github.com/RocketChat/Rocket.Chat/pull/15416))
+
 - leak on stdout listeners ([#15586](https://github.com/RocketChat/Rocket.Chat/pull/15586))
+
 - Self-XSS in validation functionality ([#15564](https://github.com/RocketChat/Rocket.Chat/pull/15564))
+
 - Registration/login page now mobile friendly (#15422) ([#15520](https://github.com/RocketChat/Rocket.Chat/pull/15520) by [@nstseek](https://github.com/nstseek))
+
 - Update apps engine rooms converter to use transformMappedData ([#15546](https://github.com/RocketChat/Rocket.Chat/pull/15546))
+
 - Missing ending slash on publicFilePath of fileUpload ([#15506](https://github.com/RocketChat/Rocket.Chat/pull/15506))
+
 - Japanese translation for run import ([#15515](https://github.com/RocketChat/Rocket.Chat/pull/15515) by [@yusukeh0710](https://github.com/yusukeh0710))
+
 - Add a header for the createAt column in the Directory ([#15556](https://github.com/RocketChat/Rocket.Chat/pull/15556) by [@antkaz](https://github.com/antkaz))
+
 - Method saveUser is not using password policy ([#15445](https://github.com/RocketChat/Rocket.Chat/pull/15445))
+
 - Add permissions for slashCommands ([#15525](https://github.com/RocketChat/Rocket.Chat/pull/15525) by [@antkaz](https://github.com/antkaz))
+
 - Typo in autotranslate method ([#15344](https://github.com/RocketChat/Rocket.Chat/pull/15344) by [@Montel](https://github.com/Montel))
+
 - Adding "Promise.await" in "livechat/message" endpoint ([#15541](https://github.com/RocketChat/Rocket.Chat/pull/15541) by [@rodrigokamada](https://github.com/rodrigokamada))
+
 - Reset password was allowing empty values leading to an impossibility to login ([#15444](https://github.com/RocketChat/Rocket.Chat/pull/15444))
+
 - Emoji are rendered in URL ([#15516](https://github.com/RocketChat/Rocket.Chat/pull/15516) by [@oguhpereira](https://github.com/oguhpereira))
+
 - Promise await for sendMessage in livechat/messages endpoint ([#15460](https://github.com/RocketChat/Rocket.Chat/pull/15460) by [@hmagarotto](https://github.com/hmagarotto))
+
 - Exposing some fields on server logs at debug level ([#15514](https://github.com/RocketChat/Rocket.Chat/pull/15514))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Merge master into develop & Set version to 2.2.0-develop ([#15622](https://github.com/RocketChat/Rocket.Chat/pull/15622))
+
 - [FEATURE] Rest API upload file returns message object ([#13821](https://github.com/RocketChat/Rocket.Chat/pull/13821) by [@knrt10](https://github.com/knrt10))
+
 - New: Add dev dependency david badge to README ([#9058](https://github.com/RocketChat/Rocket.Chat/pull/9058) by [@robbyoconnor](https://github.com/robbyoconnor))
+
 - Regression: add stdout publication back ([#15614](https://github.com/RocketChat/Rocket.Chat/pull/15614))
+
 - Livechat Issues ([#15473](https://github.com/RocketChat/Rocket.Chat/pull/15473))
+
 - Regression: Fix broken message formatting box ([#15599](https://github.com/RocketChat/Rocket.Chat/pull/15599))
+
 - [CHORE] Update latest Livechat widget version to 1.2.4 ([#15596](https://github.com/RocketChat/Rocket.Chat/pull/15596))
+
 - Remove unneeded nginx file ([#15483](https://github.com/RocketChat/Rocket.Chat/pull/15483))
+
 - [REGRESSION] Fix remove department from list ([#15591](https://github.com/RocketChat/Rocket.Chat/pull/15591))
+
 - [CHORE] Update latest Livechat widget version to 1.2.2 ([#15592](https://github.com/RocketChat/Rocket.Chat/pull/15592))
+
 - Revert fix package-lock.json ([#15563](https://github.com/RocketChat/Rocket.Chat/pull/15563))
+
 - Regression: Fix package-lock.json ([#15561](https://github.com/RocketChat/Rocket.Chat/pull/15561))
+
 - [CHORE] Split logger classes to avoid cyclic dependencies ([#15559](https://github.com/RocketChat/Rocket.Chat/pull/15559))
+
 - docs: remove rocket chat launcher link ([#15477](https://github.com/RocketChat/Rocket.Chat/pull/15477) by [@RafaelGSS](https://github.com/RafaelGSS))
+
 - [CHORE] remove 'bulk-create-c' permission ([#15517](https://github.com/RocketChat/Rocket.Chat/pull/15517) by [@antkaz](https://github.com/antkaz))
+
 - Reply HTTP requests with `X-XSS-Protection: 1` header ([#15498](https://github.com/RocketChat/Rocket.Chat/pull/15498))
+
 - Updating license term ([#15476](https://github.com/RocketChat/Rocket.Chat/pull/15476))
+
 - LingoHub based on develop ([#15487](https://github.com/RocketChat/Rocket.Chat/pull/15487))
+
 - Merge master into develop & Set version to 2.2.0-develop ([#15469](https://github.com/RocketChat/Rocket.Chat/pull/15469))
+
 - Regression: hasPermission ignoring subscription roles ([#15652](https://github.com/RocketChat/Rocket.Chat/pull/15652))
+
 - Regression: AppRoomsConverter on Livechat rooms ([#15646](https://github.com/RocketChat/Rocket.Chat/pull/15646))
+
 - Regression: fix unknown role breaking hasPermission ([#15641](https://github.com/RocketChat/Rocket.Chat/pull/15641))
+
 - Regression: Move import to avoid circular dependencies ([#15628](https://github.com/RocketChat/Rocket.Chat/pull/15628))
+
 - Chore: Add Client Setup Information to Issue Template ([#15625](https://github.com/RocketChat/Rocket.Chat/pull/15625))
+
 - Move publication deprecation warnings ([#15676](https://github.com/RocketChat/Rocket.Chat/pull/15676))
+
 - Regression: Remove reference to obsolete template helper ([#15675](https://github.com/RocketChat/Rocket.Chat/pull/15675))
+
 - Merge master into develop ([#15680](https://github.com/RocketChat/Rocket.Chat/pull/15680) by [@knrt10](https://github.com/knrt10))
 
 </details>
@@ -1011,13 +1428,17 @@
 
 ### 🐛 Bug fixes
 
+
 - Read Receipts were not working properly with subscriptions without ls ([#15656](https://github.com/RocketChat/Rocket.Chat/pull/15656))
+
 - Exception when sending email of messages attachments undefined ([#15657](https://github.com/RocketChat/Rocket.Chat/pull/15657))
+
 - Channel Announcements not working ([#14635](https://github.com/RocketChat/Rocket.Chat/pull/14635) by [@knrt10](https://github.com/knrt10))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 2.1.2 ([#15667](https://github.com/RocketChat/Rocket.Chat/pull/15667) by [@knrt10](https://github.com/knrt10))
 
 </details>
@@ -1042,7 +1463,9 @@
 
 ### 🐛 Bug fixes
 
+
 - Read Recepts was not working ([#15603](https://github.com/RocketChat/Rocket.Chat/pull/15603))
+
 - Dynamic import of JS files were not working correctly ([#15598](https://github.com/RocketChat/Rocket.Chat/pull/15598))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -1060,88 +1483,158 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Deprecate old CORS API access for Cordova mobile app ([#15322](https://github.com/RocketChat/Rocket.Chat/pull/15322))
 
 ### 🎉 New features
 
+
 - Apps engine Livechat ([#14626](https://github.com/RocketChat/Rocket.Chat/pull/14626))
+
 - Livechat setting to show/hide Agent Information on the widget ([#15216](https://github.com/RocketChat/Rocket.Chat/pull/15216))
+
 - SAML User Data Mapping ([#15404](https://github.com/RocketChat/Rocket.Chat/pull/15404))
+
 - Add ability to disable email notifications globally ([#9667](https://github.com/RocketChat/Rocket.Chat/pull/9667) by [@ferdifly](https://github.com/ferdifly))
+
 - Validate NotBefore and NotOnOrAfter SAML assertions ([#15226](https://github.com/RocketChat/Rocket.Chat/pull/15226))
+
 - Setting to configure SAML context comparison ([#15229](https://github.com/RocketChat/Rocket.Chat/pull/15229))
+
 - Expand SAML Users Role Settings ([#15277](https://github.com/RocketChat/Rocket.Chat/pull/15277) by [@Hudell](https://github.com/Hudell))
+
 - Guess a user's name from SAML credentials ([#15240](https://github.com/RocketChat/Rocket.Chat/pull/15240) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Setting to remove message contents from email notifications ([#15406](https://github.com/RocketChat/Rocket.Chat/pull/15406))
+
 - Add JWT to uploaded files urls ([#15297](https://github.com/RocketChat/Rocket.Chat/pull/15297))
+
 - Provide site-url to outgoing integrations ([#15238](https://github.com/RocketChat/Rocket.Chat/pull/15238) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Only Load CodeMirror code when it is needed ([#15351](https://github.com/RocketChat/Rocket.Chat/pull/15351))
+
 - Allow file sharing through Twilio(WhatsApp) integration ([#15415](https://github.com/RocketChat/Rocket.Chat/pull/15415))
 
 ### 🚀 Improvements
 
+
 - Change default user's preference for notifications to 'All messages' ([#15420](https://github.com/RocketChat/Rocket.Chat/pull/15420))
+
 - Remove global Blaze helpers ([#15414](https://github.com/RocketChat/Rocket.Chat/pull/15414))
+
 - User data export ([#15294](https://github.com/RocketChat/Rocket.Chat/pull/15294) by [@Hudell](https://github.com/Hudell))
+
 - A11y: Buttons, Images, Popups ([#15405](https://github.com/RocketChat/Rocket.Chat/pull/15405))
+
 - Administration UI ([#15401](https://github.com/RocketChat/Rocket.Chat/pull/15401))
+
 - Make the agents field optional when updating Livechat departments ([#15400](https://github.com/RocketChat/Rocket.Chat/pull/15400))
+
 - Replace LESS autoprefixer plugin ([#15260](https://github.com/RocketChat/Rocket.Chat/pull/15260))
+
 - Add missing indices used by read receipts ([#15316](https://github.com/RocketChat/Rocket.Chat/pull/15316))
+
 - Add possibility of renaming a discussion ([#15122](https://github.com/RocketChat/Rocket.Chat/pull/15122))
+
 - AvatarBlockUnauthenticatedAccess do not call user.find if you dont have to ([#15355](https://github.com/RocketChat/Rocket.Chat/pull/15355))
+
 - improve autolinker flow ([#15340](https://github.com/RocketChat/Rocket.Chat/pull/15340))
+
 - Add CustomSounds.play() helper ([#15256](https://github.com/RocketChat/Rocket.Chat/pull/15256))
 
 ### 🐛 Bug fixes
 
+
 - Delivering real-time messages to users that left a room ([#15389](https://github.com/RocketChat/Rocket.Chat/pull/15389))
+
 - Federation messages notifications ([#15418](https://github.com/RocketChat/Rocket.Chat/pull/15418))
+
 - Property "permission" in slash commands of custom apps (#14739) ([#14741](https://github.com/RocketChat/Rocket.Chat/pull/14741) by [@ifantom](https://github.com/ifantom))
+
 - Notify admin was generating errors when Rocket.Cat user was edited or deleted ([#15387](https://github.com/RocketChat/Rocket.Chat/pull/15387))
+
 - Fix file uploads JWT ([#15412](https://github.com/RocketChat/Rocket.Chat/pull/15412))
+
 - Double send bug on message box ([#15409](https://github.com/RocketChat/Rocket.Chat/pull/15409))
+
 - Prune messages by cron if room not updated ([#15252](https://github.com/RocketChat/Rocket.Chat/pull/15252))
+
 - Subscription record not having the `ls` field ([#14544](https://github.com/RocketChat/Rocket.Chat/pull/14544))
+
 - CAS users can take control of Rocket.Chat accounts ([#15346](https://github.com/RocketChat/Rocket.Chat/pull/15346))
+
 - Add ENV VAR to enable users create token feature ([#15334](https://github.com/RocketChat/Rocket.Chat/pull/15334))
+
 - REST API to return only public custom fields ([#15292](https://github.com/RocketChat/Rocket.Chat/pull/15292))
+
 - REST endpoint `users.setPreferences` to not override all user's preferences ([#15288](https://github.com/RocketChat/Rocket.Chat/pull/15288))
+
 - LDAP usernames get additional '.' if they contain numbers ([#14644](https://github.com/RocketChat/Rocket.Chat/pull/14644) by [@Hudell](https://github.com/Hudell))
+
 - Don't allow email violating whitelist addresses ([#15339](https://github.com/RocketChat/Rocket.Chat/pull/15339))
+
 - Limit exposed fields on some users. endpoints ([#15327](https://github.com/RocketChat/Rocket.Chat/pull/15327))
+
 - Empty custom emojis on emoji picker ([#15392](https://github.com/RocketChat/Rocket.Chat/pull/15392))
+
 - User Profile Time Format ([#15385](https://github.com/RocketChat/Rocket.Chat/pull/15385))
+
 - Grammatical error in Not Found page ([#15382](https://github.com/RocketChat/Rocket.Chat/pull/15382))
+
 - Set the DEFAULT_ECDH_CURVE to auto (#15245) ([#15365](https://github.com/RocketChat/Rocket.Chat/pull/15365) by [@dlundgren](https://github.com/dlundgren))
+
 - Message box not centered ([#15367](https://github.com/RocketChat/Rocket.Chat/pull/15367))
+
 - Duplicate Channels in Search-bar ([#15056](https://github.com/RocketChat/Rocket.Chat/pull/15056))
+
 - Reduce Message cache time to 500ms ([#15295](https://github.com/RocketChat/Rocket.Chat/pull/15295) by [@vickyokrm](https://github.com/vickyokrm))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Regression: Prevent parsing empty custom field setting ([#15413](https://github.com/RocketChat/Rocket.Chat/pull/15413))
+
 - Use version 2 of the DeepL API ([#15364](https://github.com/RocketChat/Rocket.Chat/pull/15364) by [@vickyokrm](https://github.com/vickyokrm))
+
 - Remove GraphQL dependencies left ([#15356](https://github.com/RocketChat/Rocket.Chat/pull/15356))
+
 - [Fix] Missing space between last username & 'and' word in react notification ([#15384](https://github.com/RocketChat/Rocket.Chat/pull/15384) by [@zdumitru](https://github.com/zdumitru))
+
 - Add a missing 'Discussion' translation key ([#14029](https://github.com/RocketChat/Rocket.Chat/pull/14029) by [@ura14h](https://github.com/ura14h))
+
 - Improve Polish translation ([#14060](https://github.com/RocketChat/Rocket.Chat/pull/14060) by [@stepek](https://github.com/stepek))
+
 - Regression: Messagebox height changing when typing ([#15380](https://github.com/RocketChat/Rocket.Chat/pull/15380))
+
 - LingoHub based on develop ([#15377](https://github.com/RocketChat/Rocket.Chat/pull/15377))
+
 - Regression: Fix DDP metrics ([#15368](https://github.com/RocketChat/Rocket.Chat/pull/15368))
+
 - [CHORE] Move pathFor helper to templateHelpers directory ([#15255](https://github.com/RocketChat/Rocket.Chat/pull/15255))
+
 - Fix typo in LDAP User Search setting description ([#15228](https://github.com/RocketChat/Rocket.Chat/pull/15228))
+
 - Remove log ADMIN_PASS environment variable ([#15307](https://github.com/RocketChat/Rocket.Chat/pull/15307))
+
 - Improve text of the search bar description ([#15353](https://github.com/RocketChat/Rocket.Chat/pull/15353))
+
 - [CHORE] Remove obsolete modal template ([#15257](https://github.com/RocketChat/Rocket.Chat/pull/15257))
+
 - Update Meteor to 1.8.1 ([#15358](https://github.com/RocketChat/Rocket.Chat/pull/15358))
+
 - Merge master into develop & Set version to 2.1.0-develop ([#15357](https://github.com/RocketChat/Rocket.Chat/pull/15357))
+
 - Regression: Fix invalid version string error on marketplace screen ([#15437](https://github.com/RocketChat/Rocket.Chat/pull/15437))
+
 - Regression: Fix Commit Section when there is no commit info ([#15436](https://github.com/RocketChat/Rocket.Chat/pull/15436))
+
 - Regression: setup wizard dynamic import using relative url ([#15432](https://github.com/RocketChat/Rocket.Chat/pull/15432))
+
 - Regression: Favorite room button ([#15426](https://github.com/RocketChat/Rocket.Chat/pull/15426))
+
 - Regression: API CORS not working after Cordova being disabled by default ([#15443](https://github.com/RocketChat/Rocket.Chat/pull/15443))
+
 - Update Apps-Engine version to final version ([#15458](https://github.com/RocketChat/Rocket.Chat/pull/15458))
 
 </details>
@@ -1190,97 +1683,176 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Federation refactor with addition of chained events ([#15206](https://github.com/RocketChat/Rocket.Chat/pull/15206))
+
 - Remove support of MongoDB 3.2 and deprecate MongoDB 3.4 ([#15199](https://github.com/RocketChat/Rocket.Chat/pull/15199))
+
 - Remove GraphQL and grant packages ([#15192](https://github.com/RocketChat/Rocket.Chat/pull/15192))
+
 - Remove publication `roomSubscriptionsByRole` ([#15193](https://github.com/RocketChat/Rocket.Chat/pull/15193))
+
 - Remove publication `usersInRole` ([#15194](https://github.com/RocketChat/Rocket.Chat/pull/15194))
+
 - Remove old livechat client ([#15133](https://github.com/RocketChat/Rocket.Chat/pull/15133))
+
 - Replace tap:i18n to add support to 3-digit locales ([#15109](https://github.com/RocketChat/Rocket.Chat/pull/15109))
 
 ### 🎉 New features
 
+
 - Custom message popups ([#15117](https://github.com/RocketChat/Rocket.Chat/pull/15117) by [@Hudell](https://github.com/Hudell))
+
 - Options for SAML auth for individual organizations needs ([#14275](https://github.com/RocketChat/Rocket.Chat/pull/14275) by [@Deltachaos](https://github.com/Deltachaos) & [@Hudell](https://github.com/Hudell))
+
 - Assume that Rocket.Chat runs behind one proxy by default (HTTP_FORWARDED_COUNT=1) ([#15214](https://github.com/RocketChat/Rocket.Chat/pull/15214))
+
 - LDAP User Groups, Roles, and Channel Synchronization ([#14278](https://github.com/RocketChat/Rocket.Chat/pull/14278) by [@Hudell](https://github.com/Hudell) & [@wreiske](https://github.com/wreiske))
+
 - Setup Wizard and Page not found, using React components ([#15204](https://github.com/RocketChat/Rocket.Chat/pull/15204))
+
 - Add Mobex to the list of SMS service providers ([#14655](https://github.com/RocketChat/Rocket.Chat/pull/14655) by [@zolbayars](https://github.com/zolbayars))
+
 - Support multiple push gateways ([#14902](https://github.com/RocketChat/Rocket.Chat/pull/14902) by [@cardoso](https://github.com/cardoso))
+
 - Rest API Endpoint to get pinned messages from a room  ([#13864](https://github.com/RocketChat/Rocket.Chat/pull/13864) by [@thayannevls](https://github.com/thayannevls))
+
 - Granular permissions for settings ([#8942](https://github.com/RocketChat/Rocket.Chat/pull/8942) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Add autotranslate Rest endpoints ([#14885](https://github.com/RocketChat/Rocket.Chat/pull/14885))
+
 - Option to hide the button of Custom OAuth on login screen ([#15053](https://github.com/RocketChat/Rocket.Chat/pull/15053))
+
 - Endpoint to fetch livechat rooms with several filters ([#15155](https://github.com/RocketChat/Rocket.Chat/pull/15155))
+
 - Integrate DEEPL translation service to RC core ([#12174](https://github.com/RocketChat/Rocket.Chat/pull/12174) by [@mrsimpson](https://github.com/mrsimpson) & [@vickyokrm](https://github.com/vickyokrm))
+
 - Jitsi meet room access via a token ([#12259](https://github.com/RocketChat/Rocket.Chat/pull/12259) by [@rrzharikov](https://github.com/rrzharikov))
 
 ### 🚀 Improvements
 
+
 - Livechat User Management Improvements ([#14736](https://github.com/RocketChat/Rocket.Chat/pull/14736) by [@Hudell](https://github.com/Hudell))
+
 - Refactoring the queuing and routing processes of new livechats ([#15003](https://github.com/RocketChat/Rocket.Chat/pull/15003))
+
 - Add limit of 50 user's resume tokens ([#15102](https://github.com/RocketChat/Rocket.Chat/pull/15102))
+
 - Add asset extension validation ([#15088](https://github.com/RocketChat/Rocket.Chat/pull/15088))
+
 - Add possibility to use commands inside threads through Rest API ([#15167](https://github.com/RocketChat/Rocket.Chat/pull/15167))
+
 - Message tooltips as everyone else ([#15135](https://github.com/RocketChat/Rocket.Chat/pull/15135))
 
 ### 🐛 Bug fixes
 
+
 - Webdav crash ([#14918](https://github.com/RocketChat/Rocket.Chat/pull/14918))
+
 - Mark room as read logic ([#15174](https://github.com/RocketChat/Rocket.Chat/pull/15174))
+
 - Forget user session on window close ([#15205](https://github.com/RocketChat/Rocket.Chat/pull/15205))
+
 - Search message wrongly grouping messages ([#15094](https://github.com/RocketChat/Rocket.Chat/pull/15094))
+
 - Rate limit incoming integrations (webhooks) ([#15038](https://github.com/RocketChat/Rocket.Chat/pull/15038) by [@mrsimpson](https://github.com/mrsimpson))
+
 - User's auto complete showing everyone on the server ([#15212](https://github.com/RocketChat/Rocket.Chat/pull/15212))
+
 - "Discussion" label in Sidebar not hidden, when Discussions are disabled (#14660) ([#14682](https://github.com/RocketChat/Rocket.Chat/pull/14682) by [@ifantom](https://github.com/ifantom))
+
 - Typo in 'access-permissions_description' ja translation ([#15162](https://github.com/RocketChat/Rocket.Chat/pull/15162) by [@NatsumiKubo](https://github.com/NatsumiKubo))
+
 - IE11 modal, menu action and edit user page ([#15201](https://github.com/RocketChat/Rocket.Chat/pull/15201))
+
 - TabBar not loading template titles ([#15177](https://github.com/RocketChat/Rocket.Chat/pull/15177) by [@Hudell](https://github.com/Hudell))
+
 - Threads contextual bar button visible even with threads disabled ([#14956](https://github.com/RocketChat/Rocket.Chat/pull/14956) by [@cesarmal](https://github.com/cesarmal))
+
 - Prevent to create discussion with empty name ([#14507](https://github.com/RocketChat/Rocket.Chat/pull/14507))
+
 - Remove new hidden file and fix for .env files for Snap ([#15120](https://github.com/RocketChat/Rocket.Chat/pull/15120))
+
 - cachedcollection calling multiple times SYNC ([#15104](https://github.com/RocketChat/Rocket.Chat/pull/15104))
+
 - Redirect on app manual install ([#15306](https://github.com/RocketChat/Rocket.Chat/pull/15306))
+
 - IE11 baseURI  ([#15319](https://github.com/RocketChat/Rocket.Chat/pull/15319))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - LingoHub based on develop ([#15218](https://github.com/RocketChat/Rocket.Chat/pull/15218))
+
 - Regression: fix typo permisson to permission ([#15217](https://github.com/RocketChat/Rocket.Chat/pull/15217))
+
 - NEW: Apps enable after app installed ([#15202](https://github.com/RocketChat/Rocket.Chat/pull/15202))
+
 - Change notifications file imports to server ([#15184](https://github.com/RocketChat/Rocket.Chat/pull/15184))
+
 - Update Livechat to 1.1.6 ([#15186](https://github.com/RocketChat/Rocket.Chat/pull/15186))
+
 - Regression: remove livechat cache from circle ci ([#15183](https://github.com/RocketChat/Rocket.Chat/pull/15183))
+
 - Update presence package ([#15178](https://github.com/RocketChat/Rocket.Chat/pull/15178))
+
 - LingoHub based on develop ([#15166](https://github.com/RocketChat/Rocket.Chat/pull/15166))
+
 - Switch outdated roadmap to point to milestones ([#15156](https://github.com/RocketChat/Rocket.Chat/pull/15156))
+
 - Remove GPG file ([#15146](https://github.com/RocketChat/Rocket.Chat/pull/15146))
+
 - Add wreiske to authorized users in catbot ([#15147](https://github.com/RocketChat/Rocket.Chat/pull/15147))
+
 - Update to version 2.0.0-develop ([#15142](https://github.com/RocketChat/Rocket.Chat/pull/15142))
+
 - removed unwanted code ([#15078](https://github.com/RocketChat/Rocket.Chat/pull/15078) by [@httpsOmkar](https://github.com/httpsOmkar))
+
 - Update pt-BR.i18n.json ([#15083](https://github.com/RocketChat/Rocket.Chat/pull/15083) by [@lucassmacedo](https://github.com/lucassmacedo))
+
 - Regression: cachedCollection wrong callback parameters ([#15136](https://github.com/RocketChat/Rocket.Chat/pull/15136))
+
 - Allow file upload paths on attachments URLs ([#15121](https://github.com/RocketChat/Rocket.Chat/pull/15121))
+
 - Fix automated test for manual user activation ([#14978](https://github.com/RocketChat/Rocket.Chat/pull/14978) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Add new step to build Docker image from PRs for production again ([#15124](https://github.com/RocketChat/Rocket.Chat/pull/15124))
+
 - LingoHub based on develop ([#15115](https://github.com/RocketChat/Rocket.Chat/pull/15115))
+
 - Improve url validation inside message object ([#15074](https://github.com/RocketChat/Rocket.Chat/pull/15074))
+
 - Merge master into develop & Set version to 1.4.0-develop ([#15097](https://github.com/RocketChat/Rocket.Chat/pull/15097))
+
 - Federation improvements ([#15234](https://github.com/RocketChat/Rocket.Chat/pull/15234))
+
 - Regression: Fix assets extension detection ([#15231](https://github.com/RocketChat/Rocket.Chat/pull/15231))
+
 - Regression: Double error toast on Setup Wizard ([#15268](https://github.com/RocketChat/Rocket.Chat/pull/15268))
+
 - Regression: addPermissionToRole argument as string ([#15267](https://github.com/RocketChat/Rocket.Chat/pull/15267))
+
 - Regression: Remove old scripts of Setup Wizard ([#15263](https://github.com/RocketChat/Rocket.Chat/pull/15263))
+
 - Fix get IP for rate limiter ([#15262](https://github.com/RocketChat/Rocket.Chat/pull/15262))
+
 - Add oplog events metrics ([#15249](https://github.com/RocketChat/Rocket.Chat/pull/15249))
+
 - Regression: last message doesn't update after reconnect ([#15329](https://github.com/RocketChat/Rocket.Chat/pull/15329))
+
 - Regression: New Livechat methods and processes ([#15242](https://github.com/RocketChat/Rocket.Chat/pull/15242))
+
 - Regression: Remove duplicated permission changes emitter ([#15321](https://github.com/RocketChat/Rocket.Chat/pull/15321))
+
 - Regression: Errors on the console preventing some settings to be saved ([#15310](https://github.com/RocketChat/Rocket.Chat/pull/15310))
+
 - Fix v148 migration ([#15285](https://github.com/RocketChat/Rocket.Chat/pull/15285))
+
 - Fix apps list error ([#15258](https://github.com/RocketChat/Rocket.Chat/pull/15258))
+
 - Federation migration and additional improvements ([#15336](https://github.com/RocketChat/Rocket.Chat/pull/15336))
+
 - Regression: Fix wrong import and minor code improvements ([#15352](https://github.com/RocketChat/Rocket.Chat/pull/15352))
 
 </details>
@@ -1327,7 +1899,9 @@
 
 ### 🐛 Bug fixes
 
+
 - Markdown link parser ([#15794](https://github.com/RocketChat/Rocket.Chat/pull/15794))
+
 - Updating an app via "Update" button errors out with "App already exists" ([#15814](https://github.com/RocketChat/Rocket.Chat/pull/15814))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -1345,15 +1919,21 @@
 
 ### 🐛 Bug fixes
 
+
 - Attachment download button behavior ([#15172](https://github.com/RocketChat/Rocket.Chat/pull/15172))
+
 - Messages search scroll ([#15175](https://github.com/RocketChat/Rocket.Chat/pull/15175))
+
 - IE11 -  callback createTreeWalker doesnt accept acceptNode ([#15157](https://github.com/RocketChat/Rocket.Chat/pull/15157))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 1.3.2 ([#15176](https://github.com/RocketChat/Rocket.Chat/pull/15176))
+
 - Update latest Livechat widget version to 1.1.4 ([#15173](https://github.com/RocketChat/Rocket.Chat/pull/15173))
+
 - Update latest Livechat widget version(1.1.3) ([#15154](https://github.com/RocketChat/Rocket.Chat/pull/15154))
 
 </details>
@@ -1375,12 +1955,15 @@
 
 ### 🐛 Bug fixes
 
+
 - Custom emoji table scroll ([#15119](https://github.com/RocketChat/Rocket.Chat/pull/15119))
+
 - Direct Message names not visible on Admin panel ([#15114](https://github.com/RocketChat/Rocket.Chat/pull/15114))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 1.3.1 ([#15148](https://github.com/RocketChat/Rocket.Chat/pull/15148))
 
 </details>
@@ -1401,92 +1984,169 @@
 
 ### 🎉 New features
 
+
 - Show helpful error when oplog is missing ([#14954](https://github.com/RocketChat/Rocket.Chat/pull/14954) by [@justinr1234](https://github.com/justinr1234))
+
 - Subscription enabled marketplace ([#14948](https://github.com/RocketChat/Rocket.Chat/pull/14948))
+
 - Deprecate MongoDB version 3.2 ([#15025](https://github.com/RocketChat/Rocket.Chat/pull/15025))
+
 - Options to filter discussion and livechat on Admin > Rooms ([#15019](https://github.com/RocketChat/Rocket.Chat/pull/15019))
+
 - Settings to further customize GitLab OAuth ([#15014](https://github.com/RocketChat/Rocket.Chat/pull/15014) by [@Hudell](https://github.com/Hudell))
+
 - Accept multiple redirect URIs on OAuth Apps ([#14935](https://github.com/RocketChat/Rocket.Chat/pull/14935) by [@Hudell](https://github.com/Hudell))
+
 - Setting to configure custom authn context on SAML requests ([#14675](https://github.com/RocketChat/Rocket.Chat/pull/14675) by [@Hudell](https://github.com/Hudell))
+
 - Webdav File Picker ([#14879](https://github.com/RocketChat/Rocket.Chat/pull/14879) by [@ubarsaiyan](https://github.com/ubarsaiyan))
+
 - Setting to prevent Livechat agents online when Office Hours are closed ([#14921](https://github.com/RocketChat/Rocket.Chat/pull/14921))
 
 ### 🚀 Improvements
 
+
 - Connectivity Services License Sync ([#15022](https://github.com/RocketChat/Rocket.Chat/pull/15022))
+
 - Add flag to identify remote federation users ([#15004](https://github.com/RocketChat/Rocket.Chat/pull/15004))
+
 - Extract federation config to its own file ([#14992](https://github.com/RocketChat/Rocket.Chat/pull/14992))
+
 - Update tabs markup ([#14964](https://github.com/RocketChat/Rocket.Chat/pull/14964))
+
 - Remove too specific helpers isFirefox() and isChrome() ([#14963](https://github.com/RocketChat/Rocket.Chat/pull/14963))
+
 - Add descriptions on user data download buttons and popup info ([#14852](https://github.com/RocketChat/Rocket.Chat/pull/14852))
 
 ### 🐛 Bug fixes
 
+
 - Russian grammatical errors ([#14622](https://github.com/RocketChat/Rocket.Chat/pull/14622) by [@BehindLoader](https://github.com/BehindLoader))
+
 - Message attachments not allowing float numbers ([#14412](https://github.com/RocketChat/Rocket.Chat/pull/14412))
+
 - Typo in german translation ([#14833](https://github.com/RocketChat/Rocket.Chat/pull/14833) by [@Le-onardo](https://github.com/Le-onardo))
+
 - users.setStatus REST endpoint not allowing reset status message ([#14916](https://github.com/RocketChat/Rocket.Chat/pull/14916) by [@cardoso](https://github.com/cardoso))
+
 - SVG uploads crashing process ([#15006](https://github.com/RocketChat/Rocket.Chat/pull/15006) by [@snoopotic](https://github.com/snoopotic))
+
 - Edit message with arrow up key if not last message ([#15021](https://github.com/RocketChat/Rocket.Chat/pull/15021))
+
 - Livechat dashboard average and reaction time labels ([#14845](https://github.com/RocketChat/Rocket.Chat/pull/14845) by [@anandpathak](https://github.com/anandpathak))
+
 - Edit permissions screen ([#14950](https://github.com/RocketChat/Rocket.Chat/pull/14950))
+
 - Invite users auto complete cropping results ([#15020](https://github.com/RocketChat/Rocket.Chat/pull/15020))
+
 - Always displaying jumbomojis when using "marked" markdown ([#14861](https://github.com/RocketChat/Rocket.Chat/pull/14861) by [@brakhane](https://github.com/brakhane))
+
 - CustomOauth Identity Step errors displayed in HTML format ([#15000](https://github.com/RocketChat/Rocket.Chat/pull/15000) by [@Hudell](https://github.com/Hudell))
+
 - Custom User Status throttled by rate limiter ([#15001](https://github.com/RocketChat/Rocket.Chat/pull/15001) by [@Hudell](https://github.com/Hudell))
+
 - Not being able to mention users with "all" and "here" usernames - do not allow users register that usernames ([#14468](https://github.com/RocketChat/Rocket.Chat/pull/14468) by [@hamidrezabstn](https://github.com/hamidrezabstn))
+
 - Users staying online after logout ([#14966](https://github.com/RocketChat/Rocket.Chat/pull/14966))
+
 - Chrome doesn't load additional search results when bottom is reached ([#14965](https://github.com/RocketChat/Rocket.Chat/pull/14965))
+
 - Wrong label order on room settings ([#14960](https://github.com/RocketChat/Rocket.Chat/pull/14960) by [@Hudell](https://github.com/Hudell))
+
 - Allow storing the navigation history of unregistered Livechat visitors ([#14970](https://github.com/RocketChat/Rocket.Chat/pull/14970))
+
 - 50 custom emoji limit ([#14951](https://github.com/RocketChat/Rocket.Chat/pull/14951))
+
 - eternal loading file list ([#14952](https://github.com/RocketChat/Rocket.Chat/pull/14952))
+
 - load more messages ([#14967](https://github.com/RocketChat/Rocket.Chat/pull/14967))
+
 - Loading indicator positioning ([#14968](https://github.com/RocketChat/Rocket.Chat/pull/14968))
+
 - Jump to message missing in Starred Messages ([#14949](https://github.com/RocketChat/Rocket.Chat/pull/14949))
+
 - Method `getUsersOfRoom` not returning offline users if limit is not defined ([#14753](https://github.com/RocketChat/Rocket.Chat/pull/14753))
+
 - OTR key icon missing on messages ([#14953](https://github.com/RocketChat/Rocket.Chat/pull/14953))
+
 - Prevent error on trying insert message with duplicated id ([#14945](https://github.com/RocketChat/Rocket.Chat/pull/14945))
+
 - LDAP login with customField sync ([#14808](https://github.com/RocketChat/Rocket.Chat/pull/14808) by [@magicbelette](https://github.com/magicbelette))
+
 - Wrong custom status displayed on room leader panel ([#14958](https://github.com/RocketChat/Rocket.Chat/pull/14958) by [@Hudell](https://github.com/Hudell))
+
 - Video recorder message echo ([#14671](https://github.com/RocketChat/Rocket.Chat/pull/14671) by [@vova-zush](https://github.com/vova-zush))
+
 - Opening Livechat messages on mobile apps ([#14785](https://github.com/RocketChat/Rocket.Chat/pull/14785) by [@zolbayars](https://github.com/zolbayars))
+
 - SAML login by giving displayName priority over userName for fullName ([#14880](https://github.com/RocketChat/Rocket.Chat/pull/14880) by [@pkolmann](https://github.com/pkolmann))
+
 - setupWizard calling multiple getSetupWizardParameters ([#15060](https://github.com/RocketChat/Rocket.Chat/pull/15060))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Wrong text when reporting a message ([#14515](https://github.com/RocketChat/Rocket.Chat/pull/14515) by [@zdumitru](https://github.com/zdumitru))
+
 - Add missing French translation ([#15013](https://github.com/RocketChat/Rocket.Chat/pull/15013) by [@commiaI](https://github.com/commiaI))
+
 - Fix statistics error for apps on first load ([#15026](https://github.com/RocketChat/Rocket.Chat/pull/15026))
+
 - Always convert the sha256 password to lowercase on checking ([#14941](https://github.com/RocketChat/Rocket.Chat/pull/14941))
+
 - New: Apps and integrations statistics ([#14878](https://github.com/RocketChat/Rocket.Chat/pull/14878))
+
 - improve: relocate some of wizard info to register ([#14884](https://github.com/RocketChat/Rocket.Chat/pull/14884))
+
 - Improve Docker compose readability ([#14457](https://github.com/RocketChat/Rocket.Chat/pull/14457) by [@NateScarlet](https://github.com/NateScarlet))
+
 - Bump marked from 0.5.2 to 0.6.1 ([#14969](https://github.com/RocketChat/Rocket.Chat/pull/14969) by [@dependabot[bot]](https://github.com/dependabot[bot]))
+
 - Remove unused Meteor dependency (yasinuslu:blaze-meta) ([#14971](https://github.com/RocketChat/Rocket.Chat/pull/14971))
+
 - Bump photoswipe version to 4.1.3 ([#14977](https://github.com/RocketChat/Rocket.Chat/pull/14977))
+
 - Bump node-rsa version to 1.0.5 ([#14976](https://github.com/RocketChat/Rocket.Chat/pull/14976))
+
 - Bump juice version to 5.2.0 ([#14974](https://github.com/RocketChat/Rocket.Chat/pull/14974))
+
 - Remove unused dependency (lokijs) ([#14973](https://github.com/RocketChat/Rocket.Chat/pull/14973))
+
 - Regression: patch to improve emoji render ([#14980](https://github.com/RocketChat/Rocket.Chat/pull/14980))
+
 - [IMPROVEMENT] patch to improve emoji render ([#14722](https://github.com/RocketChat/Rocket.Chat/pull/14722))
+
 - Bump jquery from 3.3.1 to 3.4.0 in /packages/rocketchat-livechat/.app ([#14922](https://github.com/RocketChat/Rocket.Chat/pull/14922) by [@dependabot[bot]](https://github.com/dependabot[bot]))
+
 - Callbacks perf ([#14915](https://github.com/RocketChat/Rocket.Chat/pull/14915))
+
 - Split oplog emitters in files ([#14917](https://github.com/RocketChat/Rocket.Chat/pull/14917))
+
 - Extract canSendMessage function ([#14909](https://github.com/RocketChat/Rocket.Chat/pull/14909))
+
 - Improve: Get public key for marketplace ([#14851](https://github.com/RocketChat/Rocket.Chat/pull/14851))
+
 - Merge master into develop & Set version to 1.3.0-develop ([#14889](https://github.com/RocketChat/Rocket.Chat/pull/14889) by [@Hudell](https://github.com/Hudell))
+
 - Regression: fix code style, setup wizard error and profile page header ([#15041](https://github.com/RocketChat/Rocket.Chat/pull/15041))
+
 - Regression: Framework version being attached to a request that doesn't require it ([#15039](https://github.com/RocketChat/Rocket.Chat/pull/15039))
+
 - Update Livechat widget ([#15046](https://github.com/RocketChat/Rocket.Chat/pull/15046))
+
 - Regression: getSetupWizardParameters ([#15067](https://github.com/RocketChat/Rocket.Chat/pull/15067))
+
 - Regression: Webdav File Picker search and fixed overflows ([#15027](https://github.com/RocketChat/Rocket.Chat/pull/15027) by [@ubarsaiyan](https://github.com/ubarsaiyan))
+
 - Regression: Improve apps bridges for HA setup ([#15080](https://github.com/RocketChat/Rocket.Chat/pull/15080))
+
 - Regression: displaying errors for apps not installed from Marketplace ([#15075](https://github.com/RocketChat/Rocket.Chat/pull/15075))
+
 - Regression: Marketplace app pricing plan description ([#15076](https://github.com/RocketChat/Rocket.Chat/pull/15076))
+
 - Regression: uninstall subscribed app modal ([#15077](https://github.com/RocketChat/Rocket.Chat/pull/15077))
+
 - Regression: Apps and Marketplace UI issues ([#15045](https://github.com/RocketChat/Rocket.Chat/pull/15045))
 
 </details>
@@ -1552,11 +2212,13 @@
 
 ### 🐛 Bug fixes
 
+
 - Not showing local app on App Details ([#14894](https://github.com/RocketChat/Rocket.Chat/pull/14894))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 1.2.1 ([#14898](https://github.com/RocketChat/Rocket.Chat/pull/14898))
 
 </details>
@@ -1576,47 +2238,79 @@
 
 ### 🎉 New features
 
+
 - Custom User Status ([#13933](https://github.com/RocketChat/Rocket.Chat/pull/13933) by [@Hudell](https://github.com/Hudell) & [@wreiske](https://github.com/wreiske))
+
 - changed mongo version for snap from 3.2.7 to 3.4.20 ([#14838](https://github.com/RocketChat/Rocket.Chat/pull/14838))
+
 - Add loading animation to webdav file picker ([#14759](https://github.com/RocketChat/Rocket.Chat/pull/14759) by [@ubarsaiyan](https://github.com/ubarsaiyan))
+
 - Add tmid property to outgoing integration ([#14699](https://github.com/RocketChat/Rocket.Chat/pull/14699))
+
 - Endpoint to anonymously read channel's messages ([#14714](https://github.com/RocketChat/Rocket.Chat/pull/14714) by [@PrajvalRaval](https://github.com/PrajvalRaval))
+
 - Add Livechat inquiries endpoints ([#14779](https://github.com/RocketChat/Rocket.Chat/pull/14779))
+
 - Configuration to limit amount of livechat inquiries displayed ([#14690](https://github.com/RocketChat/Rocket.Chat/pull/14690))
+
 - Show App bundles and its apps ([#14886](https://github.com/RocketChat/Rocket.Chat/pull/14886))
 
 ### 🚀 Improvements
 
+
 - Adds link to download generated user data file ([#14175](https://github.com/RocketChat/Rocket.Chat/pull/14175) by [@Hudell](https://github.com/Hudell))
+
 - Layout of livechat manager pages to new style ([#13900](https://github.com/RocketChat/Rocket.Chat/pull/13900))
+
 - Add an optional rocketchat-protocol DNS entry for Federation ([#14589](https://github.com/RocketChat/Rocket.Chat/pull/14589))
+
 - Use configurable colors on sidebar items ([#14624](https://github.com/RocketChat/Rocket.Chat/pull/14624))
 
 ### 🐛 Bug fixes
 
+
 - Error when using Download My Data or Export My Data ([#14645](https://github.com/RocketChat/Rocket.Chat/pull/14645) by [@Hudell](https://github.com/Hudell))
+
 - Removes E2E action button, icon and banner when E2E is disabled. ([#14810](https://github.com/RocketChat/Rocket.Chat/pull/14810))
+
 - Assume microphone is available ([#14710](https://github.com/RocketChat/Rocket.Chat/pull/14710))
+
 - Move the set Avatar call on user creation to make sure the user has username ([#14665](https://github.com/RocketChat/Rocket.Chat/pull/14665))
+
 - users typing forever ([#14724](https://github.com/RocketChat/Rocket.Chat/pull/14724))
+
 - Increasing time to rate limit in shield.svg endpoint and add a setting to disable API rate limiter ([#14709](https://github.com/RocketChat/Rocket.Chat/pull/14709))
+
 - Wrong filter field when filtering current Livechats ([#14569](https://github.com/RocketChat/Rocket.Chat/pull/14569))
+
 - Import Chart.js error ([#14471](https://github.com/RocketChat/Rocket.Chat/pull/14471) by [@Hudell](https://github.com/Hudell) & [@sonbn0](https://github.com/sonbn0))
+
 - Name is undefined in some emails ([#14533](https://github.com/RocketChat/Rocket.Chat/pull/14533))
+
 - Direct reply delete config and description ([#14493](https://github.com/RocketChat/Rocket.Chat/pull/14493) by [@ruKurz](https://github.com/ruKurz))
+
 - Custom status fixes ([#14853](https://github.com/RocketChat/Rocket.Chat/pull/14853) by [@Hudell](https://github.com/Hudell) & [@wreiske](https://github.com/wreiske))
+
 - LinkedIn OAuth login ([#14887](https://github.com/RocketChat/Rocket.Chat/pull/14887) by [@Hudell](https://github.com/Hudell))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Fix not fully extracted pieces ([#14805](https://github.com/RocketChat/Rocket.Chat/pull/14805))
+
 - Regression: Fix file upload ([#14804](https://github.com/RocketChat/Rocket.Chat/pull/14804))
+
 - Extract permissions functions ([#14777](https://github.com/RocketChat/Rocket.Chat/pull/14777))
+
 - Add custom fileupload whitelist property ([#14754](https://github.com/RocketChat/Rocket.Chat/pull/14754))
+
 - Merge master into develop & Set version to 1.2.0-develop ([#14656](https://github.com/RocketChat/Rocket.Chat/pull/14656) by [@AnBo83](https://github.com/AnBo83) & [@knrt10](https://github.com/knrt10) & [@mohamedar97](https://github.com/mohamedar97) & [@thaiphv](https://github.com/thaiphv))
+
 - Regression: Fix desktop notifications not being sent ([#14860](https://github.com/RocketChat/Rocket.Chat/pull/14860))
+
 - Regression: Allow debugging of cached collections by name ([#14862](https://github.com/RocketChat/Rocket.Chat/pull/14862))
+
 - Allow debugging of cached collections by name ([#14859](https://github.com/RocketChat/Rocket.Chat/pull/14859))
 
 </details>
@@ -1674,12 +2368,15 @@
 
 ### 🐛 Bug fixes
 
+
 - Gap of messages when loading history when using threads ([#14837](https://github.com/RocketChat/Rocket.Chat/pull/14837))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 1.1.3 ([#14850](https://github.com/RocketChat/Rocket.Chat/pull/14850))
+
 - Regression: thread loading parent msg if is not loaded ([#14839](https://github.com/RocketChat/Rocket.Chat/pull/14839))
 
 </details>
@@ -1699,13 +2396,17 @@
 
 ### 🐛 Bug fixes
 
+
 - User status information on User Info panel ([#14763](https://github.com/RocketChat/Rocket.Chat/pull/14763))
+
 - User Real Name being erased when not modified ([#14711](https://github.com/RocketChat/Rocket.Chat/pull/14711) by [@Hudell](https://github.com/Hudell))
+
 - Anonymous chat read ([#14717](https://github.com/RocketChat/Rocket.Chat/pull/14717))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 1.1.2 ([#14823](https://github.com/RocketChat/Rocket.Chat/pull/14823) by [@Hudell](https://github.com/Hudell))
 
 </details>
@@ -1730,12 +2431,15 @@
 
 ### 🐛 Bug fixes
 
+
 - SAML login error. ([#14686](https://github.com/RocketChat/Rocket.Chat/pull/14686) by [@Hudell](https://github.com/Hudell))
+
 - Load messages after disconnect and message box scroll missing ([#14668](https://github.com/RocketChat/Rocket.Chat/pull/14668))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Removing unnecesary federation configs ([#14674](https://github.com/RocketChat/Rocket.Chat/pull/14674))
 
 </details>
@@ -1759,117 +2463,219 @@
 
 ### 🎉 New features
 
+
 - Setting option to mark as containing a secret/password ([#10273](https://github.com/RocketChat/Rocket.Chat/pull/10273))
+
 - Custom user name field from Custom OAuth ([#14381](https://github.com/RocketChat/Rocket.Chat/pull/14381) by [@mjovanovic0](https://github.com/mjovanovic0))
+
 - Add pause and reset button when adding custom sound   ([#13615](https://github.com/RocketChat/Rocket.Chat/pull/13615) by [@knrt10](https://github.com/knrt10))
+
 - Missing "view-outside-room_description" translation key ([#13680](https://github.com/RocketChat/Rocket.Chat/pull/13680) by [@bhardwajaditya](https://github.com/bhardwajaditya))
+
 - Returns custom emojis through the Livechat REST API ([#14370](https://github.com/RocketChat/Rocket.Chat/pull/14370))
 
 ### 🚀 Improvements
 
+
 - Message rendering time ([#14252](https://github.com/RocketChat/Rocket.Chat/pull/14252))
+
 - Change user presence events to Meteor Streams ([#14488](https://github.com/RocketChat/Rocket.Chat/pull/14488))
+
 - Upgrade EmojiOne to JoyPixels 4.5.0 ([#13807](https://github.com/RocketChat/Rocket.Chat/pull/13807) by [@wreiske](https://github.com/wreiske))
+
 - Don't show unread count badge in burger menu if it is from the opened room ([#12971](https://github.com/RocketChat/Rocket.Chat/pull/12971))
+
 - Livechat CRM secret token optional ([#14022](https://github.com/RocketChat/Rocket.Chat/pull/14022))
+
 - jump to selected message on open thread ([#14460](https://github.com/RocketChat/Rocket.Chat/pull/14460))
+
 - Don't use regex to find users ([#14397](https://github.com/RocketChat/Rocket.Chat/pull/14397))
+
 - Added flag `skipActiveUsersToBeReady` to not wait the load of `active users` to present the Web interface ([#14431](https://github.com/RocketChat/Rocket.Chat/pull/14431))
+
 - SAML login process refactoring ([#12891](https://github.com/RocketChat/Rocket.Chat/pull/12891) by [@kukkjanos](https://github.com/kukkjanos))
+
 - Allow change Discussion's properties ([#14389](https://github.com/RocketChat/Rocket.Chat/pull/14389))
 
 ### 🐛 Bug fixes
 
+
 - Downloading files when running in sub directory ([#14485](https://github.com/RocketChat/Rocket.Chat/pull/14485) by [@miolane](https://github.com/miolane))
+
 - Broken layout when sidebar is open on IE/Edge ([#14567](https://github.com/RocketChat/Rocket.Chat/pull/14567))
+
 - Channel names on Directory got cut on small screens ([#14542](https://github.com/RocketChat/Rocket.Chat/pull/14542))
+
 - Duplicated link to jump to message  ([#14505](https://github.com/RocketChat/Rocket.Chat/pull/14505))
+
 - Edit Message when down arrow is pressed. ([#14369](https://github.com/RocketChat/Rocket.Chat/pull/14369) by [@Kailash0311](https://github.com/Kailash0311))
+
 - Unread property of the room's lastMessage object was being wrong some times ([#13919](https://github.com/RocketChat/Rocket.Chat/pull/13919))
+
 - Multiple Slack Importer Bugs ([#12084](https://github.com/RocketChat/Rocket.Chat/pull/12084) by [@Hudell](https://github.com/Hudell))
+
 - No feedback when adding users that already exists in a room ([#14534](https://github.com/RocketChat/Rocket.Chat/pull/14534) by [@gsunit](https://github.com/gsunit))
+
 - Custom scripts descriptions were not clear enough  ([#14516](https://github.com/RocketChat/Rocket.Chat/pull/14516))
+
 - Role `user` has being added after email verification even for non anonymous users ([#14263](https://github.com/RocketChat/Rocket.Chat/pull/14263))
+
 - Several problems with read-only rooms and muted users ([#11311](https://github.com/RocketChat/Rocket.Chat/pull/11311) by [@Hudell](https://github.com/Hudell))
+
 - Channel settings form to textarea for Topic and Description ([#13328](https://github.com/RocketChat/Rocket.Chat/pull/13328) by [@supra08](https://github.com/supra08))
+
 - Elements in User Info require some padding ([#13640](https://github.com/RocketChat/Rocket.Chat/pull/13640) by [@mushroomgenie](https://github.com/mushroomgenie))
+
 - Showing the id instead of the name of custom notification sound ([#13660](https://github.com/RocketChat/Rocket.Chat/pull/13660) by [@knrt10](https://github.com/knrt10))
+
 - Remove Livechat guest data was removing more rooms than expected ([#14509](https://github.com/RocketChat/Rocket.Chat/pull/14509))
+
 - Save custom emoji with special characters causes some errors ([#14456](https://github.com/RocketChat/Rocket.Chat/pull/14456))
+
 - Verify if the user is requesting your own information in users.info ([#14242](https://github.com/RocketChat/Rocket.Chat/pull/14242))
+
 - RocketChat client sending out video call requests unnecessarily ([#14496](https://github.com/RocketChat/Rocket.Chat/pull/14496))
+
 - `Alphabetical` translation in DE ([#14490](https://github.com/RocketChat/Rocket.Chat/pull/14490) by [@AnBo83](https://github.com/AnBo83))
+
 - Fix redirect to First channel after login ([#14434](https://github.com/RocketChat/Rocket.Chat/pull/14434))
+
 - Ignored messages ([#14465](https://github.com/RocketChat/Rocket.Chat/pull/14465))
+
 - Allow data URLs in isURL/getURL helpers ([#14464](https://github.com/RocketChat/Rocket.Chat/pull/14464))
+
 - You must join to view messages in this channel ([#14461](https://github.com/RocketChat/Rocket.Chat/pull/14461))
+
 - Channel Leader Bar is in the way of Thread Header  ([#14443](https://github.com/RocketChat/Rocket.Chat/pull/14443))
+
 - Discussion name being invalid ([#14442](https://github.com/RocketChat/Rocket.Chat/pull/14442))
+
 - Room name was undefined in some info dialogs ([#14415](https://github.com/RocketChat/Rocket.Chat/pull/14415))
+
 - Exception on crowd sync due to a wrong logging method ([#14405](https://github.com/RocketChat/Rocket.Chat/pull/14405))
+
 - IE11 support ([#14422](https://github.com/RocketChat/Rocket.Chat/pull/14422))
+
 - Escape unrecognized slash command message ([#14432](https://github.com/RocketChat/Rocket.Chat/pull/14432))
+
 - Mentions message missing 'jump to message' action ([#14430](https://github.com/RocketChat/Rocket.Chat/pull/14430))
+
 - preview pdf its not working ([#14419](https://github.com/RocketChat/Rocket.Chat/pull/14419))
+
 - Messages on thread panel were receiving wrong context/subscription ([#14404](https://github.com/RocketChat/Rocket.Chat/pull/14404))
+
 - Error 400 on send a reply to an old thread ([#14402](https://github.com/RocketChat/Rocket.Chat/pull/14402))
+
 - Users actions in administration were returning error ([#14400](https://github.com/RocketChat/Rocket.Chat/pull/14400))
+
 - Fallback to mongo version that doesn't require clusterMonitor role ([#14403](https://github.com/RocketChat/Rocket.Chat/pull/14403))
+
 - SAML credentialToken removal was preventing mobile from being able to authenticate ([#14345](https://github.com/RocketChat/Rocket.Chat/pull/14345))
+
 - Stream not connecting connect when using subdir and multi-instance ([#14376](https://github.com/RocketChat/Rocket.Chat/pull/14376))
+
 - Pressing Enter in User Search field at channel causes reload ([#14388](https://github.com/RocketChat/Rocket.Chat/pull/14388))
+
 - Wrong token name was generating error on Gitlab OAuth login ([#14379](https://github.com/RocketChat/Rocket.Chat/pull/14379))
+
 - more message actions to threads context(follow, unfollow, copy, delete) ([#14387](https://github.com/RocketChat/Rocket.Chat/pull/14387))
+
 - Unnecessary meteor.defer on openRoom ([#14396](https://github.com/RocketChat/Rocket.Chat/pull/14396))
+
 - Messages on threads disappearing ([#14393](https://github.com/RocketChat/Rocket.Chat/pull/14393))
+
 - Bell was too small on threads ([#14394](https://github.com/RocketChat/Rocket.Chat/pull/14394))
+
 - Main thread title on replies ([#14372](https://github.com/RocketChat/Rocket.Chat/pull/14372))
+
 - New day separator overlapping above system message ([#14362](https://github.com/RocketChat/Rocket.Chat/pull/14362))
+
 - E2E messages not decrypting in message threads ([#14580](https://github.com/RocketChat/Rocket.Chat/pull/14580))
+
 - Send replyTo for livechat offline messages ([#14568](https://github.com/RocketChat/Rocket.Chat/pull/14568))
+
 - Mailer breaking if user doesn't have an email address ([#14614](https://github.com/RocketChat/Rocket.Chat/pull/14614))
+
 - Role name spacing on Permissions page ([#14625](https://github.com/RocketChat/Rocket.Chat/pull/14625))
+
 - Avatar images on old Livechat client ([#14590](https://github.com/RocketChat/Rocket.Chat/pull/14590) by [@arminfelder](https://github.com/arminfelder))
+
 - Inject code at the end of <head> tag ([#14623](https://github.com/RocketChat/Rocket.Chat/pull/14623))
+
 - "Blank page" on safari 10.x ([#14651](https://github.com/RocketChat/Rocket.Chat/pull/14651))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Removed unnecessary DDP unblocks ([#13641](https://github.com/RocketChat/Rocket.Chat/pull/13641))
+
 - Fix emoji replacing some chars ([#14570](https://github.com/RocketChat/Rocket.Chat/pull/14570))
+
 - LingoHub based on develop ([#14561](https://github.com/RocketChat/Rocket.Chat/pull/14561))
+
 - Refactor WebRTC class ([#13736](https://github.com/RocketChat/Rocket.Chat/pull/13736))
+
 - Update Meteor Streamer package ([#14551](https://github.com/RocketChat/Rocket.Chat/pull/14551))
+
 - Regression: unit tests were being skipped ([#14543](https://github.com/RocketChat/Rocket.Chat/pull/14543))
+
 - MsgTyping refactor ([#14495](https://github.com/RocketChat/Rocket.Chat/pull/14495))
+
 - Google Plus account is no longer accessible ([#14503](https://github.com/RocketChat/Rocket.Chat/pull/14503) by [@zdumitru](https://github.com/zdumitru))
+
 - [IMPROVEMENT] Add tooltip to to notify user the purpose of back button in discussion ([#13872](https://github.com/RocketChat/Rocket.Chat/pull/13872) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
 - eslint errors currently on develop ([#14518](https://github.com/RocketChat/Rocket.Chat/pull/14518) by [@Hudell](https://github.com/Hudell))
+
 - Allow removing description, topic and annoucement of rooms(set as empty string) ([#13682](https://github.com/RocketChat/Rocket.Chat/pull/13682))
+
 - [IMPROVEMENT] Don't group messages with different alias ([#14257](https://github.com/RocketChat/Rocket.Chat/pull/14257) by [@jungeonkim](https://github.com/jungeonkim))
+
 - LingoHub based on develop ([#14478](https://github.com/RocketChat/Rocket.Chat/pull/14478))
+
 - Remove specific eslint rules ([#14459](https://github.com/RocketChat/Rocket.Chat/pull/14459))
+
 - New eslint rules ([#14332](https://github.com/RocketChat/Rocket.Chat/pull/14332))
+
 - Fix i18n files keys sort ([#14433](https://github.com/RocketChat/Rocket.Chat/pull/14433))
+
 - Fixes on DAU and MAU aggregations ([#14418](https://github.com/RocketChat/Rocket.Chat/pull/14418))
+
 - Add missing german translations ([#14386](https://github.com/RocketChat/Rocket.Chat/pull/14386) by [@mrsimpson](https://github.com/mrsimpson))
+
 - LingoHub based on develop ([#14426](https://github.com/RocketChat/Rocket.Chat/pull/14426))
+
 - fix discussions: remove restriction for editing room info, server side ([#14039](https://github.com/RocketChat/Rocket.Chat/pull/14039) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Fix: Message body was not being updated when user disabled nrr message ([#14390](https://github.com/RocketChat/Rocket.Chat/pull/14390))
+
 - Improve German translations ([#14351](https://github.com/RocketChat/Rocket.Chat/pull/14351) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Merge master into develop & Set version to 1.1.0-develop ([#14317](https://github.com/RocketChat/Rocket.Chat/pull/14317) by [@wreiske](https://github.com/wreiske))
+
 - Merge master into develop & Set version to 1.1.0-develop ([#14294](https://github.com/RocketChat/Rocket.Chat/pull/14294))
+
 - Fix: Add emoji shortnames to emoji's list ([#14576](https://github.com/RocketChat/Rocket.Chat/pull/14576))
+
 - Ci improvements ([#14600](https://github.com/RocketChat/Rocket.Chat/pull/14600))
+
 - Fix: emoji render performance for alias ([#14593](https://github.com/RocketChat/Rocket.Chat/pull/14593))
+
 - Federation i18n message changes ([#14595](https://github.com/RocketChat/Rocket.Chat/pull/14595))
+
 - [REGRESSION] Fix Slack bridge channel owner on channel creation ([#14565](https://github.com/RocketChat/Rocket.Chat/pull/14565))
+
 - Fix thumbs up emoji shortname ([#14581](https://github.com/RocketChat/Rocket.Chat/pull/14581))
+
 - [Fix] broken logo url in app.json ([#14572](https://github.com/RocketChat/Rocket.Chat/pull/14572) by [@jaredmoody](https://github.com/jaredmoody))
+
 - Add digitalocean button to readme ([#14583](https://github.com/RocketChat/Rocket.Chat/pull/14583))
+
 - Improvement: Permissions table ([#14646](https://github.com/RocketChat/Rocket.Chat/pull/14646))
+
 - Regression: Handle missing emojis ([#14641](https://github.com/RocketChat/Rocket.Chat/pull/14641))
+
 - LingoHub based on develop ([#14643](https://github.com/RocketChat/Rocket.Chat/pull/14643))
 
 </details>
@@ -1918,6 +2724,7 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Fix custom auth ([#15141](https://github.com/RocketChat/Rocket.Chat/pull/15141))
 
 </details>
@@ -1936,6 +2743,7 @@
 
 ### 🐛 Bug fixes
 
+
 - Not sanitized message types ([#15054](https://github.com/RocketChat/Rocket.Chat/pull/15054))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -1953,6 +2761,7 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 1.0.3 ([#14446](https://github.com/RocketChat/Rocket.Chat/pull/14446) by [@mrsimpson](https://github.com/mrsimpson))
 
 </details>
@@ -1981,28 +2790,44 @@
 
 ### 🚀 Improvements
 
+
 - i18n of threads and discussion buttons ([#14334](https://github.com/RocketChat/Rocket.Chat/pull/14334))
+
 - Better error message when not able to get MongoDB Version ([#14320](https://github.com/RocketChat/Rocket.Chat/pull/14320))
 
 ### 🐛 Bug fixes
 
+
 - Unread line and new day separator were not aligned  ([#14338](https://github.com/RocketChat/Rocket.Chat/pull/14338))
+
 - Audio notification for messages on DM ([#14336](https://github.com/RocketChat/Rocket.Chat/pull/14336))
+
 - Duplicate thread message after editing ([#14330](https://github.com/RocketChat/Rocket.Chat/pull/14330))
+
 - New day separator rendered over thread reply ([#14328](https://github.com/RocketChat/Rocket.Chat/pull/14328))
+
 - Missing i18n for some new Permissions ([#14011](https://github.com/RocketChat/Rocket.Chat/pull/14011))
+
 - View Logs admin page was broken and not rendering color logs ([#14316](https://github.com/RocketChat/Rocket.Chat/pull/14316))
+
 - show roles on message ([#14313](https://github.com/RocketChat/Rocket.Chat/pull/14313))
+
 - Remove reference to inexistent field when deleting message in thread ([#14311](https://github.com/RocketChat/Rocket.Chat/pull/14311))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 1.0.2 ([#14339](https://github.com/RocketChat/Rocket.Chat/pull/14339) by [@AnBo83](https://github.com/AnBo83) & [@knrt10](https://github.com/knrt10) & [@mohamedar97](https://github.com/mohamedar97) & [@thaiphv](https://github.com/thaiphv))
+
 - Add cross-browser select arrow positioning ([#14318](https://github.com/RocketChat/Rocket.Chat/pull/14318))
+
 - i18n: Update German strings ([#14182](https://github.com/RocketChat/Rocket.Chat/pull/14182) by [@AnBo83](https://github.com/AnBo83))
+
 - [Regression] Anonymous user fix ([#14301](https://github.com/RocketChat/Rocket.Chat/pull/14301) by [@knrt10](https://github.com/knrt10))
+
 - Coerces the MongoDB version string ([#14299](https://github.com/RocketChat/Rocket.Chat/pull/14299) by [@thaiphv](https://github.com/thaiphv))
+
 - [Fix] group name appears instead of the room id ([#14075](https://github.com/RocketChat/Rocket.Chat/pull/14075) by [@mohamedar97](https://github.com/mohamedar97))
 
 </details>
@@ -2033,12 +2858,19 @@
 
 ### 🐛 Bug fixes
 
+
 - Popup cloud console in new window ([#14296](https://github.com/RocketChat/Rocket.Chat/pull/14296))
+
 - Switch oplog required doc link to more accurate link ([#14288](https://github.com/RocketChat/Rocket.Chat/pull/14288))
+
 - Optional exit on Unhandled Promise Rejection ([#14291](https://github.com/RocketChat/Rocket.Chat/pull/14291))
+
 - Error when accessing avatar with no token ([#14293](https://github.com/RocketChat/Rocket.Chat/pull/14293))
+
 - Startup error in registration check ([#14286](https://github.com/RocketChat/Rocket.Chat/pull/14286))
+
 - Wrong header at Apps admin section ([#14290](https://github.com/RocketChat/Rocket.Chat/pull/14290))
+
 - Error when accessing an invalid file upload url ([#14282](https://github.com/RocketChat/Rocket.Chat/pull/14282) by [@wreiske](https://github.com/wreiske))
 
 ### 👩‍💻👨‍💻 Contributors 😍
@@ -2061,354 +2893,690 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Remove deprecated file upload engine Slingshot ([#13724](https://github.com/RocketChat/Rocket.Chat/pull/13724))
+
 - Remove internal hubot package ([#13522](https://github.com/RocketChat/Rocket.Chat/pull/13522))
+
 - Prevent start if incompatible mongo version ([#13927](https://github.com/RocketChat/Rocket.Chat/pull/13927))
+
 - Require OPLOG/REPLICASET to run Rocket.Chat ([#14227](https://github.com/RocketChat/Rocket.Chat/pull/14227))
 
 ### 🎉 New features
 
+
 - Marketplace integration with Rocket.Chat Cloud ([#13809](https://github.com/RocketChat/Rocket.Chat/pull/13809))
+
 - Add message action to copy message to input as reply ([#12626](https://github.com/RocketChat/Rocket.Chat/pull/12626) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Allow sending long messages as attachments ([#13819](https://github.com/RocketChat/Rocket.Chat/pull/13819))
+
 - Add e-mail field on Livechat Departments ([#13775](https://github.com/RocketChat/Rocket.Chat/pull/13775))
+
 - Provide new Livechat client as community feature ([#13723](https://github.com/RocketChat/Rocket.Chat/pull/13723))
+
 - Discussions ([#13541](https://github.com/RocketChat/Rocket.Chat/pull/13541) by [@mrsimpson](https://github.com/mrsimpson) & [@vickyokrm](https://github.com/vickyokrm))
+
 - Bosnian lang (BS) ([#13635](https://github.com/RocketChat/Rocket.Chat/pull/13635) by [@fliptrail](https://github.com/fliptrail))
+
 - Federation ([#12370](https://github.com/RocketChat/Rocket.Chat/pull/12370))
+
 - Show department field on Livechat visitor panel ([#13530](https://github.com/RocketChat/Rocket.Chat/pull/13530))
+
 - Add offset parameter to channels.history, groups.history, dm.history ([#13310](https://github.com/RocketChat/Rocket.Chat/pull/13310) by [@xbolshe](https://github.com/xbolshe))
+
 - Permission to assign roles ([#13597](https://github.com/RocketChat/Rocket.Chat/pull/13597))
+
 - reply with a file ([#12095](https://github.com/RocketChat/Rocket.Chat/pull/12095) by [@rssilva](https://github.com/rssilva))
+
 - legal notice page ([#12472](https://github.com/RocketChat/Rocket.Chat/pull/12472) by [@localguru](https://github.com/localguru))
+
 - Add missing remove add leader channel ([#13315](https://github.com/RocketChat/Rocket.Chat/pull/13315) by [@Montel](https://github.com/Montel))
+
 - users.setActiveStatus endpoint in rest api ([#13443](https://github.com/RocketChat/Rocket.Chat/pull/13443) by [@thayannevls](https://github.com/thayannevls))
+
 - User avatars from external source ([#7929](https://github.com/RocketChat/Rocket.Chat/pull/7929) by [@mjovanovic0](https://github.com/mjovanovic0))
+
 - Add an option to delete file in files list ([#13815](https://github.com/RocketChat/Rocket.Chat/pull/13815))
+
 - Threads V 1.0 ([#13996](https://github.com/RocketChat/Rocket.Chat/pull/13996))
+
 - Add support to updatedSince parameter in emoji-custom.list and deprecated old endpoint ([#13510](https://github.com/RocketChat/Rocket.Chat/pull/13510))
+
 - Chatpal: Enable custom search parameters ([#13829](https://github.com/RocketChat/Rocket.Chat/pull/13829) by [@Peym4n](https://github.com/Peym4n))
+
 - - Add setting to request a comment when closing Livechat room ([#13983](https://github.com/RocketChat/Rocket.Chat/pull/13983) by [@knrt10](https://github.com/knrt10))
+
 - Rest threads ([#14045](https://github.com/RocketChat/Rocket.Chat/pull/14045))
+
 - Add GET method to fetch Livechat message through REST API ([#14147](https://github.com/RocketChat/Rocket.Chat/pull/14147))
+
 - Add Voxtelesys to list of SMS providers ([#13697](https://github.com/RocketChat/Rocket.Chat/pull/13697) by [@jhnburke8](https://github.com/jhnburke8) & [@john08burke](https://github.com/john08burke))
+
 - Rest endpoints of discussions ([#13987](https://github.com/RocketChat/Rocket.Chat/pull/13987))
+
 - Multiple slackbridges ([#11346](https://github.com/RocketChat/Rocket.Chat/pull/11346) by [@Hudell](https://github.com/Hudell) & [@kable-wilmoth](https://github.com/kable-wilmoth))
+
 - option to not use nrr (experimental) ([#14224](https://github.com/RocketChat/Rocket.Chat/pull/14224))
+
 - Set up livechat connections created from new client ([#14236](https://github.com/RocketChat/Rocket.Chat/pull/14236))
+
 - allow drop files on thread ([#14214](https://github.com/RocketChat/Rocket.Chat/pull/14214))
+
 - Update message actions ([#14268](https://github.com/RocketChat/Rocket.Chat/pull/14268))
 
 ### 🚀 Improvements
 
+
 - UI of page not found ([#13757](https://github.com/RocketChat/Rocket.Chat/pull/13757) by [@fliptrail](https://github.com/fliptrail))
+
 - Show rooms with mentions on unread category even with hide counter ([#13948](https://github.com/RocketChat/Rocket.Chat/pull/13948))
+
 - Join channels by sending a message or join button (#13752) ([#13752](https://github.com/RocketChat/Rocket.Chat/pull/13752) by [@bhardwajaditya](https://github.com/bhardwajaditya))
+
 - Filter agents with autocomplete input instead of select element ([#13730](https://github.com/RocketChat/Rocket.Chat/pull/13730))
+
 - Ignore agent status when queuing incoming livechats via Guest Pool ([#13818](https://github.com/RocketChat/Rocket.Chat/pull/13818))
+
 - Replaces color #13679A to #1d74f5 ([#13796](https://github.com/RocketChat/Rocket.Chat/pull/13796) by [@fliptrail](https://github.com/fliptrail))
+
 - Remove unnecessary "File Upload". ([#13743](https://github.com/RocketChat/Rocket.Chat/pull/13743) by [@knrt10](https://github.com/knrt10))
+
 - Add index for room's ts ([#13726](https://github.com/RocketChat/Rocket.Chat/pull/13726))
+
 - Add decoding for commonName (cn) and displayName attributes for SAML ([#12347](https://github.com/RocketChat/Rocket.Chat/pull/12347) by [@pkolmann](https://github.com/pkolmann))
+
 - Deprecate fixCordova helper ([#13598](https://github.com/RocketChat/Rocket.Chat/pull/13598))
+
 - Remove dangling side-nav styles ([#13584](https://github.com/RocketChat/Rocket.Chat/pull/13584))
+
 - Disable X-Powered-By header in all known express middlewares ([#13388](https://github.com/RocketChat/Rocket.Chat/pull/13388))
+
 - Allow custom rocketchat username for crowd users and enable login via email/crowd_username ([#12981](https://github.com/RocketChat/Rocket.Chat/pull/12981) by [@steerben](https://github.com/steerben))
+
 - Add department field on find guest method ([#13491](https://github.com/RocketChat/Rocket.Chat/pull/13491))
+
 - KaTeX and Autolinker message rendering ([#11698](https://github.com/RocketChat/Rocket.Chat/pull/11698))
+
 - Update to MongoDB 4.0 in docker-compose file ([#13396](https://github.com/RocketChat/Rocket.Chat/pull/13396) by [@ngulden](https://github.com/ngulden))
+
 - Admin ui ([#13393](https://github.com/RocketChat/Rocket.Chat/pull/13393))
+
 - End to end tests ([#13401](https://github.com/RocketChat/Rocket.Chat/pull/13401))
+
 - Update deleteUser errors to be more semantic ([#12380](https://github.com/RocketChat/Rocket.Chat/pull/12380) by [@timkinnane](https://github.com/timkinnane))
+
 - Line height on static content pages ([#11673](https://github.com/RocketChat/Rocket.Chat/pull/11673) by [@timkinnane](https://github.com/timkinnane))
+
 - new icons ([#13289](https://github.com/RocketChat/Rocket.Chat/pull/13289))
+
 - Add permission to change other user profile avatar ([#13884](https://github.com/RocketChat/Rocket.Chat/pull/13884) by [@knrt10](https://github.com/knrt10))
+
 - UI of Permissions page ([#13732](https://github.com/RocketChat/Rocket.Chat/pull/13732) by [@fliptrail](https://github.com/fliptrail))
+
 - Use SessionId for credential token in SAML request ([#13791](https://github.com/RocketChat/Rocket.Chat/pull/13791) by [@MohammedEssehemy](https://github.com/MohammedEssehemy))
+
 - Include more information to help with bug reports and debugging ([#14047](https://github.com/RocketChat/Rocket.Chat/pull/14047))
+
 - New sidebar item badges, mention links, and ticks ([#14030](https://github.com/RocketChat/Rocket.Chat/pull/14030))
+
 - Remove setting to show a livechat is waiting ([#13992](https://github.com/RocketChat/Rocket.Chat/pull/13992))
+
 - Attachment download caching ([#14137](https://github.com/RocketChat/Rocket.Chat/pull/14137) by [@wreiske](https://github.com/wreiske))
+
 - Get avatar from oauth ([#14131](https://github.com/RocketChat/Rocket.Chat/pull/14131))
+
 - OAuth Role Sync ([#13761](https://github.com/RocketChat/Rocket.Chat/pull/13761) by [@hypery2k](https://github.com/hypery2k))
+
 - Update the Apps Engine version to v1.4.1 ([#14072](https://github.com/RocketChat/Rocket.Chat/pull/14072))
+
 - Replace livechat inquiry dialog with preview room ([#13986](https://github.com/RocketChat/Rocket.Chat/pull/13986))
 
 ### 🐛 Bug fixes
 
+
 - Opening a Livechat room from another agent ([#13951](https://github.com/RocketChat/Rocket.Chat/pull/13951))
+
 - Directory and Apps logs page ([#13938](https://github.com/RocketChat/Rocket.Chat/pull/13938))
+
 - Minor issues detected after testing the new Livechat client ([#13521](https://github.com/RocketChat/Rocket.Chat/pull/13521))
+
 - Display first message when taking Livechat inquiry ([#13896](https://github.com/RocketChat/Rocket.Chat/pull/13896))
+
 - Loading theme CSS on first server startup ([#13953](https://github.com/RocketChat/Rocket.Chat/pull/13953))
+
 - OTR dialog issue ([#13755](https://github.com/RocketChat/Rocket.Chat/pull/13755) by [@knrt10](https://github.com/knrt10))
+
 - Limit App’s HTTP calls to 500ms ([#13949](https://github.com/RocketChat/Rocket.Chat/pull/13949))
+
 - Read Receipt for Livechat Messages fixed ([#13832](https://github.com/RocketChat/Rocket.Chat/pull/13832) by [@knrt10](https://github.com/knrt10))
+
 - Avatar image being shrinked on autocomplete ([#13914](https://github.com/RocketChat/Rocket.Chat/pull/13914))
+
 - VIDEO/JITSI multiple calls before video call ([#13855](https://github.com/RocketChat/Rocket.Chat/pull/13855))
+
 - Some Safari bugs ([#13895](https://github.com/RocketChat/Rocket.Chat/pull/13895))
+
 - wrong width/height for tile_70 (mstile 70x70 (png)) ([#13851](https://github.com/RocketChat/Rocket.Chat/pull/13851) by [@ulf-f](https://github.com/ulf-f))
+
 - wrong importing of e2e ([#13863](https://github.com/RocketChat/Rocket.Chat/pull/13863))
+
 - Forwarded Livechat visitor name is not getting updated on the sidebar ([#13783](https://github.com/RocketChat/Rocket.Chat/pull/13783) by [@zolbayars](https://github.com/zolbayars))
+
 - Remove spaces in some i18n files ([#13801](https://github.com/RocketChat/Rocket.Chat/pull/13801))
+
 - Translation interpolations for many languages ([#13751](https://github.com/RocketChat/Rocket.Chat/pull/13751) by [@fliptrail](https://github.com/fliptrail))
+
 - Fixed grammatical error. ([#13559](https://github.com/RocketChat/Rocket.Chat/pull/13559) by [@gsunit](https://github.com/gsunit))
+
 - In home screen Rocket.Chat+ is dispalyed as Rocket.Chat ([#13784](https://github.com/RocketChat/Rocket.Chat/pull/13784) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
 - No new room created when conversation is closed ([#13753](https://github.com/RocketChat/Rocket.Chat/pull/13753) by [@knrt10](https://github.com/knrt10))
+
 - Loading user list from room messages ([#13769](https://github.com/RocketChat/Rocket.Chat/pull/13769))
+
 - User is unable to enter multiple emojis by clicking on the emoji icon ([#13744](https://github.com/RocketChat/Rocket.Chat/pull/13744) by [@Kailash0311](https://github.com/Kailash0311))
+
 - Audio message recording ([#13727](https://github.com/RocketChat/Rocket.Chat/pull/13727))
+
 - Remove Room info for Direct Messages (#9383) ([#12429](https://github.com/RocketChat/Rocket.Chat/pull/12429) by [@vinade](https://github.com/vinade))
+
 - WebRTC wasn't working duo to design and browser's APIs changes ([#13675](https://github.com/RocketChat/Rocket.Chat/pull/13675))
+
 - Adds Proper Language display name for many languages ([#13714](https://github.com/RocketChat/Rocket.Chat/pull/13714) by [@fliptrail](https://github.com/fliptrail))
+
 - Update bad-words to 3.0.2 ([#13705](https://github.com/RocketChat/Rocket.Chat/pull/13705) by [@trivoallan](https://github.com/trivoallan))
+
 - Changing Room name updates the webhook ([#13672](https://github.com/RocketChat/Rocket.Chat/pull/13672) by [@knrt10](https://github.com/knrt10))
+
 - Fix snap refresh hook ([#13702](https://github.com/RocketChat/Rocket.Chat/pull/13702))
+
 - Audio message recording issues ([#13486](https://github.com/RocketChat/Rocket.Chat/pull/13486))
+
 - Legal pages' style ([#13677](https://github.com/RocketChat/Rocket.Chat/pull/13677))
+
 - Stop livestream ([#13676](https://github.com/RocketChat/Rocket.Chat/pull/13676))
+
 - Avatar fonts for PNG and JPG ([#13681](https://github.com/RocketChat/Rocket.Chat/pull/13681))
+
 - Block User Icon ([#13630](https://github.com/RocketChat/Rocket.Chat/pull/13630) by [@knrt10](https://github.com/knrt10))
+
 - Corrects UI background of forced F2A Authentication ([#13670](https://github.com/RocketChat/Rocket.Chat/pull/13670) by [@fliptrail](https://github.com/fliptrail))
+
 - Race condition on the loading of Apps on the admin page ([#13587](https://github.com/RocketChat/Rocket.Chat/pull/13587))
+
 - Do not allow change avatars of another users without permission ([#13629](https://github.com/RocketChat/Rocket.Chat/pull/13629))
+
 - link of k8s deploy ([#13612](https://github.com/RocketChat/Rocket.Chat/pull/13612) by [@Mr-Linus](https://github.com/Mr-Linus))
+
 - Bugfix markdown Marked link new tab ([#13245](https://github.com/RocketChat/Rocket.Chat/pull/13245) by [@DeviaVir](https://github.com/DeviaVir))
+
 - Partially messaging formatting for bold letters ([#13599](https://github.com/RocketChat/Rocket.Chat/pull/13599) by [@knrt10](https://github.com/knrt10))
+
 - Change userId of rate limiter, change to logged user ([#13442](https://github.com/RocketChat/Rocket.Chat/pull/13442))
+
 - Add retries to docker-compose.yml, to wait for MongoDB to be ready ([#13199](https://github.com/RocketChat/Rocket.Chat/pull/13199) by [@tiangolo](https://github.com/tiangolo))
+
 - Non-latin room names and other slugifications ([#13467](https://github.com/RocketChat/Rocket.Chat/pull/13467))
+
 - Fixed rocketchat-oembed meta fragment pulling ([#13056](https://github.com/RocketChat/Rocket.Chat/pull/13056) by [@wreiske](https://github.com/wreiske))
+
 - Attachments without dates were showing December 31, 1970 ([#13428](https://github.com/RocketChat/Rocket.Chat/pull/13428) by [@wreiske](https://github.com/wreiske))
+
 - Restart required to apply changes in API Rate Limiter settings ([#13451](https://github.com/RocketChat/Rocket.Chat/pull/13451))
+
 - Ability to activate an app installed by zip even offline ([#13563](https://github.com/RocketChat/Rocket.Chat/pull/13563))
+
 - .bin extension added to attached file names ([#13468](https://github.com/RocketChat/Rocket.Chat/pull/13468) by [@Hudell](https://github.com/Hudell))
+
 - Right arrows in default HTML content ([#13502](https://github.com/RocketChat/Rocket.Chat/pull/13502))
+
 - Typo in a referrer header in inject.js file ([#13469](https://github.com/RocketChat/Rocket.Chat/pull/13469) by [@algomaster99](https://github.com/algomaster99))
+
 - Fix issue cannot filter channels by name ([#12952](https://github.com/RocketChat/Rocket.Chat/pull/12952) by [@huydang284](https://github.com/huydang284))
+
 - mention-links not being always resolved ([#11745](https://github.com/RocketChat/Rocket.Chat/pull/11745) by [@mrsimpson](https://github.com/mrsimpson))
+
 - allow user to logout before set username ([#13439](https://github.com/RocketChat/Rocket.Chat/pull/13439))
+
 - Error when recording data into the connection object ([#13553](https://github.com/RocketChat/Rocket.Chat/pull/13553))
+
 - Handle showing/hiding input in messageBox ([#13564](https://github.com/RocketChat/Rocket.Chat/pull/13564))
+
 - Fix wrong this scope in Notifications ([#13515](https://github.com/RocketChat/Rocket.Chat/pull/13515))
+
 - Get next Livechat agent endpoint ([#13485](https://github.com/RocketChat/Rocket.Chat/pull/13485))
+
 - Sidenav mouse hover was slow ([#13482](https://github.com/RocketChat/Rocket.Chat/pull/13482))
+
 - Emoji detection at line breaks ([#13447](https://github.com/RocketChat/Rocket.Chat/pull/13447) by [@savish28](https://github.com/savish28))
+
 - Small improvements on message box ([#13444](https://github.com/RocketChat/Rocket.Chat/pull/13444))
+
 - Fixing rooms find by type and name ([#11451](https://github.com/RocketChat/Rocket.Chat/pull/11451) by [@hmagarotto](https://github.com/hmagarotto))
+
 - linear-gradient background on safari ([#13363](https://github.com/RocketChat/Rocket.Chat/pull/13363))
+
 - Fixed text for "bulk-register-user" ([#11558](https://github.com/RocketChat/Rocket.Chat/pull/11558) by [@the4ndy](https://github.com/the4ndy))
+
 - Closing sidebar when room menu is clicked. ([#13842](https://github.com/RocketChat/Rocket.Chat/pull/13842) by [@Kailash0311](https://github.com/Kailash0311))
+
 - Check settings for name requirement before validating ([#14021](https://github.com/RocketChat/Rocket.Chat/pull/14021))
+
 - Links and upload paths when running in a subdir ([#13982](https://github.com/RocketChat/Rocket.Chat/pull/13982))
+
 - users.getPreferences when the user doesn't have any preferences ([#13532](https://github.com/RocketChat/Rocket.Chat/pull/13532) by [@thayannevls](https://github.com/thayannevls))
+
 - Real names were not displayed in the reactions (API/UI) ([#13495](https://github.com/RocketChat/Rocket.Chat/pull/13495))
+
 - Theme CSS loading in subdir env ([#14015](https://github.com/RocketChat/Rocket.Chat/pull/14015))
+
 - Fix rendering of links in the announcement modal ([#13250](https://github.com/RocketChat/Rocket.Chat/pull/13250) by [@supra08](https://github.com/supra08))
+
 - Add custom MIME types for *.ico extension ([#13969](https://github.com/RocketChat/Rocket.Chat/pull/13969))
+
 - Groups endpoints permission validations ([#13994](https://github.com/RocketChat/Rocket.Chat/pull/13994))
+
 - Focus on input when emoji picker box is open was not working ([#13981](https://github.com/RocketChat/Rocket.Chat/pull/13981))
+
 - Auto hide Livechat room from sidebar on close ([#13824](https://github.com/RocketChat/Rocket.Chat/pull/13824) by [@knrt10](https://github.com/knrt10))
+
 - Improve cloud section ([#13820](https://github.com/RocketChat/Rocket.Chat/pull/13820))
+
 - Wrong permalink when running in subdir ([#13746](https://github.com/RocketChat/Rocket.Chat/pull/13746) by [@ura14h](https://github.com/ura14h))
+
 - Change localStorage keys to work when server is running in a subdir ([#13968](https://github.com/RocketChat/Rocket.Chat/pull/13968))
+
 - SAML certificate settings don't follow a pattern ([#14179](https://github.com/RocketChat/Rocket.Chat/pull/14179) by [@Hudell](https://github.com/Hudell))
+
 - Custom Oauth store refresh and id tokens with expiresIn ([#14121](https://github.com/RocketChat/Rocket.Chat/pull/14121) by [@ralfbecker](https://github.com/ralfbecker))
+
 - Apps converters delete fields on message attachments ([#14028](https://github.com/RocketChat/Rocket.Chat/pull/14028))
+
 - Custom Oauth login not working with accessToken ([#14113](https://github.com/RocketChat/Rocket.Chat/pull/14113) by [@knrt10](https://github.com/knrt10))
+
 - renderField template to correct short property usage ([#14148](https://github.com/RocketChat/Rocket.Chat/pull/14148))
+
 - Updating a message from apps if keep history is on ([#14129](https://github.com/RocketChat/Rocket.Chat/pull/14129))
+
 - Missing connection headers on Livechat REST API ([#14130](https://github.com/RocketChat/Rocket.Chat/pull/14130))
+
 - Receiving agent for new livechats from REST API ([#14103](https://github.com/RocketChat/Rocket.Chat/pull/14103))
+
 - Livechat user registration in another department ([#10695](https://github.com/RocketChat/Rocket.Chat/pull/10695))
+
 - Support for handling SAML LogoutRequest SLO ([#14074](https://github.com/RocketChat/Rocket.Chat/pull/14074))
+
 - Livechat office hours ([#14031](https://github.com/RocketChat/Rocket.Chat/pull/14031))
+
 - Auto-translate toggle not updating rendered messages ([#14262](https://github.com/RocketChat/Rocket.Chat/pull/14262))
+
 - Align burger menu in header with content matching room header ([#14265](https://github.com/RocketChat/Rocket.Chat/pull/14265))
+
 - Normalize TAPi18n language string on Livechat widget ([#14012](https://github.com/RocketChat/Rocket.Chat/pull/14012))
+
 - Autogrow not working properly for many message boxes ([#14163](https://github.com/RocketChat/Rocket.Chat/pull/14163))
+
 - Image attachment re-renders on message update ([#14207](https://github.com/RocketChat/Rocket.Chat/pull/14207) by [@Kailash0311](https://github.com/Kailash0311))
+
 - Sidenav does not open on some admin pages ([#14010](https://github.com/RocketChat/Rocket.Chat/pull/14010))
+
 - Empty result when getting badge count notification ([#14244](https://github.com/RocketChat/Rocket.Chat/pull/14244))
+
 - Obey audio notification preferences ([#14188](https://github.com/RocketChat/Rocket.Chat/pull/14188))
+
 - Slackbridge private channels ([#14273](https://github.com/RocketChat/Rocket.Chat/pull/14273) by [@Hudell](https://github.com/Hudell) & [@nylen](https://github.com/nylen))
+
 - View All members button now not in direct room ([#14081](https://github.com/RocketChat/Rocket.Chat/pull/14081) by [@knrt10](https://github.com/knrt10))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Update eslint config ([#13966](https://github.com/RocketChat/Rocket.Chat/pull/13966))
+
 - Remove some bad references to messageBox ([#13954](https://github.com/RocketChat/Rocket.Chat/pull/13954))
+
 - LingoHub based on develop ([#13964](https://github.com/RocketChat/Rocket.Chat/pull/13964))
+
 - Update preview Dockerfile to use Stretch dependencies ([#13947](https://github.com/RocketChat/Rocket.Chat/pull/13947))
+
 - Small improvements to federation callbacks/hooks ([#13946](https://github.com/RocketChat/Rocket.Chat/pull/13946))
+
 - Improve: Support search and adding federated users through regular endpoints ([#13936](https://github.com/RocketChat/Rocket.Chat/pull/13936))
+
 - Remove bitcoin link in Readme.md since the link is broken ([#13935](https://github.com/RocketChat/Rocket.Chat/pull/13935) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
 - Fix missing dependencies on stretch CI image ([#13910](https://github.com/RocketChat/Rocket.Chat/pull/13910))
+
 - Remove some index.js files routing for server/client files ([#13772](https://github.com/RocketChat/Rocket.Chat/pull/13772))
+
 - Use CircleCI Debian Stretch images ([#13906](https://github.com/RocketChat/Rocket.Chat/pull/13906))
+
 - LingoHub based on develop ([#13891](https://github.com/RocketChat/Rocket.Chat/pull/13891))
+
 - User remove role dialog fixed ([#13874](https://github.com/RocketChat/Rocket.Chat/pull/13874) by [@bhardwajaditya](https://github.com/bhardwajaditya))
+
 - Rename Threads to Discussion ([#13782](https://github.com/RocketChat/Rocket.Chat/pull/13782))
+
 - [BUG] Icon Fixed for Knowledge base on Livechat  ([#13806](https://github.com/RocketChat/Rocket.Chat/pull/13806) by [@knrt10](https://github.com/knrt10))
+
 - Add support to search for all users in directory ([#13803](https://github.com/RocketChat/Rocket.Chat/pull/13803))
+
 - LingoHub based on develop ([#13839](https://github.com/RocketChat/Rocket.Chat/pull/13839))
+
 - Remove unused style ([#13834](https://github.com/RocketChat/Rocket.Chat/pull/13834))
+
 - Remove unused files ([#13833](https://github.com/RocketChat/Rocket.Chat/pull/13833))
+
 - Lingohub sync and additional fixes ([#13825](https://github.com/RocketChat/Rocket.Chat/pull/13825))
+
 - Fix: addRoomAccessValidator method created for Threads ([#13789](https://github.com/RocketChat/Rocket.Chat/pull/13789))
+
 - Adds French translation of Personal Access Token ([#13779](https://github.com/RocketChat/Rocket.Chat/pull/13779) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
 - Remove Sandstorm support ([#13773](https://github.com/RocketChat/Rocket.Chat/pull/13773))
+
 - Removing (almost) every dynamic imports ([#13767](https://github.com/RocketChat/Rocket.Chat/pull/13767))
+
 - Regression: Threads styles improvement ([#13741](https://github.com/RocketChat/Rocket.Chat/pull/13741))
+
 - Convert imports to relative paths ([#13740](https://github.com/RocketChat/Rocket.Chat/pull/13740))
+
 - Regression: removed backup files ([#13729](https://github.com/RocketChat/Rocket.Chat/pull/13729))
+
 - Remove unused files ([#13725](https://github.com/RocketChat/Rocket.Chat/pull/13725))
+
 - Add Houston config ([#13707](https://github.com/RocketChat/Rocket.Chat/pull/13707))
+
 - Change the way to resolve DNS for Federation ([#13695](https://github.com/RocketChat/Rocket.Chat/pull/13695))
+
 - Update husky config ([#13687](https://github.com/RocketChat/Rocket.Chat/pull/13687))
+
 - Regression: Prune Threads ([#13683](https://github.com/RocketChat/Rocket.Chat/pull/13683))
+
 - Regression: Fix icon for DMs ([#13679](https://github.com/RocketChat/Rocket.Chat/pull/13679))
+
 - Regression: Add missing translations used in Apps pages ([#13674](https://github.com/RocketChat/Rocket.Chat/pull/13674))
+
 - Regression: User Discussions join message ([#13656](https://github.com/RocketChat/Rocket.Chat/pull/13656) by [@bhardwajaditya](https://github.com/bhardwajaditya))
+
 - Regression: Sidebar create new channel hover text ([#13658](https://github.com/RocketChat/Rocket.Chat/pull/13658) by [@bhardwajaditya](https://github.com/bhardwajaditya))
+
 - Regression: Fix embedded layout ([#13574](https://github.com/RocketChat/Rocket.Chat/pull/13574))
+
 - Improve: Send cloud token to Federation Hub ([#13651](https://github.com/RocketChat/Rocket.Chat/pull/13651))
+
 - Regression: Discussions - Invite users and DM ([#13646](https://github.com/RocketChat/Rocket.Chat/pull/13646))
+
 - LingoHub based on develop ([#13623](https://github.com/RocketChat/Rocket.Chat/pull/13623))
+
 - Force some words to translate in other languages ([#13367](https://github.com/RocketChat/Rocket.Chat/pull/13367) by [@soltanabadiyan](https://github.com/soltanabadiyan))
+
 - Fix wrong imports ([#13601](https://github.com/RocketChat/Rocket.Chat/pull/13601))
+
 - Fix: Some german translations ([#13299](https://github.com/RocketChat/Rocket.Chat/pull/13299) by [@soenkef](https://github.com/soenkef))
+
 - Add better positioning for tooltips on edges ([#13472](https://github.com/RocketChat/Rocket.Chat/pull/13472))
+
 - Fix: Mongo.setConnectionOptions was not being set correctly ([#13586](https://github.com/RocketChat/Rocket.Chat/pull/13586))
+
 - Regression: Missing settings import at `packages/rocketchat-livechat/server/methods/saveAppearance.js` ([#13573](https://github.com/RocketChat/Rocket.Chat/pull/13573))
+
 - Depack: Use mainModule for root files ([#13508](https://github.com/RocketChat/Rocket.Chat/pull/13508))
+
 - Regression: fix app pages styles ([#13567](https://github.com/RocketChat/Rocket.Chat/pull/13567))
+
 - Move mongo config away from cors package ([#13531](https://github.com/RocketChat/Rocket.Chat/pull/13531))
+
 - Regression: Add debounce on admin users search to avoid blocking by DDP Rate Limiter ([#13529](https://github.com/RocketChat/Rocket.Chat/pull/13529))
+
 - Remove Package references ([#13523](https://github.com/RocketChat/Rocket.Chat/pull/13523))
+
 - Remove Npm.depends and Npm.require except those that are inside package.js ([#13518](https://github.com/RocketChat/Rocket.Chat/pull/13518))
+
 - Update Meteor 1.8.0.2 ([#13519](https://github.com/RocketChat/Rocket.Chat/pull/13519))
+
 - Convert rc-nrr and slashcommands open to main module structure ([#13520](https://github.com/RocketChat/Rocket.Chat/pull/13520))
+
 - Regression: Fix wrong imports in rc-models ([#13516](https://github.com/RocketChat/Rocket.Chat/pull/13516))
+
 - Regression: Fix autolinker that was not parsing urls correctly ([#13497](https://github.com/RocketChat/Rocket.Chat/pull/13497))
+
 - Regression: Not updating subscriptions and not showing desktop notifcations ([#13509](https://github.com/RocketChat/Rocket.Chat/pull/13509))
+
 -  Fix some imports from wrong packages, remove exports and files unused in rc-ui ([#13422](https://github.com/RocketChat/Rocket.Chat/pull/13422))
+
 -  Remove functions from globals ([#13421](https://github.com/RocketChat/Rocket.Chat/pull/13421))
+
 -  Remove unused files and code in rc-lib - step 3 ([#13420](https://github.com/RocketChat/Rocket.Chat/pull/13420))
+
 -  Remove unused files in rc-lib - step 2 ([#13419](https://github.com/RocketChat/Rocket.Chat/pull/13419))
+
 -  Remove unused files and code in rc-lib - step 1 ([#13416](https://github.com/RocketChat/Rocket.Chat/pull/13416))
+
 -  Convert rocketchat-lib to main module structure ([#13415](https://github.com/RocketChat/Rocket.Chat/pull/13415))
+
 - Regression: Message box geolocation was throwing error ([#13496](https://github.com/RocketChat/Rocket.Chat/pull/13496))
+
 -  Import missed functions to remove dependency of RC namespace ([#13414](https://github.com/RocketChat/Rocket.Chat/pull/13414))
+
 -  Convert rocketchat-apps to main module structure ([#13409](https://github.com/RocketChat/Rocket.Chat/pull/13409))
+
 - Remove dependency of RC namespace in root server folder - step 6 ([#13405](https://github.com/RocketChat/Rocket.Chat/pull/13405))
+
 - Remove dependency of RC namespace in root server folder - step 5 ([#13402](https://github.com/RocketChat/Rocket.Chat/pull/13402))
+
 -  Remove dependency of RC namespace in root server folder - step 4 ([#13400](https://github.com/RocketChat/Rocket.Chat/pull/13400))
+
 - Remove dependency of RC namespace in root server folder - step 3 ([#13398](https://github.com/RocketChat/Rocket.Chat/pull/13398))
+
 - Remove dependency of RC namespace in root server folder - step 2 ([#13397](https://github.com/RocketChat/Rocket.Chat/pull/13397))
+
 -  Remove dependency of RC namespace in root server folder - step 1 ([#13390](https://github.com/RocketChat/Rocket.Chat/pull/13390))
+
 -  Remove dependency of RC namespace in root client folder, imports/message-read-receipt and imports/personal-access-tokens ([#13389](https://github.com/RocketChat/Rocket.Chat/pull/13389))
+
 -  Remove dependency of RC namespace in rc-integrations and importer-hipchat-enterprise ([#13386](https://github.com/RocketChat/Rocket.Chat/pull/13386))
+
 - Move rc-livechat server models to rc-models ([#13384](https://github.com/RocketChat/Rocket.Chat/pull/13384))
+
 -  Remove dependency of RC namespace in rc-livechat/server/publications ([#13383](https://github.com/RocketChat/Rocket.Chat/pull/13383))
+
 - Remove dependency of RC namespace in rc-livechat/server/methods ([#13382](https://github.com/RocketChat/Rocket.Chat/pull/13382))
+
 - Remove dependency of RC namespace in rc-livechat/imports, lib, server/api, server/hooks and server/lib ([#13379](https://github.com/RocketChat/Rocket.Chat/pull/13379))
+
 -  Remove LIvechat global variable from RC namespace ([#13378](https://github.com/RocketChat/Rocket.Chat/pull/13378))
+
 - Remove dependency of RC namespace in rc-livechat/server/models ([#13377](https://github.com/RocketChat/Rocket.Chat/pull/13377))
+
 -  Remove dependency of RC namespace in livechat/client ([#13370](https://github.com/RocketChat/Rocket.Chat/pull/13370))
+
 - Remove dependency of RC namespace in rc-wordpress, chatpal-search and irc ([#13492](https://github.com/RocketChat/Rocket.Chat/pull/13492))
+
 -  Remove dependency of RC namespace in rc-videobridge and webdav ([#13366](https://github.com/RocketChat/Rocket.Chat/pull/13366))
+
 -  Remove dependency of RC namespace in rc-ui-master, ui-message- user-data-download and version-check ([#13365](https://github.com/RocketChat/Rocket.Chat/pull/13365))
+
 - Remove dependency of RC namespace in rc-ui-clean-history, ui-admin and ui-login ([#13362](https://github.com/RocketChat/Rocket.Chat/pull/13362))
+
 -  Remove dependency of RC namespace in rc-ui, ui-account and ui-admin ([#13361](https://github.com/RocketChat/Rocket.Chat/pull/13361))
+
 -  Remove dependency of RC namespace in rc-statistics and tokenpass ([#13359](https://github.com/RocketChat/Rocket.Chat/pull/13359))
+
 -  Remove dependency of RC namespace in rc-smarsh-connector, sms and spotify ([#13358](https://github.com/RocketChat/Rocket.Chat/pull/13358))
+
 - Remove dependency of RC namespace in rc-slash-kick, leave, me, msg, mute, open, topic and unarchiveroom ([#13357](https://github.com/RocketChat/Rocket.Chat/pull/13357))
+
 -  Remove dependency of RC namespace in rc-slash-archiveroom, create, help, hide, invite, inviteall and join ([#13356](https://github.com/RocketChat/Rocket.Chat/pull/13356))
+
 - Remove dependency of RC namespace in rc-setup-wizard, slackbridge and asciiarts ([#13348](https://github.com/RocketChat/Rocket.Chat/pull/13348))
+
 -  Remove dependency of RC namespace in rc-reactions, retention-policy and search ([#13347](https://github.com/RocketChat/Rocket.Chat/pull/13347))
+
 -  Remove dependency of RC namespace in rc-oembed and rc-otr ([#13345](https://github.com/RocketChat/Rocket.Chat/pull/13345))
+
 - Remove dependency of RC namespace in rc-oauth2-server and message-star ([#13344](https://github.com/RocketChat/Rocket.Chat/pull/13344))
+
 -  Remove dependency of RC namespace in rc-message-pin and message-snippet ([#13343](https://github.com/RocketChat/Rocket.Chat/pull/13343))
+
 - Depackaging ([#13483](https://github.com/RocketChat/Rocket.Chat/pull/13483))
+
 - Merge master into develop & Set version to 1.0.0-develop ([#13435](https://github.com/RocketChat/Rocket.Chat/pull/13435) by [@Hudell](https://github.com/Hudell) & [@TkTech](https://github.com/TkTech) & [@theundefined](https://github.com/theundefined))
+
 - Regression: Table admin pages ([#13411](https://github.com/RocketChat/Rocket.Chat/pull/13411))
+
 - Regression: Template error ([#13410](https://github.com/RocketChat/Rocket.Chat/pull/13410))
+
 - Removed old templates ([#13406](https://github.com/RocketChat/Rocket.Chat/pull/13406))
+
 - Add pagination to getUsersOfRoom ([#12834](https://github.com/RocketChat/Rocket.Chat/pull/12834) by [@Hudell](https://github.com/Hudell))
+
 - OpenShift custom OAuth support ([#13925](https://github.com/RocketChat/Rocket.Chat/pull/13925) by [@bsharrow](https://github.com/bsharrow))
+
 - Settings: disable reset button ([#14026](https://github.com/RocketChat/Rocket.Chat/pull/14026))
+
 - Settings: hiding reset button for readonly fields ([#14025](https://github.com/RocketChat/Rocket.Chat/pull/14025))
+
 - Fix debug logging not being enabled by the setting ([#13979](https://github.com/RocketChat/Rocket.Chat/pull/13979))
+
 - Deprecate /api/v1/info in favor of /api/info ([#13798](https://github.com/RocketChat/Rocket.Chat/pull/13798))
+
 - Change dynamic dependency of FileUpload in Messages models ([#13776](https://github.com/RocketChat/Rocket.Chat/pull/13776))
+
 - Allow set env var METEOR_OPLOG_TOO_FAR_BEHIND ([#14017](https://github.com/RocketChat/Rocket.Chat/pull/14017))
+
 - Improve: Decrease padding for app buy modal ([#13984](https://github.com/RocketChat/Rocket.Chat/pull/13984))
+
 - Prioritize user-mentions badge ([#14057](https://github.com/RocketChat/Rocket.Chat/pull/14057))
+
 - Proper thread quote, clear message box on send, and other nice things to have ([#14049](https://github.com/RocketChat/Rocket.Chat/pull/14049))
+
 - Fix: Tests were not exiting RC instances ([#14054](https://github.com/RocketChat/Rocket.Chat/pull/14054))
+
 - Fix shield indentation ([#14048](https://github.com/RocketChat/Rocket.Chat/pull/14048))
+
 - Fix modal scroll ([#14052](https://github.com/RocketChat/Rocket.Chat/pull/14052))
+
 - Fix race condition of lastMessage set ([#14041](https://github.com/RocketChat/Rocket.Chat/pull/14041))
+
 - Fix room re-rendering ([#14044](https://github.com/RocketChat/Rocket.Chat/pull/14044))
+
 - Fix sending notifications to mentions on threads and discussion email sender ([#14043](https://github.com/RocketChat/Rocket.Chat/pull/14043))
+
 - Fix discussions issues after room deletion and translation actions not being shown ([#14018](https://github.com/RocketChat/Rocket.Chat/pull/14018))
+
 - Show discussion avatar ([#14053](https://github.com/RocketChat/Rocket.Chat/pull/14053))
+
 - Fix threads tests ([#14180](https://github.com/RocketChat/Rocket.Chat/pull/14180))
+
 - Prevent error for ldap login with invalid characters ([#14160](https://github.com/RocketChat/Rocket.Chat/pull/14160))
+
 - [REGRESSION] Messages sent by livechat's guests are losing sender info ([#14174](https://github.com/RocketChat/Rocket.Chat/pull/14174))
+
 - Faster CI build for PR ([#14171](https://github.com/RocketChat/Rocket.Chat/pull/14171))
+
 - Regression: Message box does not go back to initial state after sending a message ([#14161](https://github.com/RocketChat/Rocket.Chat/pull/14161))
+
 - Prevent error on normalize thread message for preview ([#14170](https://github.com/RocketChat/Rocket.Chat/pull/14170))
+
 - Update badges and mention links colors ([#14071](https://github.com/RocketChat/Rocket.Chat/pull/14071))
+
 - Smaller thread replies and system messages ([#14099](https://github.com/RocketChat/Rocket.Chat/pull/14099))
+
 - Regression: User autocomplete was not listing users from correct room ([#14125](https://github.com/RocketChat/Rocket.Chat/pull/14125))
+
 - Regression: Role creation and deletion error fixed ([#14097](https://github.com/RocketChat/Rocket.Chat/pull/14097) by [@knrt10](https://github.com/knrt10))
+
 - [Regression] Fix integrations message example ([#14111](https://github.com/RocketChat/Rocket.Chat/pull/14111))
+
 - Fix update apps capability of updating messages ([#14118](https://github.com/RocketChat/Rocket.Chat/pull/14118))
+
 - Fix: Skip thread notifications on message edit ([#14100](https://github.com/RocketChat/Rocket.Chat/pull/14100))
+
 - Fix: Remove message class `sequential` if `new-day` is present ([#14116](https://github.com/RocketChat/Rocket.Chat/pull/14116))
+
 - Fix top bar unread message counter ([#14102](https://github.com/RocketChat/Rocket.Chat/pull/14102))
+
 - LingoHub based on develop ([#14046](https://github.com/RocketChat/Rocket.Chat/pull/14046))
+
 - Fix sending message from action buttons in messages ([#14101](https://github.com/RocketChat/Rocket.Chat/pull/14101))
+
 - Fix: Error when version check endpoint was returning invalid data ([#14089](https://github.com/RocketChat/Rocket.Chat/pull/14089))
+
 - Wait port release to finish tests ([#14066](https://github.com/RocketChat/Rocket.Chat/pull/14066))
+
 - Fix threads rendering performance ([#14059](https://github.com/RocketChat/Rocket.Chat/pull/14059))
+
 - Unstuck observers every minute ([#14076](https://github.com/RocketChat/Rocket.Chat/pull/14076))
+
 - Fix messages losing thread titles on editing or reaction and improve message actions ([#14051](https://github.com/RocketChat/Rocket.Chat/pull/14051))
+
 - Improve message validation ([#14266](https://github.com/RocketChat/Rocket.Chat/pull/14266))
+
 - Added federation ping, loopback and dashboard ([#14007](https://github.com/RocketChat/Rocket.Chat/pull/14007))
+
 - Regression: Exception on notification when adding someone in room via mention ([#14251](https://github.com/RocketChat/Rocket.Chat/pull/14251))
+
 - Regression: fix grouping for reactive message ([#14246](https://github.com/RocketChat/Rocket.Chat/pull/14246))
+
 - Regression: Cursor position set to beginning when editing a message ([#14245](https://github.com/RocketChat/Rocket.Chat/pull/14245))
+
 - Regression: grouping messages on threads ([#14238](https://github.com/RocketChat/Rocket.Chat/pull/14238))
+
 - Regression: Remove border from unstyled message body ([#14235](https://github.com/RocketChat/Rocket.Chat/pull/14235))
+
 - Move LDAP Escape to login handler ([#14234](https://github.com/RocketChat/Rocket.Chat/pull/14234))
+
 - [Regression] Personal Access Token list fixed ([#14216](https://github.com/RocketChat/Rocket.Chat/pull/14216) by [@knrt10](https://github.com/knrt10))
+
 - ESLint: Add more import rules ([#14226](https://github.com/RocketChat/Rocket.Chat/pull/14226))
+
 - Regression: fix drop file ([#14225](https://github.com/RocketChat/Rocket.Chat/pull/14225))
+
 - Broken styles in Administration's contextual bar ([#14222](https://github.com/RocketChat/Rocket.Chat/pull/14222))
+
 - Regression: Broken UI for messages ([#14223](https://github.com/RocketChat/Rocket.Chat/pull/14223))
+
 - Exit process on unhandled rejection ([#14220](https://github.com/RocketChat/Rocket.Chat/pull/14220))
+
 - Unify mime-type package configuration ([#14217](https://github.com/RocketChat/Rocket.Chat/pull/14217))
+
 - Regression: Prevent startup errors for mentions parsing ([#14219](https://github.com/RocketChat/Rocket.Chat/pull/14219))
+
 - Regression: System messages styling ([#14189](https://github.com/RocketChat/Rocket.Chat/pull/14189))
+
 - Prevent click on reply thread to trigger flex tab closing ([#14215](https://github.com/RocketChat/Rocket.Chat/pull/14215))
+
 - created function to allow change default values, fix loading search users ([#14177](https://github.com/RocketChat/Rocket.Chat/pull/14177))
+
 - Use main message as thread tab title ([#14213](https://github.com/RocketChat/Rocket.Chat/pull/14213))
+
 - Use own logic to get thread infos via REST ([#14210](https://github.com/RocketChat/Rocket.Chat/pull/14210))
+
 - Regression: wrong expression at messageBox.actions.remove() ([#14192](https://github.com/RocketChat/Rocket.Chat/pull/14192))
+
 - Increment user counter on DMs ([#14185](https://github.com/RocketChat/Rocket.Chat/pull/14185))
+
 - [REGRESSION] Fix variable name references in message template ([#14184](https://github.com/RocketChat/Rocket.Chat/pull/14184))
+
 - Regression: Active room was not being marked ([#14276](https://github.com/RocketChat/Rocket.Chat/pull/14276))
+
 - Rename Cloud to Connectivity Services & split Apps in Apps and Marketplace ([#14211](https://github.com/RocketChat/Rocket.Chat/pull/14211))
+
 - LingoHub based on develop ([#14178](https://github.com/RocketChat/Rocket.Chat/pull/14178))
+
 - Regression: Discussions were not showing on Tab Bar ([#14050](https://github.com/RocketChat/Rocket.Chat/pull/14050) by [@knrt10](https://github.com/knrt10))
+
 - Force unstyling of blockquote under .message-body--unstyled ([#14274](https://github.com/RocketChat/Rocket.Chat/pull/14274))
+
 - Regression: Admin embedded layout ([#14229](https://github.com/RocketChat/Rocket.Chat/pull/14229))
+
 - New threads layout ([#14269](https://github.com/RocketChat/Rocket.Chat/pull/14269))
+
 - Improve: Marketplace auth inside Rocket.Chat instead of inside the iframe.   ([#14258](https://github.com/RocketChat/Rocket.Chat/pull/14258))
+
 - [New] Reply privately to group messages ([#14150](https://github.com/RocketChat/Rocket.Chat/pull/14150) by [@bhardwajaditya](https://github.com/bhardwajaditya))
 
 </details>
@@ -2489,29 +3657,46 @@
 
 ### 🚀 Improvements
 
+
 - Open rooms quicker ([#13417](https://github.com/RocketChat/Rocket.Chat/pull/13417))
+
 - Allow configure Prometheus port per process via Environment Variable ([#13436](https://github.com/RocketChat/Rocket.Chat/pull/13436))
+
 - Add API option "permissionsRequired" ([#13430](https://github.com/RocketChat/Rocket.Chat/pull/13430))
 
 ### 🐛 Bug fixes
 
+
 - Invalid condition on getting next livechat agent over REST API endpoint ([#13360](https://github.com/RocketChat/Rocket.Chat/pull/13360))
+
 - "Test Desktop Notifications" not triggering a notification ([#13457](https://github.com/RocketChat/Rocket.Chat/pull/13457))
+
 - Translated and incorrect i18n variables ([#13463](https://github.com/RocketChat/Rocket.Chat/pull/13463) by [@leonboot](https://github.com/leonboot))
+
 - Properly escape custom emoji names for pattern matching ([#13408](https://github.com/RocketChat/Rocket.Chat/pull/13408))
+
 - Not translated emails ([#13452](https://github.com/RocketChat/Rocket.Chat/pull/13452))
+
 - XML-decryption module not found ([#13437](https://github.com/RocketChat/Rocket.Chat/pull/13437) by [@Hudell](https://github.com/Hudell))
+
 - Update Russian localization ([#13244](https://github.com/RocketChat/Rocket.Chat/pull/13244) by [@BehindLoader](https://github.com/BehindLoader))
+
 - Several Problems on HipChat Importer ([#13336](https://github.com/RocketChat/Rocket.Chat/pull/13336) by [@Hudell](https://github.com/Hudell))
+
 - Invalid push gateway configuration, requires the uniqueId ([#13423](https://github.com/RocketChat/Rocket.Chat/pull/13423))
+
 - Notify private settings changes even on public settings changed ([#13369](https://github.com/RocketChat/Rocket.Chat/pull/13369))
+
 - Misaligned upload progress bar "cancel" button ([#13407](https://github.com/RocketChat/Rocket.Chat/pull/13407))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.74.3 ([#13474](https://github.com/RocketChat/Rocket.Chat/pull/13474) by [@BehindLoader](https://github.com/BehindLoader) & [@Hudell](https://github.com/Hudell) & [@leonboot](https://github.com/leonboot))
+
 - Room loading improvements ([#13471](https://github.com/RocketChat/Rocket.Chat/pull/13471))
+
 - Regression: Remove console.log on email translations ([#13456](https://github.com/RocketChat/Rocket.Chat/pull/13456))
 
 </details>
@@ -2541,12 +3726,16 @@
 
 ### 🚀 Improvements
 
+
 - Send `uniqueID` to all clients so Jitsi rooms can be created correctly ([#13342](https://github.com/RocketChat/Rocket.Chat/pull/13342))
 
 ### 🐛 Bug fixes
 
+
 - Rate Limiter was limiting communication between instances ([#13326](https://github.com/RocketChat/Rocket.Chat/pull/13326))
+
 - Setup wizard calling 'saveSetting' for each field/setting ([#13349](https://github.com/RocketChat/Rocket.Chat/pull/13349))
+
 - Pass token for cloud register ([#13350](https://github.com/RocketChat/Rocket.Chat/pull/13350))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -2566,24 +3755,36 @@
 
 ### 🎉 New features
 
+
 - Limit all DDP/Websocket requests (configurable via admin panel) ([#13311](https://github.com/RocketChat/Rocket.Chat/pull/13311))
+
 - REST endpoint to forward livechat rooms ([#13308](https://github.com/RocketChat/Rocket.Chat/pull/13308))
+
 - Collect data for Monthly/Daily Active Users for a future dashboard ([#11525](https://github.com/RocketChat/Rocket.Chat/pull/11525))
+
 - Add parseUrls field to the apps message converter ([#13248](https://github.com/RocketChat/Rocket.Chat/pull/13248))
 
 ### 🐛 Bug fixes
 
+
 - Mobile view and re-enable E2E tests ([#13322](https://github.com/RocketChat/Rocket.Chat/pull/13322))
+
 - Hipchat Enterprise Importer not generating subscriptions ([#13293](https://github.com/RocketChat/Rocket.Chat/pull/13293) by [@Hudell](https://github.com/Hudell))
+
 - Message updating by Apps ([#13294](https://github.com/RocketChat/Rocket.Chat/pull/13294))
+
 - REST endpoint for creating custom emojis ([#13306](https://github.com/RocketChat/Rocket.Chat/pull/13306))
+
 - Preview of image uploads were not working when apps framework is enable ([#13303](https://github.com/RocketChat/Rocket.Chat/pull/13303))
+
 - HipChat Enterprise importer fails when importing a large amount of messages (millions) ([#13221](https://github.com/RocketChat/Rocket.Chat/pull/13221) by [@Hudell](https://github.com/Hudell))
+
 - Fix bug when user try recreate channel or group with same name and remove room from cache when user leaves room ([#12341](https://github.com/RocketChat/Rocket.Chat/pull/12341))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Fix: Missing export in cloud package ([#13282](https://github.com/RocketChat/Rocket.Chat/pull/13282))
 
 </details>
@@ -2612,91 +3813,167 @@
 
 ### 🎉 New features
 
+
 - SAML: Adds possibility to decrypt encrypted assertions ([#12153](https://github.com/RocketChat/Rocket.Chat/pull/12153) by [@gerbsen](https://github.com/gerbsen))
+
 - Add rate limiter to REST endpoints ([#11251](https://github.com/RocketChat/Rocket.Chat/pull/11251))
+
 - Added an option to disable email when activate and deactivate users ([#13183](https://github.com/RocketChat/Rocket.Chat/pull/13183))
+
 - Add create, update and delete endpoint for custom emojis ([#13160](https://github.com/RocketChat/Rocket.Chat/pull/13160))
+
 - Added endpoint to update timeout of the jitsi video conference ([#13167](https://github.com/RocketChat/Rocket.Chat/pull/13167))
+
 - Display total number of files and total upload size in admin ([#13184](https://github.com/RocketChat/Rocket.Chat/pull/13184))
+
 - Livechat GDPR compliance ([#12982](https://github.com/RocketChat/Rocket.Chat/pull/12982))
+
 - Added stream to notify when agent status change ([#13076](https://github.com/RocketChat/Rocket.Chat/pull/13076))
+
 - Add new Livechat REST endpoint to update the visitor's status ([#13108](https://github.com/RocketChat/Rocket.Chat/pull/13108))
+
 - Add Allow Methods directive to CORS ([#13073](https://github.com/RocketChat/Rocket.Chat/pull/13073))
 
 ### 🚀 Improvements
 
+
 - Dutch translations ([#12294](https://github.com/RocketChat/Rocket.Chat/pull/12294) by [@Jeroeny](https://github.com/Jeroeny))
+
 - Persian translations ([#13114](https://github.com/RocketChat/Rocket.Chat/pull/13114) by [@behnejad](https://github.com/behnejad))
+
 - Change the way the app detail screen shows support link when it's an email ([#13129](https://github.com/RocketChat/Rocket.Chat/pull/13129))
+
 - Process alerts from update checking ([#13194](https://github.com/RocketChat/Rocket.Chat/pull/13194))
+
 - Add "Apps Engine Version" to Administration > Info ([#13169](https://github.com/RocketChat/Rocket.Chat/pull/13169))
+
 - New Livechat statistics added to statistics collector ([#13168](https://github.com/RocketChat/Rocket.Chat/pull/13168))
+
 - Return room type field on Livechat findRoom method ([#13078](https://github.com/RocketChat/Rocket.Chat/pull/13078))
+
 - Return visitorEmails field on Livechat findGuest method ([#13097](https://github.com/RocketChat/Rocket.Chat/pull/13097))
+
 - Adds the "showConnecting" property to Livechat Config payload ([#13158](https://github.com/RocketChat/Rocket.Chat/pull/13158))
+
 - Adds history log for all Importers and improves HipChat import performance ([#13083](https://github.com/RocketChat/Rocket.Chat/pull/13083) by [@Hudell](https://github.com/Hudell))
+
 - Inject metrics on callbacks ([#13266](https://github.com/RocketChat/Rocket.Chat/pull/13266))
 
 ### 🐛 Bug fixes
 
+
 - Few polish translating ([#13112](https://github.com/RocketChat/Rocket.Chat/pull/13112) by [@theundefined](https://github.com/theundefined))
+
 - Few polish translating ([#13112](https://github.com/RocketChat/Rocket.Chat/pull/13112) by [@theundefined](https://github.com/theundefined))
+
 - Update Message: Does not show edited when message was not edited. ([#13053](https://github.com/RocketChat/Rocket.Chat/pull/13053) by [@Kailash0311](https://github.com/Kailash0311))
+
 - Notifications for mentions not working on large rooms and don't emit desktop notifications for offline users ([#13067](https://github.com/RocketChat/Rocket.Chat/pull/13067))
+
 - Emoticons not displayed in room topic ([#12858](https://github.com/RocketChat/Rocket.Chat/pull/12858) by [@alexbartsch](https://github.com/alexbartsch))
+
 - REST API endpoint `users.getPersonalAccessTokens` error when user has no access tokens ([#13150](https://github.com/RocketChat/Rocket.Chat/pull/13150))
+
 - Remove unused code for Cordova ([#13188](https://github.com/RocketChat/Rocket.Chat/pull/13188))
+
 - Avatars with transparency were being converted to black ([#13181](https://github.com/RocketChat/Rocket.Chat/pull/13181))
+
 - REST api client base url on subdir ([#13180](https://github.com/RocketChat/Rocket.Chat/pull/13180))
+
 - Change webdav creation, due to changes in the npm lib after last update ([#13170](https://github.com/RocketChat/Rocket.Chat/pull/13170))
+
 - Invite command was not accpeting @ in username ([#12927](https://github.com/RocketChat/Rocket.Chat/pull/12927) by [@piotrkochan](https://github.com/piotrkochan))
+
 - Remove ES6 code from Livechat widget script ([#13105](https://github.com/RocketChat/Rocket.Chat/pull/13105))
+
 - User status on header and user info are not translated ([#13096](https://github.com/RocketChat/Rocket.Chat/pull/13096))
+
 - #11692 - Suppress error when drop collection in migration to suit to … ([#13091](https://github.com/RocketChat/Rocket.Chat/pull/13091) by [@Xuhao](https://github.com/Xuhao))
+
 - Change input type of e2e to password ([#13077](https://github.com/RocketChat/Rocket.Chat/pull/13077) by [@supra08](https://github.com/supra08))
+
 - LDAP login of new users overwriting `fname` from all subscriptions ([#13203](https://github.com/RocketChat/Rocket.Chat/pull/13203))
+
 - Snap upgrade add post-refresh hook ([#13153](https://github.com/RocketChat/Rocket.Chat/pull/13153))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.74.0 ([#13270](https://github.com/RocketChat/Rocket.Chat/pull/13270) by [@Xuhao](https://github.com/Xuhao) & [@supra08](https://github.com/supra08))
+
 - Regression: Fix message pinning ([#13213](https://github.com/RocketChat/Rocket.Chat/pull/13213) by [@TkTech](https://github.com/TkTech))
+
 - LingoHub based on develop ([#13201](https://github.com/RocketChat/Rocket.Chat/pull/13201))
+
 - Language: Edit typo "Обновлить" ([#13177](https://github.com/RocketChat/Rocket.Chat/pull/13177) by [@zpavlig](https://github.com/zpavlig))
+
 - Regression: Fix export AudioRecorder ([#13192](https://github.com/RocketChat/Rocket.Chat/pull/13192))
+
 -  Remove dependency of RocketChat namespace and push-notifications ([#13137](https://github.com/RocketChat/Rocket.Chat/pull/13137))
+
 - Remove dependency of RocketChat namespace and custom-sounds ([#13136](https://github.com/RocketChat/Rocket.Chat/pull/13136))
+
 - Remove dependency of RocketChat namespace and logger ([#13135](https://github.com/RocketChat/Rocket.Chat/pull/13135))
+
 - Remove dependency between RocketChat namespace and migrations ([#13133](https://github.com/RocketChat/Rocket.Chat/pull/13133))
+
 - Convert rocketchat:ui to main module structure ([#13132](https://github.com/RocketChat/Rocket.Chat/pull/13132))
+
 - Remove dependency of RocketChat namespace inside rocketchat:ui ([#13131](https://github.com/RocketChat/Rocket.Chat/pull/13131))
+
 - Move some ui function to ui-utils ([#13123](https://github.com/RocketChat/Rocket.Chat/pull/13123))
+
 - Regression: fix upload permissions ([#13157](https://github.com/RocketChat/Rocket.Chat/pull/13157))
+
 - Move some function to utils ([#13122](https://github.com/RocketChat/Rocket.Chat/pull/13122))
+
 - Remove directly dependency between rocketchat:lib and emoji ([#13118](https://github.com/RocketChat/Rocket.Chat/pull/13118))
+
 - Convert rocketchat-webrtc to main module structure ([#13117](https://github.com/RocketChat/Rocket.Chat/pull/13117))
+
 - Remove directly dependency between lib and e2e ([#13115](https://github.com/RocketChat/Rocket.Chat/pull/13115))
+
 - Convert rocketchat-ui-master to main module structure ([#13107](https://github.com/RocketChat/Rocket.Chat/pull/13107))
+
 - Regression: fix rooms model's collection name ([#13146](https://github.com/RocketChat/Rocket.Chat/pull/13146))
+
 - Convert rocketchat-ui-sidenav to main module structure ([#13098](https://github.com/RocketChat/Rocket.Chat/pull/13098))
+
 - Convert rocketchat-file-upload to main module structure ([#13094](https://github.com/RocketChat/Rocket.Chat/pull/13094))
+
 - Remove dependency between lib and authz ([#13066](https://github.com/RocketChat/Rocket.Chat/pull/13066))
+
 - Globals/main module custom oauth ([#13037](https://github.com/RocketChat/Rocket.Chat/pull/13037))
+
 - Move UI Collections to rocketchat:models ([#13064](https://github.com/RocketChat/Rocket.Chat/pull/13064))
+
 - Rocketchat mailer ([#13036](https://github.com/RocketChat/Rocket.Chat/pull/13036))
+
 - Move rocketchat promises ([#13039](https://github.com/RocketChat/Rocket.Chat/pull/13039))
+
 - Globals/move rocketchat notifications ([#13035](https://github.com/RocketChat/Rocket.Chat/pull/13035))
+
 - Test only MongoDB with oplog versions 3.2 and 4.0 for PRs ([#13119](https://github.com/RocketChat/Rocket.Chat/pull/13119))
+
 - Move/create rocketchat callbacks ([#13034](https://github.com/RocketChat/Rocket.Chat/pull/13034))
+
 - Move/create rocketchat metrics ([#13032](https://github.com/RocketChat/Rocket.Chat/pull/13032))
+
 - Move rocketchat models ([#13027](https://github.com/RocketChat/Rocket.Chat/pull/13027))
+
 - Move rocketchat settings to specific package ([#13026](https://github.com/RocketChat/Rocket.Chat/pull/13026))
+
 - Remove incorrect pt-BR translation ([#13074](https://github.com/RocketChat/Rocket.Chat/pull/13074))
+
 - Merge master into develop & Set version to 0.74.0-develop ([#13050](https://github.com/RocketChat/Rocket.Chat/pull/13050) by [@Hudell](https://github.com/Hudell) & [@ohmonster](https://github.com/ohmonster) & [@piotrkochan](https://github.com/piotrkochan))
+
 - Regression: Fix audio message upload ([#13224](https://github.com/RocketChat/Rocket.Chat/pull/13224))
+
 - Regression: Fix message pinning ([#13213](https://github.com/RocketChat/Rocket.Chat/pull/13213) by [@TkTech](https://github.com/TkTech))
+
 - Regression: Fix emoji search ([#13207](https://github.com/RocketChat/Rocket.Chat/pull/13207))
+
 - Change apps engine persistence bridge method to updateByAssociations ([#13239](https://github.com/RocketChat/Rocket.Chat/pull/13239))
 
 </details>
@@ -2741,11 +4018,13 @@
 
 ### 🎉 New features
 
+
 - Cloud Integration ([#13013](https://github.com/RocketChat/Rocket.Chat/pull/13013))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.73.2 ([#13086](https://github.com/RocketChat/Rocket.Chat/pull/13086))
 
 </details>
@@ -2766,13 +4045,17 @@
 
 ### 🐛 Bug fixes
 
+
 - Default importer path ([#13045](https://github.com/RocketChat/Rocket.Chat/pull/13045))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.73.1 ([#13052](https://github.com/RocketChat/Rocket.Chat/pull/13052))
+
 - Execute tests with versions 3.2, 3.4, 3.6 and 4.0 of MongoDB ([#13049](https://github.com/RocketChat/Rocket.Chat/pull/13049))
+
 - Regression: Get room's members list not working on MongoDB 3.2 ([#13051](https://github.com/RocketChat/Rocket.Chat/pull/13051))
 
 </details>
@@ -2791,152 +4074,289 @@
 
 ### 🎉 New features
 
+
 - Create new permission.listAll endpoint to be able to use updatedSince parameter ([#12748](https://github.com/RocketChat/Rocket.Chat/pull/12748))
+
 - Mandatory 2fa for role ([#9748](https://github.com/RocketChat/Rocket.Chat/pull/9748) by [@Hudell](https://github.com/Hudell) & [@karlprieb](https://github.com/karlprieb))
+
 - Add query parameter support to emoji-custom endpoint ([#12754](https://github.com/RocketChat/Rocket.Chat/pull/12754))
+
 - Added a link to contributing.md ([#12856](https://github.com/RocketChat/Rocket.Chat/pull/12856) by [@sanketsingh24](https://github.com/sanketsingh24))
+
 - Added chat.getDeletedMessages since specific date ([#13010](https://github.com/RocketChat/Rocket.Chat/pull/13010))
+
 - Download button for each file in fileslist ([#12874](https://github.com/RocketChat/Rocket.Chat/pull/12874) by [@alexbartsch](https://github.com/alexbartsch))
+
 - Syncloud deploy option ([#12867](https://github.com/RocketChat/Rocket.Chat/pull/12867) by [@cyberb](https://github.com/cyberb))
+
 - Config hooks for snap ([#12351](https://github.com/RocketChat/Rocket.Chat/pull/12351))
+
 - Livechat registration form message ([#12597](https://github.com/RocketChat/Rocket.Chat/pull/12597))
+
 - Include message type & id in push notification payload ([#12771](https://github.com/RocketChat/Rocket.Chat/pull/12771) by [@cardoso](https://github.com/cardoso))
 
 ### 🚀 Improvements
 
+
 - Hipchat Enterprise Importer ([#12985](https://github.com/RocketChat/Rocket.Chat/pull/12985) by [@Hudell](https://github.com/Hudell))
+
 - Add missing translation keys. ([#12722](https://github.com/RocketChat/Rocket.Chat/pull/12722) by [@ura14h](https://github.com/ura14h))
+
 - Accept Slash Commands via Action Buttons when `msg_in_chat_window: true` ([#13009](https://github.com/RocketChat/Rocket.Chat/pull/13009))
+
 - Allow transfer Livechats to online agents only ([#13008](https://github.com/RocketChat/Rocket.Chat/pull/13008))
+
 - Adding debugging instructions in README ([#12989](https://github.com/RocketChat/Rocket.Chat/pull/12989) by [@hypery2k](https://github.com/hypery2k))
+
 - Do not emit settings if there are no changes ([#12904](https://github.com/RocketChat/Rocket.Chat/pull/12904))
+
 - Returning an open room object in the Livechat config endpoint ([#12865](https://github.com/RocketChat/Rocket.Chat/pull/12865))
+
 - Use MongoBD aggregation to get users from a room ([#12566](https://github.com/RocketChat/Rocket.Chat/pull/12566))
+
 - Username suggestion logic ([#12779](https://github.com/RocketChat/Rocket.Chat/pull/12779))
 
 ### 🐛 Bug fixes
 
+
 - Avoiding links with highlighted words ([#12123](https://github.com/RocketChat/Rocket.Chat/pull/12123) by [@rssilva](https://github.com/rssilva))
+
 - Pin and unpin message were not checking permissions ([#12739](https://github.com/RocketChat/Rocket.Chat/pull/12739))
+
 - Fix users.setPreferences endpoint, set language correctly ([#12734](https://github.com/RocketChat/Rocket.Chat/pull/12734))
+
 - Fix set avatar http call, to avoid SSL errors ([#12790](https://github.com/RocketChat/Rocket.Chat/pull/12790))
+
 - Webdav integration account settings were being shown even when Webdav was disabled ([#12569](https://github.com/RocketChat/Rocket.Chat/pull/12569) by [@karakayasemi](https://github.com/karakayasemi))
+
 - Provide better Dutch translations 🇳🇱 ([#12792](https://github.com/RocketChat/Rocket.Chat/pull/12792) by [@mathysie](https://github.com/mathysie))
+
 - E2E`s password reaveal text is always `>%S` when language is zh ([#12795](https://github.com/RocketChat/Rocket.Chat/pull/12795) by [@lvyue](https://github.com/lvyue))
+
 - Nested Markdown blocks not parsed properly ([#12998](https://github.com/RocketChat/Rocket.Chat/pull/12998) by [@Hudell](https://github.com/Hudell))
+
 - Change JSON to EJSON.parse query to support type Date ([#12706](https://github.com/RocketChat/Rocket.Chat/pull/12706))
+
 - Inherit font family in message user card ([#13004](https://github.com/RocketChat/Rocket.Chat/pull/13004))
+
 - Some deprecation issues for media recording ([#12948](https://github.com/RocketChat/Rocket.Chat/pull/12948))
+
 - Stop click event propagation on mention link or user card ([#12983](https://github.com/RocketChat/Rocket.Chat/pull/12983))
+
 - Change field checks in RocketChat.saveStreamingOptions ([#12973](https://github.com/RocketChat/Rocket.Chat/pull/12973))
+
 - Remove sharp's deprecation warnings on image upload ([#12980](https://github.com/RocketChat/Rocket.Chat/pull/12980))
+
 - Use web.browser.legacy bundle for Livechat script ([#12975](https://github.com/RocketChat/Rocket.Chat/pull/12975))
+
 - Revert Jitsi external API to an asset ([#12954](https://github.com/RocketChat/Rocket.Chat/pull/12954))
+
 - Exception in getSingleMessage ([#12970](https://github.com/RocketChat/Rocket.Chat/pull/12970) by [@tsukiRep](https://github.com/tsukiRep))
+
 - multiple rooms-changed ([#12940](https://github.com/RocketChat/Rocket.Chat/pull/12940))
+
 - Readable validation on the apps engine environment bridge ([#12994](https://github.com/RocketChat/Rocket.Chat/pull/12994))
+
 - Check for object falsehood before referencing properties in saveRoomSettings ([#12972](https://github.com/RocketChat/Rocket.Chat/pull/12972))
+
 - Spotlight being called while in background ([#12957](https://github.com/RocketChat/Rocket.Chat/pull/12957))
+
 - Padding for message box in embedded layout ([#12556](https://github.com/RocketChat/Rocket.Chat/pull/12556))
+
 - Crowd sync was being stopped when a user was not found ([#12930](https://github.com/RocketChat/Rocket.Chat/pull/12930) by [@piotrkochan](https://github.com/piotrkochan))
+
 - Some icons were missing ([#12913](https://github.com/RocketChat/Rocket.Chat/pull/12913))
+
 - User data download fails when a room has been deleted. ([#12829](https://github.com/RocketChat/Rocket.Chat/pull/12829) by [@Hudell](https://github.com/Hudell))
+
 - CAS Login not working with renamed users ([#12860](https://github.com/RocketChat/Rocket.Chat/pull/12860) by [@Hudell](https://github.com/Hudell))
+
 - Stream of my_message wasn't sending the room information ([#12914](https://github.com/RocketChat/Rocket.Chat/pull/12914))
+
 - cannot reset password ([#12903](https://github.com/RocketChat/Rocket.Chat/pull/12903) by [@Hudell](https://github.com/Hudell))
+
 - Version check update notification ([#12905](https://github.com/RocketChat/Rocket.Chat/pull/12905))
+
 - Data Import not working ([#12866](https://github.com/RocketChat/Rocket.Chat/pull/12866) by [@Hudell](https://github.com/Hudell))
+
 - Incorrect parameter name in Livechat stream ([#12851](https://github.com/RocketChat/Rocket.Chat/pull/12851))
+
 - Autotranslate icon on message action menu ([#12585](https://github.com/RocketChat/Rocket.Chat/pull/12585))
+
 - Google Cloud Storage storage provider ([#12843](https://github.com/RocketChat/Rocket.Chat/pull/12843))
+
 - Download files without extension wasn't possible ([#13033](https://github.com/RocketChat/Rocket.Chat/pull/13033))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - LingoHub based on develop ([#13014](https://github.com/RocketChat/Rocket.Chat/pull/13014))
+
 - Move isFirefox and isChrome functions to rocketchat-utils ([#13011](https://github.com/RocketChat/Rocket.Chat/pull/13011))
+
 - Move tapi18n t and isRtl functions from ui to utils ([#13005](https://github.com/RocketChat/Rocket.Chat/pull/13005))
+
 - Remove /* globals */ wave 4 ([#12999](https://github.com/RocketChat/Rocket.Chat/pull/12999))
+
 - Remove /* globals */ wave 3 ([#12997](https://github.com/RocketChat/Rocket.Chat/pull/12997))
+
 - Convert rocketchat-logger to main module structure and remove Logger from eslintrc ([#12995](https://github.com/RocketChat/Rocket.Chat/pull/12995))
+
 - Remove /* globals */ wave 2 ([#12988](https://github.com/RocketChat/Rocket.Chat/pull/12988))
+
 - Remove /* globals */ from files wave-1 ([#12984](https://github.com/RocketChat/Rocket.Chat/pull/12984))
+
 - Move globals of test to a specific eslintrc file ([#12959](https://github.com/RocketChat/Rocket.Chat/pull/12959))
+
 - Remove global ServiceConfiguration ([#12960](https://github.com/RocketChat/Rocket.Chat/pull/12960))
+
 - Remove global toastr ([#12961](https://github.com/RocketChat/Rocket.Chat/pull/12961))
+
 - Convert rocketchat-livechat to main module structure ([#12942](https://github.com/RocketChat/Rocket.Chat/pull/12942))
+
 - changed maxRoomsOpen ([#12949](https://github.com/RocketChat/Rocket.Chat/pull/12949))
+
 - Revert imports of css, reAdd them to the addFiles function ([#12934](https://github.com/RocketChat/Rocket.Chat/pull/12934))
+
 - Convert rocketchat-theme to main module structure ([#12896](https://github.com/RocketChat/Rocket.Chat/pull/12896))
+
 - Convert rocketchat-katex to main module structure ([#12895](https://github.com/RocketChat/Rocket.Chat/pull/12895))
+
 - Convert rocketchat-webdav to main module structure ([#12886](https://github.com/RocketChat/Rocket.Chat/pull/12886))
+
 - Convert rocketchat-ui-message to main module structure ([#12871](https://github.com/RocketChat/Rocket.Chat/pull/12871))
+
 - Convert rocketchat-videobridge to main module structure ([#12881](https://github.com/RocketChat/Rocket.Chat/pull/12881))
+
 -  Convert rocketchat-reactions to main module structure ([#12888](https://github.com/RocketChat/Rocket.Chat/pull/12888))
+
 - Convert rocketchat-wordpress to main module structure ([#12887](https://github.com/RocketChat/Rocket.Chat/pull/12887))
+
 - Fix: snap push from ci ([#12883](https://github.com/RocketChat/Rocket.Chat/pull/12883))
+
 - Convert rocketchat-version-check to main module structure ([#12879](https://github.com/RocketChat/Rocket.Chat/pull/12879))
+
 - Convert rocketchat-user-data-dowload to main module structure ([#12877](https://github.com/RocketChat/Rocket.Chat/pull/12877))
+
 - Convert rocketchat-ui-vrecord to main module structure ([#12875](https://github.com/RocketChat/Rocket.Chat/pull/12875))
+
 - Convert rocketchat-ui-login to main module structure ([#12861](https://github.com/RocketChat/Rocket.Chat/pull/12861))
+
 -  Convert rocketchat-ui-flextab to main module structure ([#12859](https://github.com/RocketChat/Rocket.Chat/pull/12859))
+
 - German translation typo fix for Reacted_with ([#12761](https://github.com/RocketChat/Rocket.Chat/pull/12761) by [@localguru](https://github.com/localguru))
+
 -  Convert rocketchat-ui-account to main module structure ([#12842](https://github.com/RocketChat/Rocket.Chat/pull/12842))
+
 - Convert rocketchat-ui-clean-history to main module structure ([#12846](https://github.com/RocketChat/Rocket.Chat/pull/12846))
+
 - Convert rocketchat-ui-admin to main module structure ([#12844](https://github.com/RocketChat/Rocket.Chat/pull/12844))
+
 - Convert rocketchat-tokenpass to main module structure ([#12838](https://github.com/RocketChat/Rocket.Chat/pull/12838))
+
 - Remove rocketchat-tutum package ([#12840](https://github.com/RocketChat/Rocket.Chat/pull/12840))
+
 - Convert rocketchat-tooltip to main module structure ([#12839](https://github.com/RocketChat/Rocket.Chat/pull/12839))
+
 - Convert rocketchat-token-login to main module structure ([#12837](https://github.com/RocketChat/Rocket.Chat/pull/12837))
+
 - Convert rocketchat-statistics to main module structure ([#12833](https://github.com/RocketChat/Rocket.Chat/pull/12833))
+
 - Convert rocketchat-spotify to main module structure ([#12832](https://github.com/RocketChat/Rocket.Chat/pull/12832))
+
 - Convert rocketchat-sms to main module structure ([#12831](https://github.com/RocketChat/Rocket.Chat/pull/12831))
+
 - Convert rocketchat-search to main module structure ([#12801](https://github.com/RocketChat/Rocket.Chat/pull/12801))
+
 - Convert rocketchat-message-pin to main module structure ([#12767](https://github.com/RocketChat/Rocket.Chat/pull/12767))
+
 - Convert rocketchat-message-star to main module structure ([#12770](https://github.com/RocketChat/Rocket.Chat/pull/12770))
+
 - Convert rocketchat-slashcommands-msg to main module structure ([#12823](https://github.com/RocketChat/Rocket.Chat/pull/12823))
+
 - Convert rocketchat-smarsh-connector to main module structure ([#12830](https://github.com/RocketChat/Rocket.Chat/pull/12830))
+
 - Convert rocketchat-slider to main module structure ([#12828](https://github.com/RocketChat/Rocket.Chat/pull/12828))
+
 - Convert rocketchat-slashcommands-unarchiveroom to main module structure ([#12827](https://github.com/RocketChat/Rocket.Chat/pull/12827))
+
 - Dependencies update ([#12624](https://github.com/RocketChat/Rocket.Chat/pull/12624))
+
 - Convert rocketchat-slashcommands-topic to main module structure ([#12826](https://github.com/RocketChat/Rocket.Chat/pull/12826))
+
 - Convert rocketchat-slashcommands-open to main module structure ([#12825](https://github.com/RocketChat/Rocket.Chat/pull/12825))
+
 - Convert rocketchat-slashcommands-mute to main module structure ([#12824](https://github.com/RocketChat/Rocket.Chat/pull/12824))
+
 - Convert rocketchat-slashcommands-me to main module structure ([#12822](https://github.com/RocketChat/Rocket.Chat/pull/12822))
+
 - Convert rocketchat-slashcommands-leave to main module structure ([#12821](https://github.com/RocketChat/Rocket.Chat/pull/12821))
+
 - Convert rocketchat-slashcommands-kick to main module structure ([#12817](https://github.com/RocketChat/Rocket.Chat/pull/12817))
+
 - Convert rocketchat-slashcommands-join to main module structure ([#12816](https://github.com/RocketChat/Rocket.Chat/pull/12816))
+
 - Convert rocketchat-slashcommands-inviteall to main module structure ([#12815](https://github.com/RocketChat/Rocket.Chat/pull/12815))
+
 - Convert rocketchat-slashcommands-invite to main module structure ([#12814](https://github.com/RocketChat/Rocket.Chat/pull/12814))
+
 - Convert rocketchat-slashcommands-hide to main module structure ([#12813](https://github.com/RocketChat/Rocket.Chat/pull/12813))
+
 - Convert rocketchat-slashcommands-help to main module structure ([#12812](https://github.com/RocketChat/Rocket.Chat/pull/12812))
+
 - Convert rocketchat-slashcommands-create to main module structure ([#12811](https://github.com/RocketChat/Rocket.Chat/pull/12811))
+
 - Convert rocketchat-slashcomands-archiveroom to main module structure ([#12810](https://github.com/RocketChat/Rocket.Chat/pull/12810))
+
 - Convert rocketchat-slashcommands-asciiarts to main module structure ([#12808](https://github.com/RocketChat/Rocket.Chat/pull/12808))
+
 - Convert rocketchat-slackbridge to main module structure ([#12807](https://github.com/RocketChat/Rocket.Chat/pull/12807))
+
 - Convert rocketchat-setup-wizard to main module structure ([#12806](https://github.com/RocketChat/Rocket.Chat/pull/12806))
+
 - Convert rocketchat-sandstorm to main module structure ([#12799](https://github.com/RocketChat/Rocket.Chat/pull/12799))
+
 - Convert rocketchat-oauth2-server-config to main module structure ([#12773](https://github.com/RocketChat/Rocket.Chat/pull/12773))
+
 - Convert rocketchat-message-snippet to main module structure ([#12768](https://github.com/RocketChat/Rocket.Chat/pull/12768))
+
 - Fix CI deploy job ([#12803](https://github.com/RocketChat/Rocket.Chat/pull/12803))
+
 - Convert rocketchat-retention-policy to main module structure ([#12797](https://github.com/RocketChat/Rocket.Chat/pull/12797))
+
 - Convert rocketchat-push-notifications to main module structure ([#12778](https://github.com/RocketChat/Rocket.Chat/pull/12778))
+
 - Convert rocketchat-otr to main module structure ([#12777](https://github.com/RocketChat/Rocket.Chat/pull/12777))
+
 - Convert rocketchat-oembed to main module structure ([#12775](https://github.com/RocketChat/Rocket.Chat/pull/12775))
+
 - Convert rocketchat-migrations to main-module structure ([#12772](https://github.com/RocketChat/Rocket.Chat/pull/12772))
+
 - Convert rocketchat-message-mark-as-unread to main module structure ([#12766](https://github.com/RocketChat/Rocket.Chat/pull/12766))
+
 - Remove conventional changelog cli, we are using our own cli now (Houston) ([#12798](https://github.com/RocketChat/Rocket.Chat/pull/12798))
+
 - Convert rocketchat-message-attachments to main module structure ([#12760](https://github.com/RocketChat/Rocket.Chat/pull/12760))
+
 - Convert rocketchat-message-action to main module structure ([#12759](https://github.com/RocketChat/Rocket.Chat/pull/12759))
+
 -  Convert rocketchat-mentions-flextab to main module structure ([#12757](https://github.com/RocketChat/Rocket.Chat/pull/12757))
+
 - Convert rocketchat-mentions to main module structure ([#12756](https://github.com/RocketChat/Rocket.Chat/pull/12756))
+
 - Convert rocketchat-markdown to main module structure ([#12755](https://github.com/RocketChat/Rocket.Chat/pull/12755))
+
 - Convert rocketchat-mapview to main module structure ([#12701](https://github.com/RocketChat/Rocket.Chat/pull/12701))
+
 - Add check to make sure releases was updated ([#12791](https://github.com/RocketChat/Rocket.Chat/pull/12791))
+
 - Merge master into develop & Set version to 0.73.0-develop ([#12776](https://github.com/RocketChat/Rocket.Chat/pull/12776))
+
 - Change `chat.getDeletedMessages` to get messages after informed date and return only message's _id ([#13021](https://github.com/RocketChat/Rocket.Chat/pull/13021))
+
 - Improve Importer code quality ([#13020](https://github.com/RocketChat/Rocket.Chat/pull/13020) by [@Hudell](https://github.com/Hudell))
+
 - Regression: List of custom emojis wasn't working ([#13031](https://github.com/RocketChat/Rocket.Chat/pull/13031))
 
 </details>
@@ -2979,6 +4399,7 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.72.3 ([#12932](https://github.com/RocketChat/Rocket.Chat/pull/12932) by [@Hudell](https://github.com/Hudell) & [@piotrkochan](https://github.com/piotrkochan))
 
 </details>
@@ -2999,12 +4420,15 @@
 
 ### 🐛 Bug fixes
 
+
 - line-height for unread bar buttons (jump to first and mark as read) ([#12900](https://github.com/RocketChat/Rocket.Chat/pull/12900))
+
 - PDF view loading indicator ([#12882](https://github.com/RocketChat/Rocket.Chat/pull/12882))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.72.2 ([#12901](https://github.com/RocketChat/Rocket.Chat/pull/12901))
 
 </details>
@@ -3019,16 +4443,23 @@
 
 ### 🐛 Bug fixes
 
+
 - Change spread operator to Array.from for Edge browser ([#12818](https://github.com/RocketChat/Rocket.Chat/pull/12818) by [@ohmonster](https://github.com/ohmonster))
+
 - API users.info returns caller rooms and not requested user ones ([#12727](https://github.com/RocketChat/Rocket.Chat/pull/12727) by [@piotrkochan](https://github.com/piotrkochan))
+
 - Missing HipChat Enterprise Importer ([#12847](https://github.com/RocketChat/Rocket.Chat/pull/12847) by [@Hudell](https://github.com/Hudell))
+
 - Emoji as avatar ([#12805](https://github.com/RocketChat/Rocket.Chat/pull/12805))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.72.1 ([#12850](https://github.com/RocketChat/Rocket.Chat/pull/12850) by [@Hudell](https://github.com/Hudell) & [@ohmonster](https://github.com/ohmonster) & [@piotrkochan](https://github.com/piotrkochan))
+
 - Bump Apps-Engine version ([#12848](https://github.com/RocketChat/Rocket.Chat/pull/12848))
+
 - Change file order in rocketchat-cors ([#12804](https://github.com/RocketChat/Rocket.Chat/pull/12804))
 
 </details>
@@ -3052,143 +4483,268 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Support for Cordova (Rocket.Chat Legacy app) has reached End-of-life, support has been discontinued
+
 - Update to Meteor to 1.8 ([#12468](https://github.com/RocketChat/Rocket.Chat/pull/12468))
 
 ### 🎉 New features
 
+
 - Add permission to enable personal access token to specific roles ([#12309](https://github.com/RocketChat/Rocket.Chat/pull/12309))
+
 - Option to reset e2e key ([#12483](https://github.com/RocketChat/Rocket.Chat/pull/12483) by [@Hudell](https://github.com/Hudell))
+
 - /api/v1/spotlight: return joinCodeRequired field for rooms ([#12651](https://github.com/RocketChat/Rocket.Chat/pull/12651) by [@cardoso](https://github.com/cardoso))
+
 - New API Endpoints for the new version of JS SDK ([#12623](https://github.com/RocketChat/Rocket.Chat/pull/12623))
+
 - Setting to configure robots.txt content ([#12547](https://github.com/RocketChat/Rocket.Chat/pull/12547) by [@Hudell](https://github.com/Hudell))
+
 - Make Livechat's widget draggable ([#12378](https://github.com/RocketChat/Rocket.Chat/pull/12378))
 
 ### 🚀 Improvements
 
+
 - Improve unreads and unreadsFrom response, prevent it to be equal null ([#12563](https://github.com/RocketChat/Rocket.Chat/pull/12563))
+
 - Add rooms property in user object, if the user has the permission, with rooms roles ([#12105](https://github.com/RocketChat/Rocket.Chat/pull/12105))
+
 - border-radius to use --border-radius ([#12675](https://github.com/RocketChat/Rocket.Chat/pull/12675))
+
 - Update the 'keyboard shortcuts' documentation ([#12564](https://github.com/RocketChat/Rocket.Chat/pull/12564) by [@nicolasbock](https://github.com/nicolasbock))
+
 - Add new acceptable header for Livechat REST requests ([#12561](https://github.com/RocketChat/Rocket.Chat/pull/12561))
+
 - Atlassian Crowd settings and option to sync user data ([#12616](https://github.com/RocketChat/Rocket.Chat/pull/12616))
+
 - CircleCI to use MongoDB 4.0 for testing ([#12618](https://github.com/RocketChat/Rocket.Chat/pull/12618))
+
 - Japanese translations ([#12382](https://github.com/RocketChat/Rocket.Chat/pull/12382) by [@ura14h](https://github.com/ura14h))
+
 - Add CTRL modifier for keyboard shortcut ([#12525](https://github.com/RocketChat/Rocket.Chat/pull/12525) by [@nicolasbock](https://github.com/nicolasbock))
+
 - Ignore non-existent Livechat custom fields on Livechat API ([#12522](https://github.com/RocketChat/Rocket.Chat/pull/12522))
+
 - Emoji search on messageBox behaving like emojiPicker's search (#9607) ([#12452](https://github.com/RocketChat/Rocket.Chat/pull/12452) by [@vinade](https://github.com/vinade))
+
 - German translations ([#12471](https://github.com/RocketChat/Rocket.Chat/pull/12471) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Limit the number of typing users shown (#8722) ([#12400](https://github.com/RocketChat/Rocket.Chat/pull/12400) by [@vinade](https://github.com/vinade))
+
 - Allow apps to update persistence by association ([#12714](https://github.com/RocketChat/Rocket.Chat/pull/12714))
+
 - Add more methods to deal with rooms via Rocket.Chat.Apps ([#12680](https://github.com/RocketChat/Rocket.Chat/pull/12680))
+
 - Better query for finding subscriptions that need a new E2E Key ([#12692](https://github.com/RocketChat/Rocket.Chat/pull/12692) by [@Hudell](https://github.com/Hudell))
 
 ### 🐛 Bug fixes
 
+
 - Fixed Anonymous Registration ([#12633](https://github.com/RocketChat/Rocket.Chat/pull/12633) by [@wreiske](https://github.com/wreiske))
+
 - high cpu usage ~ svg icon ([#12677](https://github.com/RocketChat/Rocket.Chat/pull/12677) by [@ph1p](https://github.com/ph1p))
+
 - Fix favico error ([#12643](https://github.com/RocketChat/Rocket.Chat/pull/12643))
+
 - Condition to not render PDF preview ([#12632](https://github.com/RocketChat/Rocket.Chat/pull/12632))
+
 - Admin styles ([#12614](https://github.com/RocketChat/Rocket.Chat/pull/12614))
+
 - Admin styles ([#12602](https://github.com/RocketChat/Rocket.Chat/pull/12602))
+
 - Change registration message when user need to confirm email ([#9336](https://github.com/RocketChat/Rocket.Chat/pull/9336) by [@karlprieb](https://github.com/karlprieb))
+
 - Import missed file in rocketchat-authorization ([#12570](https://github.com/RocketChat/Rocket.Chat/pull/12570))
+
 - Prevent subscriptions and calls to rooms events that the user is not participating ([#12558](https://github.com/RocketChat/Rocket.Chat/pull/12558))
+
 - Wrong test case for `users.setAvatar` endpoint ([#12539](https://github.com/RocketChat/Rocket.Chat/pull/12539))
+
 - Spotlight method being called multiple times ([#12536](https://github.com/RocketChat/Rocket.Chat/pull/12536))
+
 - German translation for for API_EmbedIgnoredHosts label ([#12518](https://github.com/RocketChat/Rocket.Chat/pull/12518) by [@mbrodala](https://github.com/mbrodala))
+
 - Handle all events for enter key in message box ([#12507](https://github.com/RocketChat/Rocket.Chat/pull/12507))
+
 - Fix wrong parameter in chat.delete endpoint and add some test cases ([#12408](https://github.com/RocketChat/Rocket.Chat/pull/12408))
+
 - Manage own integrations permissions check ([#12397](https://github.com/RocketChat/Rocket.Chat/pull/12397))
+
 - stream room-changed ([#12411](https://github.com/RocketChat/Rocket.Chat/pull/12411))
+
 - Emoji picker is not in viewport on small screens ([#12457](https://github.com/RocketChat/Rocket.Chat/pull/12457) by [@ramrami](https://github.com/ramrami))
+
 - `Disabled` word translation to Spanish ([#12406](https://github.com/RocketChat/Rocket.Chat/pull/12406) by [@Ismaw34](https://github.com/Ismaw34))
+
 - `Disabled` word translation to Chinese ([#12260](https://github.com/RocketChat/Rocket.Chat/pull/12260) by [@AndreamApp](https://github.com/AndreamApp))
+
 - Correct roomName value in Mail Messages (#12363) ([#12453](https://github.com/RocketChat/Rocket.Chat/pull/12453) by [@vinade](https://github.com/vinade))
+
 - Update caret position on insert a new line in message box ([#12713](https://github.com/RocketChat/Rocket.Chat/pull/12713))
+
 - DE translation for idle-time-limit ([#12637](https://github.com/RocketChat/Rocket.Chat/pull/12637) by [@pfuender](https://github.com/pfuender))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - LingoHub based on develop ([#12684](https://github.com/RocketChat/Rocket.Chat/pull/12684))
+
 - Convert rocketchat-mail-messages to main module structure ([#12682](https://github.com/RocketChat/Rocket.Chat/pull/12682))
+
 -  Convert rocketchat-livestream to main module structure ([#12679](https://github.com/RocketChat/Rocket.Chat/pull/12679))
+
 - Added "npm install" to quick start for developers ([#12374](https://github.com/RocketChat/Rocket.Chat/pull/12374) by [@wreiske](https://github.com/wreiske))
+
 - Convert rocketchat-ldap to main module structure ([#12678](https://github.com/RocketChat/Rocket.Chat/pull/12678))
+
 - Convert rocketchat-issuelinks to main module structure ([#12674](https://github.com/RocketChat/Rocket.Chat/pull/12674))
+
 - Convert rocketchat-integrations to main module structure ([#12670](https://github.com/RocketChat/Rocket.Chat/pull/12670))
+
 - Convert rocketchat-irc to main module structure ([#12672](https://github.com/RocketChat/Rocket.Chat/pull/12672))
+
 - Convert rocketchat-internal-hubot to main module structure ([#12671](https://github.com/RocketChat/Rocket.Chat/pull/12671))
+
 - Convert rocketchat-importer-hipchat-enterprise to main module structure ([#12665](https://github.com/RocketChat/Rocket.Chat/pull/12665))
+
 - Convert rocketchat-importer-slack-users to main module structure ([#12669](https://github.com/RocketChat/Rocket.Chat/pull/12669))
+
 -  Convert rocketchat-importer-slack to main module structure ([#12666](https://github.com/RocketChat/Rocket.Chat/pull/12666))
+
 - Convert rocketchat-iframe-login to main module structure ([#12661](https://github.com/RocketChat/Rocket.Chat/pull/12661))
+
 - Convert rocketchat-importer to main module structure ([#12662](https://github.com/RocketChat/Rocket.Chat/pull/12662))
+
 - Convert rocketchat-importer-csv to main module structure ([#12663](https://github.com/RocketChat/Rocket.Chat/pull/12663))
+
 - Convert rocketchat-importer-hipchat to main module structure ([#12664](https://github.com/RocketChat/Rocket.Chat/pull/12664))
+
 - Convert rocketchat-highlight-words to main module structure ([#12659](https://github.com/RocketChat/Rocket.Chat/pull/12659))
+
 - Convert rocketchat-grant to main module structure ([#12657](https://github.com/RocketChat/Rocket.Chat/pull/12657))
+
 - Convert rocketchat-graphql to main module structure ([#12658](https://github.com/RocketChat/Rocket.Chat/pull/12658))
+
 - Convert rocketchat-google-vision to main module structure ([#12649](https://github.com/RocketChat/Rocket.Chat/pull/12649))
+
 - Removed RocketChatFile from globals ([#12650](https://github.com/RocketChat/Rocket.Chat/pull/12650))
+
 - Added imports for global variables in rocketchat-google-natural-language package ([#12647](https://github.com/RocketChat/Rocket.Chat/pull/12647))
+
 - Convert rocketchat-gitlab to main module structure ([#12646](https://github.com/RocketChat/Rocket.Chat/pull/12646))
+
 - Convert rocketchat-file to main module structure ([#12644](https://github.com/RocketChat/Rocket.Chat/pull/12644))
+
 - Convert rocketchat-github-enterprise to main module structure ([#12642](https://github.com/RocketChat/Rocket.Chat/pull/12642))
+
 - Fix: Add email dependency in package.js ([#12645](https://github.com/RocketChat/Rocket.Chat/pull/12645))
+
 - Convert rocketchat-custom-sounds to main module structure ([#12599](https://github.com/RocketChat/Rocket.Chat/pull/12599))
+
 - Fix crowd error with import of SyncedCron ([#12641](https://github.com/RocketChat/Rocket.Chat/pull/12641))
+
 - Convert emoji-emojione to main module structure ([#12605](https://github.com/RocketChat/Rocket.Chat/pull/12605))
+
 - Convert rocketchat-favico to main module structure ([#12607](https://github.com/RocketChat/Rocket.Chat/pull/12607))
+
 -  Convert rocketchat-emoji-custom to main module structure ([#12604](https://github.com/RocketChat/Rocket.Chat/pull/12604))
+
 - Convert rocketchat-error-handler to main module structure ([#12606](https://github.com/RocketChat/Rocket.Chat/pull/12606))
+
 - Convert rocketchat-drupal to main module structure ([#12601](https://github.com/RocketChat/Rocket.Chat/pull/12601))
+
 - Convert rocketchat-crowd to main module structure ([#12596](https://github.com/RocketChat/Rocket.Chat/pull/12596))
+
 - Convert rocketchat-emoji to main module structure ([#12603](https://github.com/RocketChat/Rocket.Chat/pull/12603))
+
 - Fix users.setAvatar endpoint tests and logic ([#12625](https://github.com/RocketChat/Rocket.Chat/pull/12625))
+
 - [DOCS] Remove Cordova links, include F-Droid download button and few other adjustments ([#12583](https://github.com/RocketChat/Rocket.Chat/pull/12583) by [@rafaelks](https://github.com/rafaelks))
+
 - Convert rocketchat-dolphin to main module structure ([#12600](https://github.com/RocketChat/Rocket.Chat/pull/12600))
+
 -  Convert rocketchat-channel-settings to main module structure ([#12594](https://github.com/RocketChat/Rocket.Chat/pull/12594))
+
 - Convert rocketchat-cors to main module structure ([#12595](https://github.com/RocketChat/Rocket.Chat/pull/12595))
+
 - Convert rocketchat-autotranslate to main module structure ([#12530](https://github.com/RocketChat/Rocket.Chat/pull/12530))
+
 - Convert rocketchat-channel-settings-mail-messages to main module structure ([#12537](https://github.com/RocketChat/Rocket.Chat/pull/12537))
+
 - Convert rocketchat-colors to main module structure ([#12538](https://github.com/RocketChat/Rocket.Chat/pull/12538))
+
 - Convert rocketchat-cas to main module structure ([#12532](https://github.com/RocketChat/Rocket.Chat/pull/12532))
+
 - Convert rocketchat-bot-helpers to main module structure ([#12531](https://github.com/RocketChat/Rocket.Chat/pull/12531))
+
 - Convert rocketchat-autolinker to main module structure ([#12529](https://github.com/RocketChat/Rocket.Chat/pull/12529))
+
 - Convert rocketchat-authorization to main module structure ([#12523](https://github.com/RocketChat/Rocket.Chat/pull/12523))
+
 - Fix CSS import order ([#12524](https://github.com/RocketChat/Rocket.Chat/pull/12524))
+
 - Remove template for feature requests as issues ([#12426](https://github.com/RocketChat/Rocket.Chat/pull/12426))
+
 - Fix punctuation, spelling, and grammar ([#12451](https://github.com/RocketChat/Rocket.Chat/pull/12451) by [@imronras](https://github.com/imronras))
+
 - Convert rocketchat-assets to main module structure ([#12521](https://github.com/RocketChat/Rocket.Chat/pull/12521))
+
 - Convert rocketchat-api to main module structure ([#12510](https://github.com/RocketChat/Rocket.Chat/pull/12510))
+
 - Convert rocketchat-analytics to main module structure ([#12506](https://github.com/RocketChat/Rocket.Chat/pull/12506))
+
 - Convert rocketchat-action-links to main module structure ([#12503](https://github.com/RocketChat/Rocket.Chat/pull/12503))
+
 - Convert rocketchat-2fa to main module structure ([#12501](https://github.com/RocketChat/Rocket.Chat/pull/12501))
+
 - Convert meteor-timesync to main module structure ([#12495](https://github.com/RocketChat/Rocket.Chat/pull/12495))
+
 - Convert meteor-autocomplete package to main module structure ([#12491](https://github.com/RocketChat/Rocket.Chat/pull/12491))
+
 - Convert meteor-accounts-saml to main module structure ([#12486](https://github.com/RocketChat/Rocket.Chat/pull/12486))
+
 - Convert chatpal search package to modular structure ([#12485](https://github.com/RocketChat/Rocket.Chat/pull/12485))
+
 - Removal of TAPi18n and TAPi18next global variables ([#12467](https://github.com/RocketChat/Rocket.Chat/pull/12467))
+
 - Removal of Template, Blaze, BlazeLayout, FlowRouter, DDPRateLimiter, Session, UAParser, Promise, Reload and CryptoJS global variables ([#12433](https://github.com/RocketChat/Rocket.Chat/pull/12433))
+
 - Removal of Match, check, moment, Tracker and Mongo global variables ([#12410](https://github.com/RocketChat/Rocket.Chat/pull/12410))
+
 - Removal of EJSON, Accounts, Email, HTTP, Random, ReactiveDict, ReactiveVar, SHA256 and WebApp global variables ([#12377](https://github.com/RocketChat/Rocket.Chat/pull/12377))
+
 - Removal of Meteor global variable ([#12371](https://github.com/RocketChat/Rocket.Chat/pull/12371))
+
 - Fix ES translation ([#12509](https://github.com/RocketChat/Rocket.Chat/pull/12509))
+
 - LingoHub based on develop ([#12470](https://github.com/RocketChat/Rocket.Chat/pull/12470))
+
 - Update npm dependencies ([#12465](https://github.com/RocketChat/Rocket.Chat/pull/12465))
+
 - Fix: Developers not being able to debug root files in VSCode ([#12440](https://github.com/RocketChat/Rocket.Chat/pull/12440) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Merge master into develop & Set version to 0.72.0-develop ([#12460](https://github.com/RocketChat/Rocket.Chat/pull/12460) by [@Hudell](https://github.com/Hudell))
+
 - Fix some Ukrainian translations ([#12712](https://github.com/RocketChat/Rocket.Chat/pull/12712) by [@zdumitru](https://github.com/zdumitru))
+
 - Improve: Add missing translation keys. ([#12708](https://github.com/RocketChat/Rocket.Chat/pull/12708) by [@ura14h](https://github.com/ura14h))
+
 - Bump Apps Engine to 1.3.0 ([#12705](https://github.com/RocketChat/Rocket.Chat/pull/12705))
+
 - Fix: Exception when registering a user with gravatar ([#12699](https://github.com/RocketChat/Rocket.Chat/pull/12699))
+
 - Fix: Fix tests by increasing window size ([#12707](https://github.com/RocketChat/Rocket.Chat/pull/12707))
+
 - Update Apps Engine to 1.3.1 ([#12741](https://github.com/RocketChat/Rocket.Chat/pull/12741))
+
 - Regression: Expand Administration sections by toggling section title ([#12736](https://github.com/RocketChat/Rocket.Chat/pull/12736))
+
 - Regression: Fix Safari detection in PDF previewing ([#12737](https://github.com/RocketChat/Rocket.Chat/pull/12737))
+
 - Regression: Account pages layout ([#12735](https://github.com/RocketChat/Rocket.Chat/pull/12735))
+
 - Regression: Inherit font-family for message box ([#12729](https://github.com/RocketChat/Rocket.Chat/pull/12729))
 
 </details>
@@ -3240,11 +4796,13 @@
 
 ### 🐛 Bug fixes
 
+
 - Email sending with GDPR user data ([#12487](https://github.com/RocketChat/Rocket.Chat/pull/12487))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.71.1 ([#12499](https://github.com/RocketChat/Rocket.Chat/pull/12499))
 
 </details>
@@ -3262,59 +4820,100 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Update `lastMessage` rooms property and convert the "starred" property, to the same format ([#12266](https://github.com/RocketChat/Rocket.Chat/pull/12266))
+
 - Add expiration to API login tokens and fix duplicate login tokens created by LDAP ([#12186](https://github.com/RocketChat/Rocket.Chat/pull/12186))
 
 ### 🎉 New features
 
+
 - Add delete channel mutation to GraphQL API ([#11860](https://github.com/RocketChat/Rocket.Chat/pull/11860))
+
 - sidenav size on large screens ([#12372](https://github.com/RocketChat/Rocket.Chat/pull/12372))
+
 - Ability to disable user presence monitor ([#12353](https://github.com/RocketChat/Rocket.Chat/pull/12353))
+
 - PDF message attachment preview (client side rendering) ([#10519](https://github.com/RocketChat/Rocket.Chat/pull/10519) by [@kb0304](https://github.com/kb0304))
+
 - Add "help wanted" section to Readme ([#12432](https://github.com/RocketChat/Rocket.Chat/pull/12432) by [@isabellarussell](https://github.com/isabellarussell))
 
 ### 🚀 Improvements
 
+
 - Livechat room closure endpoints ([#12360](https://github.com/RocketChat/Rocket.Chat/pull/12360))
+
 - Set Livechat department before register guest ([#12161](https://github.com/RocketChat/Rocket.Chat/pull/12161))
+
 - Add missing livechat i18n keys ([#12330](https://github.com/RocketChat/Rocket.Chat/pull/12330) by [@MarcosEllys](https://github.com/MarcosEllys))
+
 - Avoid unnecessary calls to Meteor.user() on client ([#11212](https://github.com/RocketChat/Rocket.Chat/pull/11212))
+
 - Allow the imports to accept any file type ([#12425](https://github.com/RocketChat/Rocket.Chat/pull/12425))
 
 ### 🐛 Bug fixes
 
+
 - Add image dimensions to attachment even when no reorientation is required ([#11521](https://github.com/RocketChat/Rocket.Chat/pull/11521))
+
 - iframe login token not checked ([#12158](https://github.com/RocketChat/Rocket.Chat/pull/12158) by [@nimetu](https://github.com/nimetu))
+
 - REST `users.setAvatar` endpoint wasn't allowing update the avatar of other users even with correct permissions ([#11431](https://github.com/RocketChat/Rocket.Chat/pull/11431))
+
 - Slack importer: image previews not showing ([#11875](https://github.com/RocketChat/Rocket.Chat/pull/11875) by [@Hudell](https://github.com/Hudell) & [@madguy02](https://github.com/madguy02))
+
 - Edit room name with uppercase letters ([#12235](https://github.com/RocketChat/Rocket.Chat/pull/12235) by [@nikeee](https://github.com/nikeee))
+
 - Custom OAuth Configuration can't be removed ([#12256](https://github.com/RocketChat/Rocket.Chat/pull/12256) by [@Hudell](https://github.com/Hudell))
+
 - Remove e2e from users endpoint responses ([#12344](https://github.com/RocketChat/Rocket.Chat/pull/12344))
+
 - email api TAPi18n is undefined ([#12373](https://github.com/RocketChat/Rocket.Chat/pull/12373))
+
 - Blockstack errors in IE 11 ([#12338](https://github.com/RocketChat/Rocket.Chat/pull/12338))
+
 - avatar?_dc=undefined ([#12365](https://github.com/RocketChat/Rocket.Chat/pull/12365))
+
 - users.register endpoint to not create an user if username already being used ([#12297](https://github.com/RocketChat/Rocket.Chat/pull/12297))
+
 - Date range check on livechat analytics ([#12345](https://github.com/RocketChat/Rocket.Chat/pull/12345) by [@teresy](https://github.com/teresy))
+
 - Cast env var setting to int based on option type ([#12194](https://github.com/RocketChat/Rocket.Chat/pull/12194) by [@crazy-max](https://github.com/crazy-max))
+
 - Links in home layout ([#12355](https://github.com/RocketChat/Rocket.Chat/pull/12355) by [@upiksaleh](https://github.com/upiksaleh))
+
 - Last message not updating after message delete if show deleted status is on ([#12350](https://github.com/RocketChat/Rocket.Chat/pull/12350))
+
 - Invalid destructuring on Livechat API endpoint ([#12354](https://github.com/RocketChat/Rocket.Chat/pull/12354))
+
 - E2E: Decrypting UTF-8 encoded messages ([#12398](https://github.com/RocketChat/Rocket.Chat/pull/12398) by [@pmmaga](https://github.com/pmmaga))
+
 - Ignore errors when creating image preview for uploads ([#12424](https://github.com/RocketChat/Rocket.Chat/pull/12424))
+
 - Attachment actions not being collapsable ([#12436](https://github.com/RocketChat/Rocket.Chat/pull/12436))
+
 - Attachment timestamp from and to Apps system not working ([#12445](https://github.com/RocketChat/Rocket.Chat/pull/12445))
+
 - Apps not being able to state how the action buttons are aligned ([#12391](https://github.com/RocketChat/Rocket.Chat/pull/12391))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Fix: wrong saveUser permission validations ([#12384](https://github.com/RocketChat/Rocket.Chat/pull/12384))
+
 - Regression: do not render pdf preview on safari <= 12 ([#12375](https://github.com/RocketChat/Rocket.Chat/pull/12375))
+
 - Improve: Drop database between running tests on CI ([#12358](https://github.com/RocketChat/Rocket.Chat/pull/12358))
+
 - Fix: update check on err.details ([#12346](https://github.com/RocketChat/Rocket.Chat/pull/12346) by [@teresy](https://github.com/teresy))
+
 - Update Apps Framework to version 1.2.1 ([#12442](https://github.com/RocketChat/Rocket.Chat/pull/12442))
+
 - Regression: Change `starred` message property from object to array ([#12405](https://github.com/RocketChat/Rocket.Chat/pull/12405))
+
 - Apps: Room’s usernames was not working ([#12409](https://github.com/RocketChat/Rocket.Chat/pull/12409))
+
 - Regression: Fix email headers not being used ([#12392](https://github.com/RocketChat/Rocket.Chat/pull/12392))
 
 </details>
@@ -3354,6 +4953,7 @@
 
 ### 🐛 Bug fixes
 
+
 - Reset password email ([#12898](https://github.com/RocketChat/Rocket.Chat/pull/12898))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -3369,12 +4969,15 @@
 
 ### 🐛 Bug fixes
 
+
 - Modal confirm on enter ([#12283](https://github.com/RocketChat/Rocket.Chat/pull/12283))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.70.4 ([#12299](https://github.com/RocketChat/Rocket.Chat/pull/12299))
+
 - Fix: Add wizard opt-in fields ([#12298](https://github.com/RocketChat/Rocket.Chat/pull/12298))
 
 </details>
@@ -3392,12 +4995,15 @@
 
 ### 🐛 Bug fixes
 
+
 - E2E alert shows up when encryption is disabled ([#12272](https://github.com/RocketChat/Rocket.Chat/pull/12272) by [@Hudell](https://github.com/Hudell))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.70.3 ([#12281](https://github.com/RocketChat/Rocket.Chat/pull/12281))
+
 - Release 0.70.2 ([#12276](https://github.com/RocketChat/Rocket.Chat/pull/12276) by [@Hudell](https://github.com/Hudell))
 
 </details>
@@ -3419,22 +5025,35 @@
 
 ### 🐛 Bug fixes
 
+
 - E2E data not cleared on logout ([#12254](https://github.com/RocketChat/Rocket.Chat/pull/12254) by [@Hudell](https://github.com/Hudell))
+
 - E2E password request not closing after entering password ([#12232](https://github.com/RocketChat/Rocket.Chat/pull/12232) by [@Hudell](https://github.com/Hudell))
+
 - Message editing was duplicating reply quotes ([#12263](https://github.com/RocketChat/Rocket.Chat/pull/12263))
+
 - Livechat integration with RDStation ([#12257](https://github.com/RocketChat/Rocket.Chat/pull/12257))
+
 - Livechat triggers being registered twice after setting department via API ([#12255](https://github.com/RocketChat/Rocket.Chat/pull/12255) by [@edzluhan](https://github.com/edzluhan))
+
 - Livechat CRM integration running when disabled  ([#12242](https://github.com/RocketChat/Rocket.Chat/pull/12242))
+
 - Emails' logo and links ([#12241](https://github.com/RocketChat/Rocket.Chat/pull/12241))
+
 - Set default action for Setup Wizard form submit ([#12240](https://github.com/RocketChat/Rocket.Chat/pull/12240))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.70.1 ([#12270](https://github.com/RocketChat/Rocket.Chat/pull/12270) by [@Hudell](https://github.com/Hudell) & [@edzluhan](https://github.com/edzluhan))
+
 - Merge master into develop & Set version to 0.71.0-develop ([#12264](https://github.com/RocketChat/Rocket.Chat/pull/12264) by [@cardoso](https://github.com/cardoso) & [@kaiiiiiiiii](https://github.com/kaiiiiiiiii) & [@timkinnane](https://github.com/timkinnane))
+
 - Regression: fix modal submit ([#12233](https://github.com/RocketChat/Rocket.Chat/pull/12233))
+
 - Add reetp to the issues' bot whitelist ([#12227](https://github.com/RocketChat/Rocket.Chat/pull/12227))
+
 - Fix: Remove semver satisfies from Apps details that is already done my marketplace ([#12268](https://github.com/RocketChat/Rocket.Chat/pull/12268))
 
 </details>
@@ -3465,93 +5084,168 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Update the default port of the Prometheus exporter ([#11351](https://github.com/RocketChat/Rocket.Chat/pull/11351) by [@thaiphv](https://github.com/thaiphv))
+
 - [IMPROVE] New emails design ([#12009](https://github.com/RocketChat/Rocket.Chat/pull/12009))
 
 ### 🎉 New features
 
+
 - Allow multiple subcommands in MIGRATION_VERSION env variable ([#11184](https://github.com/RocketChat/Rocket.Chat/pull/11184) by [@arch119](https://github.com/arch119))
+
 - Support for end to end encryption ([#10094](https://github.com/RocketChat/Rocket.Chat/pull/10094) by [@mrinaldhar](https://github.com/mrinaldhar))
+
 - Livechat Analytics and Reports ([#11238](https://github.com/RocketChat/Rocket.Chat/pull/11238) by [@pkgodara](https://github.com/pkgodara))
+
 - Apps: Add handlers for message updates ([#11993](https://github.com/RocketChat/Rocket.Chat/pull/11993) by [@cardoso](https://github.com/cardoso))
+
 - Livechat notifications on new incoming inquiries for guest-pool ([#10588](https://github.com/RocketChat/Rocket.Chat/pull/10588) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Customizable default directory view ([#11965](https://github.com/RocketChat/Rocket.Chat/pull/11965) by [@ohmonster](https://github.com/ohmonster))
+
 - Blockstack as decentralized auth provider ([#12047](https://github.com/RocketChat/Rocket.Chat/pull/12047) by [@timkinnane](https://github.com/timkinnane))
+
 - Livechat REST endpoints ([#11900](https://github.com/RocketChat/Rocket.Chat/pull/11900))
+
 - REST endpoints to get moderators from groups and channels ([#11909](https://github.com/RocketChat/Rocket.Chat/pull/11909))
+
 - User preference for 24- or 12-hour clock ([#11169](https://github.com/RocketChat/Rocket.Chat/pull/11169) by [@vynmera](https://github.com/vynmera))
+
 - REST endpoint to set groups' announcement ([#11905](https://github.com/RocketChat/Rocket.Chat/pull/11905))
+
 - Livechat trigger option to run only once ([#12068](https://github.com/RocketChat/Rocket.Chat/pull/12068) by [@edzluhan](https://github.com/edzluhan))
+
 - REST endpoints to create roles and assign roles to users ([#11855](https://github.com/RocketChat/Rocket.Chat/pull/11855) by [@aferreira44](https://github.com/aferreira44))
+
 - Informal German translations ([#9984](https://github.com/RocketChat/Rocket.Chat/pull/9984) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Apps: API provider ([#11938](https://github.com/RocketChat/Rocket.Chat/pull/11938))
+
 - Apps are enabled by default now ([#12189](https://github.com/RocketChat/Rocket.Chat/pull/12189))
+
 - Add Livechat Analytics permission ([#12184](https://github.com/RocketChat/Rocket.Chat/pull/12184))
+
 - WebDAV Integration (User file provider) ([#11679](https://github.com/RocketChat/Rocket.Chat/pull/11679) by [@karakayasemi](https://github.com/karakayasemi))
 
 ### 🚀 Improvements
 
+
 - Cache livechat get agent trigger call ([#12083](https://github.com/RocketChat/Rocket.Chat/pull/12083))
+
 - BigBlueButton joinViaHtml5 and video icon on sidebar ([#12107](https://github.com/RocketChat/Rocket.Chat/pull/12107))
+
 - Use eslint-config package ([#12044](https://github.com/RocketChat/Rocket.Chat/pull/12044))
 
 ### 🐛 Bug fixes
 
+
 - Livechat agent joining on pick from guest pool ([#12097](https://github.com/RocketChat/Rocket.Chat/pull/12097) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Apps: Add missing reactions and actions properties to app message object ([#11780](https://github.com/RocketChat/Rocket.Chat/pull/11780))
+
 - Broken slack compatible webhook ([#11742](https://github.com/RocketChat/Rocket.Chat/pull/11742))
+
 - Changing Mentions.userMentionRegex pattern to include <br> tag ([#12043](https://github.com/RocketChat/Rocket.Chat/pull/12043) by [@rssilva](https://github.com/rssilva))
+
 - Double output of message actions ([#11902](https://github.com/RocketChat/Rocket.Chat/pull/11902) by [@timkinnane](https://github.com/timkinnane))
+
 - Login error message not obvious if user not activated ([#11785](https://github.com/RocketChat/Rocket.Chat/pull/11785) by [@crazy-max](https://github.com/crazy-max))
+
 - Adding scroll bar to read receipts modal ([#11919](https://github.com/RocketChat/Rocket.Chat/pull/11919) by [@rssilva](https://github.com/rssilva))
+
 - Fixing translation on 'yesterday' word when calling timeAgo function ([#11946](https://github.com/RocketChat/Rocket.Chat/pull/11946) by [@rssilva](https://github.com/rssilva))
+
 - Fixing spacement between tags and words on some labels ([#12018](https://github.com/RocketChat/Rocket.Chat/pull/12018) by [@rssilva](https://github.com/rssilva))
+
 - video message recording, issue #11651 ([#12031](https://github.com/RocketChat/Rocket.Chat/pull/12031) by [@flaviogrossi](https://github.com/flaviogrossi))
+
 - Prevent form submission in Files List search ([#11999](https://github.com/RocketChat/Rocket.Chat/pull/11999))
+
 - Re-add the eye-off icon ([#12079](https://github.com/RocketChat/Rocket.Chat/pull/12079) by [@MIKI785](https://github.com/MIKI785))
+
 - Internal error when cross-origin with CORS is disabled ([#11953](https://github.com/RocketChat/Rocket.Chat/pull/11953))
+
 - Message reaction in GraphQL API ([#11967](https://github.com/RocketChat/Rocket.Chat/pull/11967))
+
 - Direct messages leaking into logs ([#11863](https://github.com/RocketChat/Rocket.Chat/pull/11863) by [@Hudell](https://github.com/Hudell))
+
 - Wrong build path in install.sh ([#11879](https://github.com/RocketChat/Rocket.Chat/pull/11879))
+
 - Permission check on joinRoom for private room ([#11857](https://github.com/RocketChat/Rocket.Chat/pull/11857) by [@timkinnane](https://github.com/timkinnane))
+
 - Close popover on shortcuts and writing ([#11562](https://github.com/RocketChat/Rocket.Chat/pull/11562))
+
 - Typo in a configuration key for SlackBridge excluded bot names ([#11872](https://github.com/RocketChat/Rocket.Chat/pull/11872) by [@TobiasKappe](https://github.com/TobiasKappe))
+
 - Real Name on Direct Messages  ([#12154](https://github.com/RocketChat/Rocket.Chat/pull/12154))
+
 - Position of popover component on mobile ([#12038](https://github.com/RocketChat/Rocket.Chat/pull/12038))
+
 - Duplicate email and auto-join on mentions ([#12168](https://github.com/RocketChat/Rocket.Chat/pull/12168))
+
 - Horizontal scroll on user info tab ([#12102](https://github.com/RocketChat/Rocket.Chat/pull/12102) by [@rssilva](https://github.com/rssilva))
+
 - Markdown ampersand escape on links ([#12140](https://github.com/RocketChat/Rocket.Chat/pull/12140) by [@rssilva](https://github.com/rssilva))
+
 - Saving user preferences ([#12170](https://github.com/RocketChat/Rocket.Chat/pull/12170))
+
 - Apps being able to see hidden settings ([#12159](https://github.com/RocketChat/Rocket.Chat/pull/12159))
+
 - Allow user with "bulk-register-user" permission to send invitations ([#12112](https://github.com/RocketChat/Rocket.Chat/pull/12112) by [@mrsimpson](https://github.com/mrsimpson))
+
 - IRC Federation no longer working ([#11906](https://github.com/RocketChat/Rocket.Chat/pull/11906) by [@Hudell](https://github.com/Hudell))
+
 - Files list missing from popover menu when owner of room ([#11565](https://github.com/RocketChat/Rocket.Chat/pull/11565))
+
 - Not able to set per-channel retention policies if no global policy is set for this channel type ([#11927](https://github.com/RocketChat/Rocket.Chat/pull/11927) by [@vynmera](https://github.com/vynmera))
+
 - app engine verbose log typo ([#12126](https://github.com/RocketChat/Rocket.Chat/pull/12126) by [@williamriancho](https://github.com/williamriancho))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.69.2 ([#12026](https://github.com/RocketChat/Rocket.Chat/pull/12026) by [@cardoso](https://github.com/cardoso) & [@kaiiiiiiiii](https://github.com/kaiiiiiiiii) & [@timkinnane](https://github.com/timkinnane))
+
 - LingoHub based on develop ([#11936](https://github.com/RocketChat/Rocket.Chat/pull/11936))
+
 - Better organize package.json ([#12115](https://github.com/RocketChat/Rocket.Chat/pull/12115))
+
 - Fix using wrong variable ([#12114](https://github.com/RocketChat/Rocket.Chat/pull/12114))
+
 - Fix the style lint ([#11991](https://github.com/RocketChat/Rocket.Chat/pull/11991))
+
 - Merge master into develop & Set version to 0.70.0-develop ([#11921](https://github.com/RocketChat/Rocket.Chat/pull/11921) by [@Hudell](https://github.com/Hudell) & [@c0dzilla](https://github.com/c0dzilla) & [@rndmh3ro](https://github.com/rndmh3ro) & [@ubarsaiyan](https://github.com/ubarsaiyan) & [@vynmera](https://github.com/vynmera))
+
 - Release 0.69.2 ([#12026](https://github.com/RocketChat/Rocket.Chat/pull/12026) by [@cardoso](https://github.com/cardoso) & [@kaiiiiiiiii](https://github.com/kaiiiiiiiii) & [@timkinnane](https://github.com/timkinnane))
+
 - Regression: fix message box autogrow ([#12138](https://github.com/RocketChat/Rocket.Chat/pull/12138))
+
 - Regression: Modal height ([#12122](https://github.com/RocketChat/Rocket.Chat/pull/12122))
+
 - Fix: Change wording on e2e to make a little more clear ([#12124](https://github.com/RocketChat/Rocket.Chat/pull/12124))
+
 - Improve: Moved the e2e password request to an alert instead of a popup ([#12172](https://github.com/RocketChat/Rocket.Chat/pull/12172) by [@Hudell](https://github.com/Hudell))
+
 - New: Option to change E2E key ([#12169](https://github.com/RocketChat/Rocket.Chat/pull/12169) by [@Hudell](https://github.com/Hudell))
+
 - Improve: Decrypt last message ([#12173](https://github.com/RocketChat/Rocket.Chat/pull/12173))
+
 - Fix: e2e password visible on always-on alert message. ([#12139](https://github.com/RocketChat/Rocket.Chat/pull/12139) by [@Hudell](https://github.com/Hudell))
+
 - Improve: Expose apps enable setting at `General > Apps` ([#12196](https://github.com/RocketChat/Rocket.Chat/pull/12196))
+
 - Fix: Message changing order when been edited with apps enabled ([#12188](https://github.com/RocketChat/Rocket.Chat/pull/12188))
+
 - Improve: E2E setting description and alert ([#12191](https://github.com/RocketChat/Rocket.Chat/pull/12191))
+
 - Improve: Do not start E2E Encryption when accessing admin as embedded ([#12192](https://github.com/RocketChat/Rocket.Chat/pull/12192))
+
 - Fix: Add e2e doc to the alert ([#12187](https://github.com/RocketChat/Rocket.Chat/pull/12187))
+
 - Improve: Switch e2e doc to target _blank ([#12195](https://github.com/RocketChat/Rocket.Chat/pull/12195))
+
 - Improve: Rename E2E methods ([#12175](https://github.com/RocketChat/Rocket.Chat/pull/12175) by [@Hudell](https://github.com/Hudell))
 
 </details>
@@ -3604,13 +5298,18 @@
 
 ### 🎉 New features
 
+
 - Include room name in stream for bots ([#11812](https://github.com/RocketChat/Rocket.Chat/pull/11812) by [@timkinnane](https://github.com/timkinnane))
 
 ### 🐛 Bug fixes
 
+
 - Reset password link error if already logged in ([#12022](https://github.com/RocketChat/Rocket.Chat/pull/12022))
+
 - Apps: setting with 'code' type only saving last line ([#11992](https://github.com/RocketChat/Rocket.Chat/pull/11992) by [@cardoso](https://github.com/cardoso))
+
 - Update user information not possible by admin if disabled to users ([#11955](https://github.com/RocketChat/Rocket.Chat/pull/11955) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
+
 - Hidden admin sidenav on embedded layout ([#12025](https://github.com/RocketChat/Rocket.Chat/pull/12025))
 
 ### 👩‍💻👨‍💻 Contributors 😍
@@ -3634,9 +5333,13 @@
 
 ### 🐛 Bug fixes
 
+
 - Hipchat import was failing when importing messages from a non existent user ([#11892](https://github.com/RocketChat/Rocket.Chat/pull/11892))
+
 - Hipchat importer was not importing users without emails and uploaded files ([#11910](https://github.com/RocketChat/Rocket.Chat/pull/11910))
+
 - App updates were not being shown correctly ([#11893](https://github.com/RocketChat/Rocket.Chat/pull/11893))
+
 - Duplicated message buttons ([#11853](https://github.com/RocketChat/Rocket.Chat/pull/11853) by [@ubarsaiyan](https://github.com/ubarsaiyan))
 
 ### 👩‍💻👨‍💻 Contributors 😍
@@ -3656,81 +5359,147 @@
 
 ### 🎉 New features
 
+
 - Beta support for Big Blue Button video conferencing system ([#11837](https://github.com/RocketChat/Rocket.Chat/pull/11837))
+
 - Slackbridge: send attachment notifications ([#10269](https://github.com/RocketChat/Rocket.Chat/pull/10269) by [@Hudell](https://github.com/Hudell) & [@kable-wilmoth](https://github.com/kable-wilmoth))
+
 - Personal access tokens for users to create API tokens ([#11638](https://github.com/RocketChat/Rocket.Chat/pull/11638))
+
 - REST endpoint to manage server assets ([#11697](https://github.com/RocketChat/Rocket.Chat/pull/11697))
+
 - Setting to enable/disable slack bridge reactions ([#10217](https://github.com/RocketChat/Rocket.Chat/pull/10217) by [@Hudell](https://github.com/Hudell) & [@kable-wilmoth](https://github.com/kable-wilmoth))
+
 - Rich message text and image buttons ([#11473](https://github.com/RocketChat/Rocket.Chat/pull/11473) by [@ubarsaiyan](https://github.com/ubarsaiyan))
+
 - Setting to block unauthenticated access to avatars ([#9749](https://github.com/RocketChat/Rocket.Chat/pull/9749) by [@Hudell](https://github.com/Hudell))
+
 - Setting to set a JS/CSS CDN ([#11779](https://github.com/RocketChat/Rocket.Chat/pull/11779))
+
 - Make font of unread items bolder for better contrast ([#8602](https://github.com/RocketChat/Rocket.Chat/pull/8602) by [@ausminternet](https://github.com/ausminternet))
+
 - Internal marketplace for apps ([#11864](https://github.com/RocketChat/Rocket.Chat/pull/11864) by [@gdelavald](https://github.com/gdelavald) & [@rssilva](https://github.com/rssilva))
 
 ### 🚀 Improvements
 
+
 - Start storing Livechat department within rooms ([#11733](https://github.com/RocketChat/Rocket.Chat/pull/11733))
+
 - Escape parameters before send them to email template ([#11644](https://github.com/RocketChat/Rocket.Chat/pull/11644))
+
 - Warn about push settings that need server restart ([#11784](https://github.com/RocketChat/Rocket.Chat/pull/11784))
+
 - Role tag UI ([#11674](https://github.com/RocketChat/Rocket.Chat/pull/11674) by [@timkinnane](https://github.com/timkinnane))
+
 - Messagebox fix performance ([#11686](https://github.com/RocketChat/Rocket.Chat/pull/11686))
+
 - Add template tag #{userdn} to filter LDAP group member format ([#11662](https://github.com/RocketChat/Rocket.Chat/pull/11662) by [@crazy-max](https://github.com/crazy-max))
+
 - Add nyan rocket on Rocket.Chat preview Docker image ([#11684](https://github.com/RocketChat/Rocket.Chat/pull/11684))
+
 - Reducing `saveUser` code complexity ([#11645](https://github.com/RocketChat/Rocket.Chat/pull/11645) by [@Hudell](https://github.com/Hudell))
 
 ### 🐛 Bug fixes
 
+
 - Delete removed user's subscriptions ([#10700](https://github.com/RocketChat/Rocket.Chat/pull/10700) by [@Hudell](https://github.com/Hudell))
+
 - LiveChat switch department not working ([#11011](https://github.com/RocketChat/Rocket.Chat/pull/11011))
+
 - Some assets were pointing to nonexistent path ([#11796](https://github.com/RocketChat/Rocket.Chat/pull/11796))
+
 - Revoked `view-d-room` permission logics ([#11522](https://github.com/RocketChat/Rocket.Chat/pull/11522) by [@Hudell](https://github.com/Hudell))
+
 - REST `im.members` endpoint not working without sort parameter ([#11821](https://github.com/RocketChat/Rocket.Chat/pull/11821))
+
 - Livechat rooms starting with two unread message counter ([#11834](https://github.com/RocketChat/Rocket.Chat/pull/11834))
+
 - Results pagination on /directory REST endpoint ([#11551](https://github.com/RocketChat/Rocket.Chat/pull/11551))
+
 - re-adding margin to menu icon on header ([#11778](https://github.com/RocketChat/Rocket.Chat/pull/11778) by [@rssilva](https://github.com/rssilva))
+
 - minor fixes in hungarian i18n  ([#11797](https://github.com/RocketChat/Rocket.Chat/pull/11797) by [@Atisom](https://github.com/Atisom))
+
 - permissions name no break ([#11836](https://github.com/RocketChat/Rocket.Chat/pull/11836))
+
 - Searching by `undefined` via REST when using `query` param ([#11657](https://github.com/RocketChat/Rocket.Chat/pull/11657))
+
 - Fix permalink of message when running system with subdir ([#11781](https://github.com/RocketChat/Rocket.Chat/pull/11781) by [@ura14h](https://github.com/ura14h))
+
 - Fix links in `onTableItemClick` of the directroy page ([#11543](https://github.com/RocketChat/Rocket.Chat/pull/11543) by [@ura14h](https://github.com/ura14h))
+
 - App's i18nAlert is only being displayed as "i18nAlert" ([#11802](https://github.com/RocketChat/Rocket.Chat/pull/11802))
+
 - Removed hardcoded values. ([#11627](https://github.com/RocketChat/Rocket.Chat/pull/11627) by [@Hudell](https://github.com/Hudell))
+
 - SAML is flooding logfile ([#11643](https://github.com/RocketChat/Rocket.Chat/pull/11643) by [@Hudell](https://github.com/Hudell))
+
 - directory search table not clickable lines ([#11809](https://github.com/RocketChat/Rocket.Chat/pull/11809))
+
 - REST endpoints to update user not respecting some settings ([#11474](https://github.com/RocketChat/Rocket.Chat/pull/11474))
+
 - Apply Cordova fix in lazy-loaded images sources ([#11807](https://github.com/RocketChat/Rocket.Chat/pull/11807))
+
 - Cannot set property 'input' of undefined ([#11775](https://github.com/RocketChat/Rocket.Chat/pull/11775))
+
 - Missing twitter:image and og:image tags ([#11687](https://github.com/RocketChat/Rocket.Chat/pull/11687))
+
 - Return room ID for groups where user joined ([#11703](https://github.com/RocketChat/Rocket.Chat/pull/11703) by [@timkinnane](https://github.com/timkinnane))
+
 - "User is typing" not working in new Livechat session ([#11670](https://github.com/RocketChat/Rocket.Chat/pull/11670))
+
 - wrong create date of channels and users on directory view ([#11682](https://github.com/RocketChat/Rocket.Chat/pull/11682) by [@gsperezb](https://github.com/gsperezb))
+
 - Escape meta data before inject in head tag ([#11730](https://github.com/RocketChat/Rocket.Chat/pull/11730))
+
 - minor fixes in i18n ([#11761](https://github.com/RocketChat/Rocket.Chat/pull/11761) by [@Atisom](https://github.com/Atisom))
+
 - Code tag duplicating characters ([#11467](https://github.com/RocketChat/Rocket.Chat/pull/11467) by [@vynmera](https://github.com/vynmera))
+
 - Custom sound uploader not working in Firefox and IE ([#11139](https://github.com/RocketChat/Rocket.Chat/pull/11139) by [@vynmera](https://github.com/vynmera))
+
 - Fixing timeAgo function on directory ([#11728](https://github.com/RocketChat/Rocket.Chat/pull/11728) by [@rssilva](https://github.com/rssilva))
+
 - Render Attachment Pretext When Markdown Specified ([#11578](https://github.com/RocketChat/Rocket.Chat/pull/11578) by [@glstewart17](https://github.com/glstewart17))
+
 - Message attachments was not respecting sort and lost spacing ([#11740](https://github.com/RocketChat/Rocket.Chat/pull/11740))
+
 - Closed connections being storing on db ([#11709](https://github.com/RocketChat/Rocket.Chat/pull/11709))
+
 - Login logo now centered on small screens ([#11626](https://github.com/RocketChat/Rocket.Chat/pull/11626) by [@wreiske](https://github.com/wreiske))
+
 - Push notifications stuck after db failure ([#11667](https://github.com/RocketChat/Rocket.Chat/pull/11667))
+
 - Translations were not unique per app allowing conflicts among apps ([#11878](https://github.com/RocketChat/Rocket.Chat/pull/11878))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.68.5 ([#11852](https://github.com/RocketChat/Rocket.Chat/pull/11852))
+
 - Release 0.68.5 ([#11852](https://github.com/RocketChat/Rocket.Chat/pull/11852))
+
 - Fixed deutsch message pruning translations ([#11691](https://github.com/RocketChat/Rocket.Chat/pull/11691) by [@TheReal1604](https://github.com/TheReal1604))
+
 - Fixed the Finnish translation and removed some profanities ([#11794](https://github.com/RocketChat/Rocket.Chat/pull/11794) by [@jukper](https://github.com/jukper))
+
 - LingoHub based on develop ([#11838](https://github.com/RocketChat/Rocket.Chat/pull/11838))
+
 - Regression: Fix livechat code issues after new lint rules ([#11814](https://github.com/RocketChat/Rocket.Chat/pull/11814))
+
 - Do not remove package-lock.json of livechat package ([#11816](https://github.com/RocketChat/Rocket.Chat/pull/11816))
+
 - Run eslint and unit tests on pre-push hook ([#11815](https://github.com/RocketChat/Rocket.Chat/pull/11815))
+
 - Additional eslint rules  ([#11804](https://github.com/RocketChat/Rocket.Chat/pull/11804))
+
 - Add new eslint rules (automatically fixed) ([#11800](https://github.com/RocketChat/Rocket.Chat/pull/11800))
+
 - Merge master into develop & Set version to 0.69.0-develop ([#11606](https://github.com/RocketChat/Rocket.Chat/pull/11606))
+
 - App engine merge ([#11835](https://github.com/RocketChat/Rocket.Chat/pull/11835))
+
 - Regression: role tag background, unread item font and message box autogrow ([#11861](https://github.com/RocketChat/Rocket.Chat/pull/11861))
 
 </details>
@@ -3775,6 +5544,7 @@
 
 ### 🐛 Bug fixes
 
+
 - Livechat open room method ([#11830](https://github.com/RocketChat/Rocket.Chat/pull/11830))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -3790,8 +5560,11 @@
 
 ### 🐛 Bug fixes
 
+
 - Default server language not being applied ([#11719](https://github.com/RocketChat/Rocket.Chat/pull/11719))
+
 - Broken logo on setup wizard ([#11708](https://github.com/RocketChat/Rocket.Chat/pull/11708))
+
 - Regression in prune by user, and update lastMessage ([#11646](https://github.com/RocketChat/Rocket.Chat/pull/11646) by [@vynmera](https://github.com/vynmera))
 
 ### 👩‍💻👨‍💻 Contributors 😍
@@ -3812,15 +5585,21 @@
 
 ### 🐛 Bug fixes
 
+
 - Missing chat history for users without permission `preview-c-room` ([#11639](https://github.com/RocketChat/Rocket.Chat/pull/11639) by [@Hudell](https://github.com/Hudell))
+
 - User info APIs not returning customFields correctly ([#11625](https://github.com/RocketChat/Rocket.Chat/pull/11625))
+
 - Prune translations in German ([#11631](https://github.com/RocketChat/Rocket.Chat/pull/11631) by [@rndmh3ro](https://github.com/rndmh3ro))
+
 - Prune translation on room info panel ([#11635](https://github.com/RocketChat/Rocket.Chat/pull/11635))
+
 - SAML login not working when user has multiple emails ([#11642](https://github.com/RocketChat/Rocket.Chat/pull/11642) by [@Hudell](https://github.com/Hudell))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.68.3 ([#11650](https://github.com/RocketChat/Rocket.Chat/pull/11650) by [@Hudell](https://github.com/Hudell) & [@rndmh3ro](https://github.com/rndmh3ro))
 
 </details>
@@ -3844,11 +5623,13 @@
 
 ### 🐛 Bug fixes
 
+
 - Incorrect migration version in v130.js ([#11544](https://github.com/RocketChat/Rocket.Chat/pull/11544) by [@c0dzilla](https://github.com/c0dzilla))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.68.2 ([#11630](https://github.com/RocketChat/Rocket.Chat/pull/11630) by [@c0dzilla](https://github.com/c0dzilla))
 
 </details>
@@ -3870,12 +5651,15 @@
 
 ### 🐛 Bug fixes
 
+
 - `Jump to message` search result action ([#11613](https://github.com/RocketChat/Rocket.Chat/pull/11613))
+
 - HipChat importer wasn’t compatible with latest exports ([#11597](https://github.com/RocketChat/Rocket.Chat/pull/11597))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.68.1 ([#11616](https://github.com/RocketChat/Rocket.Chat/pull/11616))
 
 </details>
@@ -3896,69 +5680,120 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Remove deprecated /user.roles endpoint ([#11493](https://github.com/RocketChat/Rocket.Chat/pull/11493))
+
 - Update GraphQL dependencies ([#11430](https://github.com/RocketChat/Rocket.Chat/pull/11430))
 
 ### 🎉 New features
 
+
 - Setting to disable 2FA globally ([#11328](https://github.com/RocketChat/Rocket.Chat/pull/11328) by [@Hudell](https://github.com/Hudell))
+
 - Add /users.deleteOwnAccount REST endpoint to an user delete his own account ([#11488](https://github.com/RocketChat/Rocket.Chat/pull/11488))
+
 - Add /roles.list REST endpoint to retrieve all server roles ([#11500](https://github.com/RocketChat/Rocket.Chat/pull/11500))
+
 - Message retention policy and pruning ([#11236](https://github.com/RocketChat/Rocket.Chat/pull/11236) by [@vynmera](https://github.com/vynmera))
+
 - Send user status to client ([#11303](https://github.com/RocketChat/Rocket.Chat/pull/11303) by [@HappyTobi](https://github.com/HappyTobi))
+
 - Room files search form ([#11486](https://github.com/RocketChat/Rocket.Chat/pull/11486))
+
 - search only default tone emoji Popup search ([#10017](https://github.com/RocketChat/Rocket.Chat/pull/10017) by [@Joe-mcgee](https://github.com/Joe-mcgee))
+
 - Privacy for custom user fields ([#11332](https://github.com/RocketChat/Rocket.Chat/pull/11332) by [@vynmera](https://github.com/vynmera))
+
 - Replaced old logo with the new ones ([#11491](https://github.com/RocketChat/Rocket.Chat/pull/11491))
+
 - Sorting channels by number of users in directory ([#9972](https://github.com/RocketChat/Rocket.Chat/pull/9972) by [@arungalva](https://github.com/arungalva))
+
 - Make WebRTC not enabled by default ([#11489](https://github.com/RocketChat/Rocket.Chat/pull/11489))
+
 - Accept resumeToken as query param to log in ([#11443](https://github.com/RocketChat/Rocket.Chat/pull/11443))
+
 - Livechat File Upload ([#10514](https://github.com/RocketChat/Rocket.Chat/pull/10514))
 
 ### 🚀 Improvements
 
+
 - Set default max upload size to 100mb ([#11327](https://github.com/RocketChat/Rocket.Chat/pull/11327) by [@cardoso](https://github.com/cardoso))
+
 - Typing indicators now use Real Names ([#11164](https://github.com/RocketChat/Rocket.Chat/pull/11164) by [@vynmera](https://github.com/vynmera))
+
 - Allow markdown in room topic, announcement, and description including single quotes ([#11408](https://github.com/RocketChat/Rocket.Chat/pull/11408))
 
 ### 🐛 Bug fixes
 
+
 - New favicons size too small ([#11524](https://github.com/RocketChat/Rocket.Chat/pull/11524))
+
 - Render reply preview with message as a common message ([#11534](https://github.com/RocketChat/Rocket.Chat/pull/11534))
+
 - Unreads counter for new rooms on /channels.counters REST endpoint ([#11531](https://github.com/RocketChat/Rocket.Chat/pull/11531))
+
 - Marked parser breaking announcements and mentions at the start of messages ([#11357](https://github.com/RocketChat/Rocket.Chat/pull/11357) by [@vynmera](https://github.com/vynmera))
+
 - Send Livechat back to Guest Pool ([#10731](https://github.com/RocketChat/Rocket.Chat/pull/10731))
+
 - Add customFields property to /me REST endpoint response ([#11496](https://github.com/RocketChat/Rocket.Chat/pull/11496))
+
 - Invalid permalink URLs for Direct Messages ([#11507](https://github.com/RocketChat/Rocket.Chat/pull/11507) by [@Hudell](https://github.com/Hudell))
+
 - Unlimited upload file size not working ([#11471](https://github.com/RocketChat/Rocket.Chat/pull/11471) by [@Hudell](https://github.com/Hudell))
+
 - Mixed case channel slugs ([#9449](https://github.com/RocketChat/Rocket.Chat/pull/9449) by [@soundstorm](https://github.com/soundstorm))
+
 - SAML issues ([#11135](https://github.com/RocketChat/Rocket.Chat/pull/11135) by [@Hudell](https://github.com/Hudell) & [@arminfelder](https://github.com/arminfelder))
+
 - Loading and setting fixes for i18n and RTL ([#11363](https://github.com/RocketChat/Rocket.Chat/pull/11363))
+
 - Check for channels property on message object before parsing mentions ([#11527](https://github.com/RocketChat/Rocket.Chat/pull/11527))
+
 - empty blockquote ([#11526](https://github.com/RocketChat/Rocket.Chat/pull/11526))
+
 - Snap font issue for sharp ([#11514](https://github.com/RocketChat/Rocket.Chat/pull/11514))
+
 - RocketChat.settings.get causing memory leak (sometimes) ([#11487](https://github.com/RocketChat/Rocket.Chat/pull/11487))
+
 - Refinements in message popup mentions ([#11441](https://github.com/RocketChat/Rocket.Chat/pull/11441))
+
 - Decrease room leader bar z-index ([#11450](https://github.com/RocketChat/Rocket.Chat/pull/11450))
+
 - Remove title attribute from sidebar items ([#11298](https://github.com/RocketChat/Rocket.Chat/pull/11298))
+
 - Only escape HTML from details in toast error messages ([#11459](https://github.com/RocketChat/Rocket.Chat/pull/11459))
+
 - broadcast channel reply ([#11462](https://github.com/RocketChat/Rocket.Chat/pull/11462))
+
 - Fixed svg for older chrome browsers bug #11414 ([#11416](https://github.com/RocketChat/Rocket.Chat/pull/11416) by [@tpDBL](https://github.com/tpDBL))
+
 - Wrap custom fields in user profile to new line ([#10119](https://github.com/RocketChat/Rocket.Chat/pull/10119) by [@PhpXp](https://github.com/PhpXp) & [@karlprieb](https://github.com/karlprieb))
+
 - Record popup ([#11349](https://github.com/RocketChat/Rocket.Chat/pull/11349))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Revert: Mixed case channel slugs #9449 ([#11537](https://github.com/RocketChat/Rocket.Chat/pull/11537))
+
 - Merge master into develop & Set version to 0.68.0-develop ([#11536](https://github.com/RocketChat/Rocket.Chat/pull/11536))
+
 - Regression: Add missing LiveChat permission to allow removing closed rooms ([#11423](https://github.com/RocketChat/Rocket.Chat/pull/11423))
+
 - Update release issue template to use Houston CLI ([#11499](https://github.com/RocketChat/Rocket.Chat/pull/11499))
+
 - Regression: Remove safe area margins from logos ([#11508](https://github.com/RocketChat/Rocket.Chat/pull/11508))
+
 - Regression: Update cachedCollection version ([#11561](https://github.com/RocketChat/Rocket.Chat/pull/11561))
+
 - Regression: nonReactive to nonreactive ([#11550](https://github.com/RocketChat/Rocket.Chat/pull/11550))
+
 - LingoHub based on develop ([#11587](https://github.com/RocketChat/Rocket.Chat/pull/11587))
+
 - Regression: Make message popup user mentions reactive again ([#11567](https://github.com/RocketChat/Rocket.Chat/pull/11567))
+
 - Regression: Fix purge message's translations ([#11590](https://github.com/RocketChat/Rocket.Chat/pull/11590))
 
 </details>
@@ -3999,32 +5834,46 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Remove cache layer and internal calculated property `room.usernames` ([#10749](https://github.com/RocketChat/Rocket.Chat/pull/10749))
 
 ### 🎉 New features
 
+
 - Additional Livechat iFrame API's ([#10918](https://github.com/RocketChat/Rocket.Chat/pull/10918))
 
 ### 🚀 Improvements
 
+
 - Stop sort callbacks on run ([#11330](https://github.com/RocketChat/Rocket.Chat/pull/11330))
 
 ### 🐛 Bug fixes
 
+
 - sort fname sidenav ([#11358](https://github.com/RocketChat/Rocket.Chat/pull/11358))
+
 - SVG icons code ([#11319](https://github.com/RocketChat/Rocket.Chat/pull/11319))
+
 - Message popup responsiveness in slash commands ([#11313](https://github.com/RocketChat/Rocket.Chat/pull/11313))
+
 - web app manifest errors as reported by Chrome DevTools ([#9991](https://github.com/RocketChat/Rocket.Chat/pull/9991) by [@justinribeiro](https://github.com/justinribeiro))
+
 - Message attachment's fields with different sizes ([#11342](https://github.com/RocketChat/Rocket.Chat/pull/11342))
+
 - Parse inline code without space before initial backtick ([#9754](https://github.com/RocketChat/Rocket.Chat/pull/9754) by [@c0dzilla](https://github.com/c0dzilla) & [@gdelavald](https://github.com/gdelavald))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Fix dependency issue in redhat image ([#11497](https://github.com/RocketChat/Rocket.Chat/pull/11497))
+
 - Merge master into develop & Set version to 0.67.0-develop ([#11417](https://github.com/RocketChat/Rocket.Chat/pull/11417))
+
 - Merge master into develop & Set version to 0.67.0-develop ([#11399](https://github.com/RocketChat/Rocket.Chat/pull/11399))
+
 - Merge master into develop & Set version to 0.67.0-develop ([#11348](https://github.com/RocketChat/Rocket.Chat/pull/11348) by [@Hudell](https://github.com/Hudell) & [@gdelavald](https://github.com/gdelavald))
+
 - Merge master into develop & Set version to 0.67.0-develop ([#11290](https://github.com/RocketChat/Rocket.Chat/pull/11290))
 
 </details>
@@ -4055,7 +5904,9 @@
 
 ### 🐛 Bug fixes
 
+
 - All messages notifications via email were sent as mention alert ([#11398](https://github.com/RocketChat/Rocket.Chat/pull/11398))
+
 - Livechat taking inquiry leading to 404 page ([#11406](https://github.com/RocketChat/Rocket.Chat/pull/11406))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -4072,13 +5923,17 @@
 
 ### 🐛 Bug fixes
 
+
 - Remove file snap store doesn't like ([#11365](https://github.com/RocketChat/Rocket.Chat/pull/11365))
+
 - Livechat not sending desktop notifications ([#11266](https://github.com/RocketChat/Rocket.Chat/pull/11266))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Send setting Allow_Marketing_Emails to statistics collector ([#11359](https://github.com/RocketChat/Rocket.Chat/pull/11359))
+
 - Regression: Fix migration 125 checking for settings field ([#11364](https://github.com/RocketChat/Rocket.Chat/pull/11364))
 
 </details>
@@ -4099,14 +5954,20 @@
 
 ### 🚀 Improvements
 
+
 - Setup Wizard username validation, step progress and optin/optout ([#11254](https://github.com/RocketChat/Rocket.Chat/pull/11254))
 
 ### 🐛 Bug fixes
 
+
 - Some updates were returning errors when based on queries with position operators ([#11335](https://github.com/RocketChat/Rocket.Chat/pull/11335))
+
 - SAML attributes with periods are not properly read. ([#11315](https://github.com/RocketChat/Rocket.Chat/pull/11315) by [@Hudell](https://github.com/Hudell))
+
 - Outgoing integrations were stopping the oplog tailing sometimes ([#11333](https://github.com/RocketChat/Rocket.Chat/pull/11333))
+
 - Livestream muted when audio only option was enabled ([#11267](https://github.com/RocketChat/Rocket.Chat/pull/11267) by [@gdelavald](https://github.com/gdelavald))
+
 - Notification preferences being lost when switching view mode ([#11295](https://github.com/RocketChat/Rocket.Chat/pull/11295))
 
 ### 👩‍💻👨‍💻 Contributors 😍
@@ -4130,147 +5991,276 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Always remove the field `services` from user data responses in REST API ([#10799](https://github.com/RocketChat/Rocket.Chat/pull/10799))
 
 ### 🎉 New features
 
+
 - Youtube Broadcasting ([#10127](https://github.com/RocketChat/Rocket.Chat/pull/10127) by [@gdelavald](https://github.com/gdelavald))
+
 - REST API endpoints `permissions.list` and `permissions.update`. Deprecated endpoint `permissions` ([#10975](https://github.com/RocketChat/Rocket.Chat/pull/10975) by [@vynmera](https://github.com/vynmera))
+
 - REST API endpoint `channels.setDefault` ([#10941](https://github.com/RocketChat/Rocket.Chat/pull/10941) by [@vynmera](https://github.com/vynmera))
+
 - Set Document Domain property in IFrame ([#9751](https://github.com/RocketChat/Rocket.Chat/pull/9751) by [@kb0304](https://github.com/kb0304))
+
 - Custom login wallpapers ([#11025](https://github.com/RocketChat/Rocket.Chat/pull/11025) by [@vynmera](https://github.com/vynmera))
+
 - Support for dynamic slack and rocket.chat channels ([#10205](https://github.com/RocketChat/Rocket.Chat/pull/10205) by [@Hudell](https://github.com/Hudell) & [@kable-wilmoth](https://github.com/kable-wilmoth))
+
 - Add prometheus port config ([#11115](https://github.com/RocketChat/Rocket.Chat/pull/11115) by [@brylie](https://github.com/brylie) & [@stuartpb](https://github.com/stuartpb) & [@thaiphv](https://github.com/thaiphv))
+
 - Button to remove closed LiveChat rooms ([#10301](https://github.com/RocketChat/Rocket.Chat/pull/10301))
+
 - Update katex to v0.9.0 ([#8402](https://github.com/RocketChat/Rocket.Chat/pull/8402) by [@pitamar](https://github.com/pitamar))
+
 - WebDAV(Nextcloud/ownCloud) Storage Server Option ([#11027](https://github.com/RocketChat/Rocket.Chat/pull/11027) by [@karakayasemi](https://github.com/karakayasemi))
+
 - Don't ask me again checkbox on hide room modal ([#10973](https://github.com/RocketChat/Rocket.Chat/pull/10973) by [@karlprieb](https://github.com/karlprieb))
+
 - Add input to set time for avatar cache control ([#10958](https://github.com/RocketChat/Rocket.Chat/pull/10958))
+
 - Command /hide to hide channels ([#10727](https://github.com/RocketChat/Rocket.Chat/pull/10727) by [@mikaelmello](https://github.com/mikaelmello))
+
 - Do not wait method calls response on websocket before next method call ([#11087](https://github.com/RocketChat/Rocket.Chat/pull/11087))
+
 - Disconnect users from websocket when away from the login screen for 10min ([#11086](https://github.com/RocketChat/Rocket.Chat/pull/11086))
+
 - Reduce the amount of DDP API calls on login screen ([#11083](https://github.com/RocketChat/Rocket.Chat/pull/11083))
+
 - Option to trace Methods and Subscription calls ([#11085](https://github.com/RocketChat/Rocket.Chat/pull/11085))
+
 - Replace variable 'mergeChannels' with 'groupByType'. ([#10954](https://github.com/RocketChat/Rocket.Chat/pull/10954) by [@mikaelmello](https://github.com/mikaelmello))
+
 - Send LiveChat visitor navigation history as messages ([#10091](https://github.com/RocketChat/Rocket.Chat/pull/10091))
+
 - Make supplying an AWS access key and secret optional for S3 uploads ([#10673](https://github.com/RocketChat/Rocket.Chat/pull/10673) by [@saplla](https://github.com/saplla))
+
 - Direct Reply: separate Reply-To email from account username field ([#10988](https://github.com/RocketChat/Rocket.Chat/pull/10988) by [@pkgodara](https://github.com/pkgodara))
+
 - Changes all 'mergeChannels' to 'groupByType'. ([#10055](https://github.com/RocketChat/Rocket.Chat/pull/10055) by [@mikaelmello](https://github.com/mikaelmello))
+
 - Update WeDeploy deployment ([#10841](https://github.com/RocketChat/Rocket.Chat/pull/10841) by [@jonnilundy](https://github.com/jonnilundy))
 
 ### 🚀 Improvements
 
+
 - Listing of apps in the admin page ([#11166](https://github.com/RocketChat/Rocket.Chat/pull/11166) by [@gdelavald](https://github.com/gdelavald) & [@karlprieb](https://github.com/karlprieb))
+
 - UI design for Tables and tabs component on Directory ([#11026](https://github.com/RocketChat/Rocket.Chat/pull/11026) by [@karlprieb](https://github.com/karlprieb))
+
 - User mentions ([#11001](https://github.com/RocketChat/Rocket.Chat/pull/11001) by [@vynmera](https://github.com/vynmera))
 
 ### 🐛 Bug fixes
 
+
 - Wordpress oauth configuration not loading properly ([#11187](https://github.com/RocketChat/Rocket.Chat/pull/11187) by [@Hudell](https://github.com/Hudell))
+
 - REST API: Add more test cases for `/login` ([#10999](https://github.com/RocketChat/Rocket.Chat/pull/10999))
+
 - Wrong font-family order ([#11191](https://github.com/RocketChat/Rocket.Chat/pull/11191) by [@Hudell](https://github.com/Hudell) & [@myfonj](https://github.com/myfonj))
+
 - REST endpoint `users.updateOwnBasicInfo` was not returning errors for invalid names and trying to save custom fields when empty ([#11204](https://github.com/RocketChat/Rocket.Chat/pull/11204))
+
 - Livechat visitor not being prompted for transcript when himself is closing the chat ([#10767](https://github.com/RocketChat/Rocket.Chat/pull/10767))
+
 - HipChat Cloud import fails to import rooms ([#11188](https://github.com/RocketChat/Rocket.Chat/pull/11188) by [@Hudell](https://github.com/Hudell))
+
 - Failure to download user data ([#11190](https://github.com/RocketChat/Rocket.Chat/pull/11190) by [@Hudell](https://github.com/Hudell))
+
 - Add parameter to REST chat.react endpoint, to make it work like a setter ([#10447](https://github.com/RocketChat/Rocket.Chat/pull/10447))
+
 - Default selected language ([#11150](https://github.com/RocketChat/Rocket.Chat/pull/11150))
+
 - Rendering of emails and mentions in messages ([#11165](https://github.com/RocketChat/Rocket.Chat/pull/11165))
+
 - Livechat icon with status ([#11177](https://github.com/RocketChat/Rocket.Chat/pull/11177))
+
 - remove sidebar on embedded view ([#11183](https://github.com/RocketChat/Rocket.Chat/pull/11183))
+
 - Missing language constants ([#11173](https://github.com/RocketChat/Rocket.Chat/pull/11173) by [@rw4lll](https://github.com/rw4lll))
+
 - Room creation error due absence of subscriptions ([#11178](https://github.com/RocketChat/Rocket.Chat/pull/11178))
+
 - Remove failed upload messages when switching rooms ([#11132](https://github.com/RocketChat/Rocket.Chat/pull/11132))
+
 - Wordpress OAuth not providing enough info to log in  ([#11152](https://github.com/RocketChat/Rocket.Chat/pull/11152) by [@Hudell](https://github.com/Hudell))
+
 - /groups.invite not allow a user to invite even with permission ([#11010](https://github.com/RocketChat/Rocket.Chat/pull/11010) by [@Hudell](https://github.com/Hudell))
+
 - Various lang fixes [RU] ([#10095](https://github.com/RocketChat/Rocket.Chat/pull/10095) by [@rw4lll](https://github.com/rw4lll))
+
 - set-toolbar-items postMessage ([#11109](https://github.com/RocketChat/Rocket.Chat/pull/11109))
+
 - title and value attachments are optionals on sendMessage method ([#11021](https://github.com/RocketChat/Rocket.Chat/pull/11021))
+
 - Some typos in the error message names ([#11136](https://github.com/RocketChat/Rocket.Chat/pull/11136) by [@vynmera](https://github.com/vynmera))
+
 - open conversation from room info ([#11050](https://github.com/RocketChat/Rocket.Chat/pull/11050))
+
 - Users model was not receiving options ([#11129](https://github.com/RocketChat/Rocket.Chat/pull/11129))
+
 - Popover position ([#11113](https://github.com/RocketChat/Rocket.Chat/pull/11113))
+
 - Generated random password visible to the user ([#11096](https://github.com/RocketChat/Rocket.Chat/pull/11096))
+
 - LiveChat appearance changes not being saved ([#11111](https://github.com/RocketChat/Rocket.Chat/pull/11111))
+
 - Confirm password on set new password user profile ([#11095](https://github.com/RocketChat/Rocket.Chat/pull/11095))
+
 - Message_AllowedMaxSize fails for emoji sequences ([#10431](https://github.com/RocketChat/Rocket.Chat/pull/10431) by [@c0dzilla](https://github.com/c0dzilla))
+
 - Can't access the `/account/profile` ([#11089](https://github.com/RocketChat/Rocket.Chat/pull/11089))
+
 - Idle time limit wasn’t working as expected ([#11084](https://github.com/RocketChat/Rocket.Chat/pull/11084))
+
 - Rooms list sorting by activity multiple re-renders and case sensitive sorting alphabetically ([#9959](https://github.com/RocketChat/Rocket.Chat/pull/9959) by [@JoseRenan](https://github.com/JoseRenan) & [@karlprieb](https://github.com/karlprieb))
+
 - Notification not working for group mentions and not respecting ignored users ([#11024](https://github.com/RocketChat/Rocket.Chat/pull/11024))
+
 - Overlapping of search text and cancel search icon (X) ([#10294](https://github.com/RocketChat/Rocket.Chat/pull/10294) by [@taeven](https://github.com/taeven))
+
 - Link previews not being removed from messages after removed on editing ([#11063](https://github.com/RocketChat/Rocket.Chat/pull/11063))
+
 - avoid send presence without login ([#11074](https://github.com/RocketChat/Rocket.Chat/pull/11074))
+
 - Exception in metrics generation ([#11072](https://github.com/RocketChat/Rocket.Chat/pull/11072))
+
 - Build for Sandstorm missing dependence for capnp ([#11056](https://github.com/RocketChat/Rocket.Chat/pull/11056) by [@peterlee0127](https://github.com/peterlee0127))
+
 - flex-tab icons missing ([#11049](https://github.com/RocketChat/Rocket.Chat/pull/11049))
+
 - Update ja.i18n.json ([#11020](https://github.com/RocketChat/Rocket.Chat/pull/11020) by [@Hudell](https://github.com/Hudell) & [@noobbbbb](https://github.com/noobbbbb))
+
 - Strange msg when setting room announcement, topic or description to be empty ([#11012](https://github.com/RocketChat/Rocket.Chat/pull/11012) by [@vynmera](https://github.com/vynmera))
+
 - Exception thrown on avatar validation ([#11009](https://github.com/RocketChat/Rocket.Chat/pull/11009) by [@Hudell](https://github.com/Hudell))
+
 - Preview of large images not resizing to fit the area and having scrollbars ([#10998](https://github.com/RocketChat/Rocket.Chat/pull/10998) by [@vynmera](https://github.com/vynmera))
+
 - Allow inviting livechat managers to the same LiveChat room ([#10956](https://github.com/RocketChat/Rocket.Chat/pull/10956))
+
 - Cannot read property 'debug' of undefined when trying to use REST API ([#10805](https://github.com/RocketChat/Rocket.Chat/pull/10805) by [@haffla](https://github.com/haffla))
+
 - Icons svg xml structure ([#10771](https://github.com/RocketChat/Rocket.Chat/pull/10771) by [@timkinnane](https://github.com/timkinnane))
+
 - Remove outdated 2FA warning for mobile clients ([#10916](https://github.com/RocketChat/Rocket.Chat/pull/10916) by [@cardoso](https://github.com/cardoso))
+
 - Update Sandstorm build config ([#10867](https://github.com/RocketChat/Rocket.Chat/pull/10867) by [@ocdtrekkie](https://github.com/ocdtrekkie))
+
 - "blank messages" on iOS < 11 ([#11221](https://github.com/RocketChat/Rocket.Chat/pull/11221))
+
 - "blank" screen on iOS < 11 ([#11199](https://github.com/RocketChat/Rocket.Chat/pull/11199))
+
 - The process was freezing in some cases when HTTP calls exceeds timeout on integrations ([#11253](https://github.com/RocketChat/Rocket.Chat/pull/11253))
+
 - LDAP was accepting login with empty passwords for certain AD configurations ([#11264](https://github.com/RocketChat/Rocket.Chat/pull/11264))
+
 - Update capnproto dependence for Sandstorm Build ([#11263](https://github.com/RocketChat/Rocket.Chat/pull/11263) by [@peterlee0127](https://github.com/peterlee0127))
+
 - Internal Server Error on first login with CAS integration ([#11257](https://github.com/RocketChat/Rocket.Chat/pull/11257) by [@Hudell](https://github.com/Hudell))
+
 - Armhf snap build ([#11268](https://github.com/RocketChat/Rocket.Chat/pull/11268))
+
 - Reaction Toggle was not working when omitting the last parameter from the API (DDP and REST) ([#11276](https://github.com/RocketChat/Rocket.Chat/pull/11276) by [@Hudell](https://github.com/Hudell))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Merge master into develop & Set version to 0.66.0-develop ([#11277](https://github.com/RocketChat/Rocket.Chat/pull/11277) by [@Hudell](https://github.com/Hudell) & [@brylie](https://github.com/brylie) & [@stuartpb](https://github.com/stuartpb))
+
 - Regression: Directory css ([#11206](https://github.com/RocketChat/Rocket.Chat/pull/11206) by [@karlprieb](https://github.com/karlprieb))
+
 - LingoHub based on develop ([#11208](https://github.com/RocketChat/Rocket.Chat/pull/11208))
+
 - IRC Federation: RFC2813 implementation (ngIRCd) ([#10113](https://github.com/RocketChat/Rocket.Chat/pull/10113) by [@Hudell](https://github.com/Hudell) & [@cpitman](https://github.com/cpitman) & [@lindoelio](https://github.com/lindoelio))
+
 - Add verification to make sure the user exists in REST  insert object helper ([#11008](https://github.com/RocketChat/Rocket.Chat/pull/11008))
+
 - Regression: Directory user table infinite scroll doesn't working ([#11200](https://github.com/RocketChat/Rocket.Chat/pull/11200) by [@karlprieb](https://github.com/karlprieb))
+
 - [FIX Readme] Nodejs + Python version spicifications ([#11181](https://github.com/RocketChat/Rocket.Chat/pull/11181) by [@mahdiyari](https://github.com/mahdiyari))
+
 - Regression: sorting direct message by asc on favorites group ([#11090](https://github.com/RocketChat/Rocket.Chat/pull/11090))
+
 - Fix PR Docker image creation by splitting in two build jobs ([#11107](https://github.com/RocketChat/Rocket.Chat/pull/11107))
+
 - Update v126.js ([#11103](https://github.com/RocketChat/Rocket.Chat/pull/11103))
+
 - Speed up the build time by removing JSON Minify from i18n package ([#11097](https://github.com/RocketChat/Rocket.Chat/pull/11097))
+
 - Fix Docker image for develop commits ([#11093](https://github.com/RocketChat/Rocket.Chat/pull/11093))
+
 - Build Docker image on CI ([#11076](https://github.com/RocketChat/Rocket.Chat/pull/11076))
+
 - Update issue templates ([#11070](https://github.com/RocketChat/Rocket.Chat/pull/11070))
+
 - LingoHub based on develop ([#11062](https://github.com/RocketChat/Rocket.Chat/pull/11062))
+
 - LingoHub based on develop ([#11054](https://github.com/RocketChat/Rocket.Chat/pull/11054))
+
 - LingoHub based on develop ([#11053](https://github.com/RocketChat/Rocket.Chat/pull/11053))
+
 - LingoHub based on develop ([#11051](https://github.com/RocketChat/Rocket.Chat/pull/11051))
+
 - LingoHub based on develop ([#11045](https://github.com/RocketChat/Rocket.Chat/pull/11045))
+
 - LingoHub based on develop ([#11044](https://github.com/RocketChat/Rocket.Chat/pull/11044))
+
 - LingoHub based on develop ([#11043](https://github.com/RocketChat/Rocket.Chat/pull/11043))
+
 - LingoHub based on develop ([#11042](https://github.com/RocketChat/Rocket.Chat/pull/11042))
+
 - Changed 'confirm password' placeholder text on user registration form ([#9969](https://github.com/RocketChat/Rocket.Chat/pull/9969) by [@kumarnitj](https://github.com/kumarnitj))
+
 - LingoHub based on develop ([#11039](https://github.com/RocketChat/Rocket.Chat/pull/11039))
+
 - LingoHub based on develop ([#11035](https://github.com/RocketChat/Rocket.Chat/pull/11035))
+
 - Update Documentation: README.md ([#10207](https://github.com/RocketChat/Rocket.Chat/pull/10207) by [@rakhi2104](https://github.com/rakhi2104))
+
 - NPM Dependencies Update ([#10913](https://github.com/RocketChat/Rocket.Chat/pull/10913))
+
 - update meteor to 1.6.1 for sandstorm build ([#10131](https://github.com/RocketChat/Rocket.Chat/pull/10131) by [@peterlee0127](https://github.com/peterlee0127))
+
 - Renaming username.username to username.value for clarity ([#10986](https://github.com/RocketChat/Rocket.Chat/pull/10986))
+
 - Fix readme typo ([#5](https://github.com/RocketChat/Rocket.Chat/pull/5) by [@filipealva](https://github.com/filipealva))
+
 - Remove wrong and not needed time unit ([#10807](https://github.com/RocketChat/Rocket.Chat/pull/10807) by [@cliffparnitzky](https://github.com/cliffparnitzky))
+
 - Develop sync commits ([#10909](https://github.com/RocketChat/Rocket.Chat/pull/10909) by [@nsuchy](https://github.com/nsuchy) & [@rafaelks](https://github.com/rafaelks))
+
 - Develop sync2 ([#10908](https://github.com/RocketChat/Rocket.Chat/pull/10908) by [@nsuchy](https://github.com/nsuchy) & [@rafaelks](https://github.com/rafaelks))
+
 - Merge master into develop & Set version to 0.66.0-develop ([#10903](https://github.com/RocketChat/Rocket.Chat/pull/10903) by [@nsuchy](https://github.com/nsuchy) & [@rafaelks](https://github.com/rafaelks))
+
 - Regression: Fix directory table loading ([#11223](https://github.com/RocketChat/Rocket.Chat/pull/11223) by [@karlprieb](https://github.com/karlprieb))
+
 - Regression: Fix latest and release-candidate docker images building ([#11215](https://github.com/RocketChat/Rocket.Chat/pull/11215))
+
 - Regression: check username or usersCount on browseChannels ([#11216](https://github.com/RocketChat/Rocket.Chat/pull/11216))
+
 - Regression: Sending message with a mention is not showing to sender ([#11211](https://github.com/RocketChat/Rocket.Chat/pull/11211))
+
 - Regression: Prometheus was not being enabled in some cases ([#11249](https://github.com/RocketChat/Rocket.Chat/pull/11249))
+
 - Regression: Skip operations if no actions on livechat migration ([#11232](https://github.com/RocketChat/Rocket.Chat/pull/11232))
+
 - Regression: Directory sort users, fix null results, text for empty results ([#11224](https://github.com/RocketChat/Rocket.Chat/pull/11224))
+
 - LingoHub based on develop ([#11246](https://github.com/RocketChat/Rocket.Chat/pull/11246))
+
 - Update Meteor to 1.6.1.3 ([#11247](https://github.com/RocketChat/Rocket.Chat/pull/11247))
+
 - New history source format & add Node and NPM versions ([#11237](https://github.com/RocketChat/Rocket.Chat/pull/11237))
+
 - Add Dockerfile with MongoDB ([#10971](https://github.com/RocketChat/Rocket.Chat/pull/10971))
+
 - Regression: sidebar sorting was being wrong in some cases where the rooms records were returned before the subscriptions ([#11273](https://github.com/RocketChat/Rocket.Chat/pull/11273))
+
 - Fix Docker image build on tags ([#11271](https://github.com/RocketChat/Rocket.Chat/pull/11271))
 
 </details>
@@ -4335,11 +6325,13 @@
 
 ### 🐛 Bug fixes
 
+
 - i18n - add semantic markup ([#9534](https://github.com/RocketChat/Rocket.Chat/pull/9534) by [@brylie](https://github.com/brylie))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.65.1 ([#10947](https://github.com/RocketChat/Rocket.Chat/pull/10947))
 
 </details>
@@ -4363,10 +6355,15 @@
 
 ### 🐛 Bug fixes
 
+
 - Livechat not loading ([#10940](https://github.com/RocketChat/Rocket.Chat/pull/10940))
+
 - Application crashing on startup when trying to log errors to `exceptions` channel ([#10934](https://github.com/RocketChat/Rocket.Chat/pull/10934))
+
 - Incomplete email notification link ([#10928](https://github.com/RocketChat/Rocket.Chat/pull/10928))
+
 - Image lazy load was breaking attachments ([#10904](https://github.com/RocketChat/Rocket.Chat/pull/10904))
+
 - Leave room wasn't working as expected ([#10851](https://github.com/RocketChat/Rocket.Chat/pull/10851))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -4384,56 +6381,100 @@
 
 ### 🎉 New features
 
+
 - Implement a local password policy ([#9857](https://github.com/RocketChat/Rocket.Chat/pull/9857))
+
 - Options to enable/disable each Livechat registration form field ([#10584](https://github.com/RocketChat/Rocket.Chat/pull/10584))
+
 - Return the result of the `/me` endpoint within the result of the `/login` endpoint ([#10677](https://github.com/RocketChat/Rocket.Chat/pull/10677))
+
 - Lazy load image attachments ([#10608](https://github.com/RocketChat/Rocket.Chat/pull/10608) by [@karlprieb](https://github.com/karlprieb))
+
 - View pinned message's attachment ([#10214](https://github.com/RocketChat/Rocket.Chat/pull/10214) by [@c0dzilla](https://github.com/c0dzilla) & [@karlprieb](https://github.com/karlprieb))
+
 - Add REST API endpoint `users.getUsernameSuggestion` to get username suggestion ([#10702](https://github.com/RocketChat/Rocket.Chat/pull/10702))
+
 - REST API endpoint `settings` now allow set colors and trigger actions ([#10488](https://github.com/RocketChat/Rocket.Chat/pull/10488) by [@ThomasRoehl](https://github.com/ThomasRoehl))
+
 - Add REST endpoint `subscriptions.unread` to mark messages as unread ([#10778](https://github.com/RocketChat/Rocket.Chat/pull/10778))
+
 - REST API endpoint `/me` now returns all the settings, including the default values ([#10662](https://github.com/RocketChat/Rocket.Chat/pull/10662))
+
 - Now is possible to access files using header authorization (`x-user-id` and `x-auth-token`) ([#10741](https://github.com/RocketChat/Rocket.Chat/pull/10741))
+
 - Add REST API endpoints `channels.counters`, `groups.counters and `im.counters` ([#9679](https://github.com/RocketChat/Rocket.Chat/pull/9679) by [@xbolshe](https://github.com/xbolshe))
+
 - Add REST API endpoints `channels.setCustomFields` and `groups.setCustomFields` ([#9733](https://github.com/RocketChat/Rocket.Chat/pull/9733) by [@xbolshe](https://github.com/xbolshe))
+
 - Add permission `view-broadcast-member-list` ([#10753](https://github.com/RocketChat/Rocket.Chat/pull/10753) by [@cardoso](https://github.com/cardoso))
 
 ### 🐛 Bug fixes
 
+
 - Livechat managers were not being able to send messages in some cases ([#10663](https://github.com/RocketChat/Rocket.Chat/pull/10663))
+
 - Livechat settings not appearing correctly ([#10612](https://github.com/RocketChat/Rocket.Chat/pull/10612))
+
 - Enabling `Collapse Embedded Media by Default` was hiding replies and quotes ([#10427](https://github.com/RocketChat/Rocket.Chat/pull/10427) by [@c0dzilla](https://github.com/c0dzilla))
+
 - Missing option to disable/enable System Messages ([#10704](https://github.com/RocketChat/Rocket.Chat/pull/10704))
+
 - Remove outdated translations of Internal Hubot's description of Scripts to Load that were pointing to a non existent address ([#10448](https://github.com/RocketChat/Rocket.Chat/pull/10448) by [@Hudell](https://github.com/Hudell))
+
 - UI was not disabling the actions when users has had no permissions to create channels or add users to rooms ([#10564](https://github.com/RocketChat/Rocket.Chat/pull/10564) by [@cfunkles](https://github.com/cfunkles) & [@chuckAtCataworx](https://github.com/chuckAtCataworx))
+
 - Private settings were not being cleared from client cache in some cases ([#10625](https://github.com/RocketChat/Rocket.Chat/pull/10625) by [@Hudell](https://github.com/Hudell))
+
 - Internal Error when requesting user data download ([#10837](https://github.com/RocketChat/Rocket.Chat/pull/10837) by [@Hudell](https://github.com/Hudell))
+
 - Broadcast channels were showing reply button for deleted messages and generating wrong reply links some times ([#10835](https://github.com/RocketChat/Rocket.Chat/pull/10835))
+
 - User's preference `Unread on Top` wasn't working for LiveChat rooms ([#10734](https://github.com/RocketChat/Rocket.Chat/pull/10734))
+
 - Cancel button wasn't working while uploading file ([#10715](https://github.com/RocketChat/Rocket.Chat/pull/10715) by [@Mr-Gryphon](https://github.com/Mr-Gryphon) & [@karlprieb](https://github.com/karlprieb))
+
 - Missing pagination fields in the response of REST /directory endpoint ([#10840](https://github.com/RocketChat/Rocket.Chat/pull/10840))
+
 - Layout badge cutting on unread messages for long names ([#10846](https://github.com/RocketChat/Rocket.Chat/pull/10846) by [@kos4live](https://github.com/kos4live))
+
 - Slack-Bridge bug when migrating to 0.64.1 ([#10875](https://github.com/RocketChat/Rocket.Chat/pull/10875))
+
 - Horizontally align items in preview message ([#10883](https://github.com/RocketChat/Rocket.Chat/pull/10883) by [@gdelavald](https://github.com/gdelavald))
+
 - The first users was not set as admin some times ([#10878](https://github.com/RocketChat/Rocket.Chat/pull/10878))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.65.0 ([#10893](https://github.com/RocketChat/Rocket.Chat/pull/10893) by [@Hudell](https://github.com/Hudell) & [@Sameesunkaria](https://github.com/Sameesunkaria) & [@cardoso](https://github.com/cardoso) & [@erhan-](https://github.com/erhan-) & [@gdelavald](https://github.com/gdelavald) & [@karlprieb](https://github.com/karlprieb) & [@peccu](https://github.com/peccu) & [@winterstefan](https://github.com/winterstefan))
+
 - Apps: Command Previews, Message and Room Removal Events ([#10822](https://github.com/RocketChat/Rocket.Chat/pull/10822))
+
 - Develop sync ([#10815](https://github.com/RocketChat/Rocket.Chat/pull/10815) by [@nsuchy](https://github.com/nsuchy) & [@rafaelks](https://github.com/rafaelks))
+
 - Major dependencies update ([#10661](https://github.com/RocketChat/Rocket.Chat/pull/10661))
+
 - Prevent setup wizard redirects ([#10811](https://github.com/RocketChat/Rocket.Chat/pull/10811))
+
 - Fix: Regression in REST API endpoint `/me`  ([#10833](https://github.com/RocketChat/Rocket.Chat/pull/10833))
+
 - Regression: Fix email notification preference not showing correct selected value ([#10847](https://github.com/RocketChat/Rocket.Chat/pull/10847))
+
 - Apps: Command previews are clickable & Apps Framework is controlled via a setting ([#10853](https://github.com/RocketChat/Rocket.Chat/pull/10853))
+
 - Regression: Make settings `Site_Name` and `Language` public again ([#10848](https://github.com/RocketChat/Rocket.Chat/pull/10848))
+
 - Fix: Clarify the wording of the release issue template ([#10520](https://github.com/RocketChat/Rocket.Chat/pull/10520))
+
 - Fix: Regression on users avatar in admin pages ([#10836](https://github.com/RocketChat/Rocket.Chat/pull/10836))
+
 - Fix: Manage apps layout was a bit confuse ([#10882](https://github.com/RocketChat/Rocket.Chat/pull/10882) by [@gdelavald](https://github.com/gdelavald))
+
 - LingoHub based on develop ([#10886](https://github.com/RocketChat/Rocket.Chat/pull/10886))
+
 - Fix: Regression Lazyload fix shuffle avatars ([#10887](https://github.com/RocketChat/Rocket.Chat/pull/10887))
+
 - Fix: typo on error message for push token API ([#10857](https://github.com/RocketChat/Rocket.Chat/pull/10857) by [@rafaelks](https://github.com/rafaelks))
 
 </details>
@@ -4478,67 +6519,122 @@
 
 ### 🎉 New features
 
+
 - Add REST endpoints `channels.roles` & `groups.roles` ([#10607](https://github.com/RocketChat/Rocket.Chat/pull/10607) by [@cardoso](https://github.com/cardoso) & [@rafaelks](https://github.com/rafaelks))
+
 - Add more options for Wordpress OAuth configuration ([#10724](https://github.com/RocketChat/Rocket.Chat/pull/10724) by [@Hudell](https://github.com/Hudell))
+
 - Setup Wizard ([#10523](https://github.com/RocketChat/Rocket.Chat/pull/10523) by [@karlprieb](https://github.com/karlprieb))
+
 - Improvements to notifications logic ([#10686](https://github.com/RocketChat/Rocket.Chat/pull/10686))
+
 - Add REST endpoints `channels.roles` & `groups.roles` ([#10607](https://github.com/RocketChat/Rocket.Chat/pull/10607) by [@cardoso](https://github.com/cardoso) & [@rafaelks](https://github.com/rafaelks))
+
 - Add more options for Wordpress OAuth configuration ([#10724](https://github.com/RocketChat/Rocket.Chat/pull/10724) by [@Hudell](https://github.com/Hudell))
+
 - Setup Wizard ([#10523](https://github.com/RocketChat/Rocket.Chat/pull/10523) by [@karlprieb](https://github.com/karlprieb))
+
 - Improvements to notifications logic ([#10686](https://github.com/RocketChat/Rocket.Chat/pull/10686))
 
 ### 🐛 Bug fixes
 
+
 - Not escaping special chars on mentions ([#10793](https://github.com/RocketChat/Rocket.Chat/pull/10793) by [@erhan-](https://github.com/erhan-))
+
 - Send a message when muted returns inconsistent result in chat.sendMessage ([#10720](https://github.com/RocketChat/Rocket.Chat/pull/10720))
+
 - Regression: Empty content on announcement modal ([#10733](https://github.com/RocketChat/Rocket.Chat/pull/10733) by [@gdelavald](https://github.com/gdelavald))
+
 - Missing attachment description when Rocket.Chat Apps were enabled ([#10705](https://github.com/RocketChat/Rocket.Chat/pull/10705) by [@Hudell](https://github.com/Hudell))
+
 - Improve desktop notification formatting ([#10445](https://github.com/RocketChat/Rocket.Chat/pull/10445) by [@Sameesunkaria](https://github.com/Sameesunkaria))
+
 - Message box emoji icon was flickering when typing a text ([#10678](https://github.com/RocketChat/Rocket.Chat/pull/10678) by [@gdelavald](https://github.com/gdelavald))
+
 - Channel owner was being set as muted when creating a read-only channel ([#10665](https://github.com/RocketChat/Rocket.Chat/pull/10665))
+
 - SAML wasn't working correctly when running multiple instances ([#10681](https://github.com/RocketChat/Rocket.Chat/pull/10681) by [@Hudell](https://github.com/Hudell))
+
 - Send a message when muted returns inconsistent result in chat.sendMessage ([#10720](https://github.com/RocketChat/Rocket.Chat/pull/10720))
+
 - Regression: Empty content on announcement modal ([#10733](https://github.com/RocketChat/Rocket.Chat/pull/10733) by [@gdelavald](https://github.com/gdelavald))
+
 - Missing attachment description when Rocket.Chat Apps were enabled ([#10705](https://github.com/RocketChat/Rocket.Chat/pull/10705) by [@Hudell](https://github.com/Hudell))
+
 - Improve desktop notification formatting ([#10445](https://github.com/RocketChat/Rocket.Chat/pull/10445) by [@Sameesunkaria](https://github.com/Sameesunkaria))
+
 - Message box emoji icon was flickering when typing a text ([#10678](https://github.com/RocketChat/Rocket.Chat/pull/10678) by [@gdelavald](https://github.com/gdelavald))
+
 - Channel owner was being set as muted when creating a read-only channel ([#10665](https://github.com/RocketChat/Rocket.Chat/pull/10665))
+
 - SAML wasn't working correctly when running multiple instances ([#10681](https://github.com/RocketChat/Rocket.Chat/pull/10681) by [@Hudell](https://github.com/Hudell))
+
 - Not escaping special chars on mentions ([#10793](https://github.com/RocketChat/Rocket.Chat/pull/10793) by [@erhan-](https://github.com/erhan-))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.64.2 ([#10812](https://github.com/RocketChat/Rocket.Chat/pull/10812) by [@Hudell](https://github.com/Hudell) & [@Sameesunkaria](https://github.com/Sameesunkaria) & [@cardoso](https://github.com/cardoso) & [@erhan-](https://github.com/erhan-) & [@gdelavald](https://github.com/gdelavald) & [@karlprieb](https://github.com/karlprieb) & [@peccu](https://github.com/peccu) & [@winterstefan](https://github.com/winterstefan))
+
 - Prometheus: Add metric to track hooks time ([#10798](https://github.com/RocketChat/Rocket.Chat/pull/10798))
+
 - Regression: Autorun of wizard was not destroyed after completion ([#10802](https://github.com/RocketChat/Rocket.Chat/pull/10802))
+
 - Prometheus: Fix notification metric ([#10803](https://github.com/RocketChat/Rocket.Chat/pull/10803))
+
 - Regression: Fix wrong wizard field name ([#10804](https://github.com/RocketChat/Rocket.Chat/pull/10804))
+
 - Prometheus: Improve metric names ([#10789](https://github.com/RocketChat/Rocket.Chat/pull/10789))
+
 - Improvement to push notifications on direct messages ([#10788](https://github.com/RocketChat/Rocket.Chat/pull/10788))
+
 - Better metric for notifications ([#10786](https://github.com/RocketChat/Rocket.Chat/pull/10786))
+
 - Add badge back to push notifications ([#10779](https://github.com/RocketChat/Rocket.Chat/pull/10779))
+
 - Wizard improvements ([#10776](https://github.com/RocketChat/Rocket.Chat/pull/10776))
+
 - Add setting and expose prometheus on port 9100 ([#10766](https://github.com/RocketChat/Rocket.Chat/pull/10766))
+
 - Regression: Fix notifications for direct messages ([#10760](https://github.com/RocketChat/Rocket.Chat/pull/10760))
+
 - More improvements on send notifications logic ([#10736](https://github.com/RocketChat/Rocket.Chat/pull/10736))
+
 - LingoHub based on develop ([#10691](https://github.com/RocketChat/Rocket.Chat/pull/10691))
+
 - Add `npm run postinstall` into example build script ([#10524](https://github.com/RocketChat/Rocket.Chat/pull/10524) by [@peccu](https://github.com/peccu))
+
 - Correct links in README file ([#10674](https://github.com/RocketChat/Rocket.Chat/pull/10674) by [@winterstefan](https://github.com/winterstefan))
+
 - More improvements on send notifications logic ([#10736](https://github.com/RocketChat/Rocket.Chat/pull/10736))
+
 - LingoHub based on develop ([#10691](https://github.com/RocketChat/Rocket.Chat/pull/10691))
+
 - Add `npm run postinstall` into example build script ([#10524](https://github.com/RocketChat/Rocket.Chat/pull/10524) by [@peccu](https://github.com/peccu))
+
 - Correct links in README file ([#10674](https://github.com/RocketChat/Rocket.Chat/pull/10674) by [@winterstefan](https://github.com/winterstefan))
+
 - Prometheus: Improve metric names ([#10789](https://github.com/RocketChat/Rocket.Chat/pull/10789))
+
 - Improvement to push notifications on direct messages ([#10788](https://github.com/RocketChat/Rocket.Chat/pull/10788))
+
 - Better metric for notifications ([#10786](https://github.com/RocketChat/Rocket.Chat/pull/10786))
+
 - Add badge back to push notifications ([#10779](https://github.com/RocketChat/Rocket.Chat/pull/10779))
+
 - Wizard improvements ([#10776](https://github.com/RocketChat/Rocket.Chat/pull/10776))
+
 - Add setting and expose prometheus on port 9100 ([#10766](https://github.com/RocketChat/Rocket.Chat/pull/10766))
+
 - Regression: Fix notifications for direct messages ([#10760](https://github.com/RocketChat/Rocket.Chat/pull/10760))
+
 - Prometheus: Add metric to track hooks time ([#10798](https://github.com/RocketChat/Rocket.Chat/pull/10798))
+
 - Regression: Autorun of wizard was not destroyed after completion ([#10802](https://github.com/RocketChat/Rocket.Chat/pull/10802))
+
 - Prometheus: Fix notification metric ([#10803](https://github.com/RocketChat/Rocket.Chat/pull/10803))
+
 - Regression: Fix wrong wizard field name ([#10804](https://github.com/RocketChat/Rocket.Chat/pull/10804))
 
 </details>
@@ -4571,19 +6667,26 @@
 
 ### 🎉 New features
 
+
 - Store the last sent message to show bellow the room's name by default ([#10597](https://github.com/RocketChat/Rocket.Chat/pull/10597))
 
 ### 🐛 Bug fixes
 
+
 - E-mails were hidden some information ([#10615](https://github.com/RocketChat/Rocket.Chat/pull/10615))
+
 - Regression on 0.64.0 was freezing the application when posting some URLs ([#10627](https://github.com/RocketChat/Rocket.Chat/pull/10627))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.64.1 ([#10660](https://github.com/RocketChat/Rocket.Chat/pull/10660) by [@saplla](https://github.com/saplla))
+
 - Support passing extra connection options to the Mongo driver ([#10529](https://github.com/RocketChat/Rocket.Chat/pull/10529) by [@saplla](https://github.com/saplla))
+
 - Regression: Updating an App on multi-instance servers wasn't working ([#10611](https://github.com/RocketChat/Rocket.Chat/pull/10611))
+
 - Dependencies update ([#10648](https://github.com/RocketChat/Rocket.Chat/pull/10648))
 
 </details>
@@ -4608,110 +6711,205 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Validate incoming message schema ([#9922](https://github.com/RocketChat/Rocket.Chat/pull/9922))
+
 - The property "settings" is no longer available to regular users via rest api ([#10411](https://github.com/RocketChat/Rocket.Chat/pull/10411))
 
 ### 🎉 New features
 
+
 - Option to mute group mentions (@all and @here) ([#10502](https://github.com/RocketChat/Rocket.Chat/pull/10502) by [@Hudell](https://github.com/Hudell))
+
 - GDPR - Right to access and Data Portability ([#9906](https://github.com/RocketChat/Rocket.Chat/pull/9906) by [@Hudell](https://github.com/Hudell))
+
 - Broadcast Channels ([#9950](https://github.com/RocketChat/Rocket.Chat/pull/9950))
+
 - Option to ignore users on channels ([#10517](https://github.com/RocketChat/Rocket.Chat/pull/10517) by [@gdelavald](https://github.com/gdelavald) & [@karlprieb](https://github.com/karlprieb))
+
 - Search Provider Framework ([#10110](https://github.com/RocketChat/Rocket.Chat/pull/10110) by [@tkurz](https://github.com/tkurz))
+
 - REST API endpoint `/directory` ([#10442](https://github.com/RocketChat/Rocket.Chat/pull/10442))
+
 - Body of the payload on an incoming webhook is included on the request object ([#10259](https://github.com/RocketChat/Rocket.Chat/pull/10259) by [@Hudell](https://github.com/Hudell))
+
 - REST endpoint to recover forgotten password ([#10371](https://github.com/RocketChat/Rocket.Chat/pull/10371))
+
 - REST endpoint to report messages ([#10354](https://github.com/RocketChat/Rocket.Chat/pull/10354))
+
 - Livechat setting to customize ended conversation message ([#10108](https://github.com/RocketChat/Rocket.Chat/pull/10108))
+
 - Twilio MMS support for LiveChat integration ([#7964](https://github.com/RocketChat/Rocket.Chat/pull/7964) by [@t3hchipmunk](https://github.com/t3hchipmunk))
+
 - REST API endpoint `rooms.favorite` to favorite and unfavorite rooms ([#10342](https://github.com/RocketChat/Rocket.Chat/pull/10342))
+
 - Add internal API to handle room announcements ([#10396](https://github.com/RocketChat/Rocket.Chat/pull/10396) by [@gdelavald](https://github.com/gdelavald))
+
 - Add message preview when quoting another message ([#10437](https://github.com/RocketChat/Rocket.Chat/pull/10437) by [@gdelavald](https://github.com/gdelavald))
+
 - Prevent the browser to autocomplete some setting fields ([#10439](https://github.com/RocketChat/Rocket.Chat/pull/10439) by [@gdelavald](https://github.com/gdelavald))
+
 - Shows user's real name on autocomplete popup ([#10444](https://github.com/RocketChat/Rocket.Chat/pull/10444) by [@gdelavald](https://github.com/gdelavald))
+
 - Automatically trigger Redhat registry build when tagging new release ([#10414](https://github.com/RocketChat/Rocket.Chat/pull/10414))
+
 - Add information regarding Zapier and Bots to the integrations page ([#10574](https://github.com/RocketChat/Rocket.Chat/pull/10574))
 
 ### 🐛 Bug fixes
 
+
 - Missing "Administration" menu for users with some administration permissions ([#10551](https://github.com/RocketChat/Rocket.Chat/pull/10551) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
+
 - Member list search with no results ([#10599](https://github.com/RocketChat/Rocket.Chat/pull/10599))
+
 - Integrations with room data not having the usernames filled in ([#10576](https://github.com/RocketChat/Rocket.Chat/pull/10576))
+
 - Add user object to responses in /*.files Rest endpoints ([#10480](https://github.com/RocketChat/Rocket.Chat/pull/10480))
+
 - Missing user data on files uploaded through the API ([#10473](https://github.com/RocketChat/Rocket.Chat/pull/10473) by [@Hudell](https://github.com/Hudell))
+
 - Rename method to clean history of messages ([#10498](https://github.com/RocketChat/Rocket.Chat/pull/10498))
+
 - REST spotlight API wasn't allowing searches with # and @ ([#10410](https://github.com/RocketChat/Rocket.Chat/pull/10410))
+
 - Dropdown elements were using old styles ([#10482](https://github.com/RocketChat/Rocket.Chat/pull/10482) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
+
 - Directory sort and column sizes were wrong ([#10403](https://github.com/RocketChat/Rocket.Chat/pull/10403) by [@karlprieb](https://github.com/karlprieb))
+
 - REST API OAuth services endpoint were missing fields and flag to indicate custom services ([#10299](https://github.com/RocketChat/Rocket.Chat/pull/10299))
+
 - Error messages weren't been displayed when email verification fails ([#10446](https://github.com/RocketChat/Rocket.Chat/pull/10446) by [@Hudell](https://github.com/Hudell) & [@karlprieb](https://github.com/karlprieb))
+
 - Wrong column positions in the directory search for users ([#10454](https://github.com/RocketChat/Rocket.Chat/pull/10454) by [@karlprieb](https://github.com/karlprieb) & [@lunaticmonk](https://github.com/lunaticmonk))
+
 - Custom fields was misaligned in registration form ([#10463](https://github.com/RocketChat/Rocket.Chat/pull/10463) by [@dschuan](https://github.com/dschuan))
+
 - Unique identifier file not really being unique ([#10341](https://github.com/RocketChat/Rocket.Chat/pull/10341) by [@abernix](https://github.com/abernix))
+
 - Empty panel after changing a user's username ([#10404](https://github.com/RocketChat/Rocket.Chat/pull/10404) by [@Hudell](https://github.com/Hudell))
+
 - Russian translation of "False" ([#10418](https://github.com/RocketChat/Rocket.Chat/pull/10418) by [@strangerintheq](https://github.com/strangerintheq))
+
 - Links being embedded inside of blockquotes ([#10496](https://github.com/RocketChat/Rocket.Chat/pull/10496) by [@gdelavald](https://github.com/gdelavald))
+
 - The 'channel.messages' REST API Endpoint error ([#10485](https://github.com/RocketChat/Rocket.Chat/pull/10485) by [@rafaelks](https://github.com/rafaelks))
+
 - Button on user info contextual bar scrolling with the content ([#10358](https://github.com/RocketChat/Rocket.Chat/pull/10358) by [@karlprieb](https://github.com/karlprieb) & [@okaybroda](https://github.com/okaybroda))
+
 - "Idle Time Limit" using milliseconds instead of seconds ([#9824](https://github.com/RocketChat/Rocket.Chat/pull/9824) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
+
 - Missing i18n translation key for "Unread" ([#10387](https://github.com/RocketChat/Rocket.Chat/pull/10387) by [@Hudell](https://github.com/Hudell))
+
 - Owner unable to delete channel or group from APIs ([#9729](https://github.com/RocketChat/Rocket.Chat/pull/9729) by [@c0dzilla](https://github.com/c0dzilla))
+
 - Livechat translation files being ignored ([#10369](https://github.com/RocketChat/Rocket.Chat/pull/10369))
+
 - Missing page "not found" ([#6673](https://github.com/RocketChat/Rocket.Chat/pull/6673) by [@Prakharsvnit](https://github.com/Prakharsvnit) & [@karlprieb](https://github.com/karlprieb))
+
 - "Highlight Words" wasn't working with more than one word ([#10083](https://github.com/RocketChat/Rocket.Chat/pull/10083) by [@gdelavald](https://github.com/gdelavald) & [@nemaniarjun](https://github.com/nemaniarjun))
+
 - Missing "Administration" menu for user with manage-emoji permission ([#10171](https://github.com/RocketChat/Rocket.Chat/pull/10171) by [@c0dzilla](https://github.com/c0dzilla) & [@karlprieb](https://github.com/karlprieb))
+
 - Message view mode setting was missing at user's preferences  ([#10395](https://github.com/RocketChat/Rocket.Chat/pull/10395) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii) & [@karlprieb](https://github.com/karlprieb))
+
 - Profile image was not being shown in user's directory search ([#10399](https://github.com/RocketChat/Rocket.Chat/pull/10399) by [@karlprieb](https://github.com/karlprieb) & [@lunaticmonk](https://github.com/lunaticmonk))
+
 - Wrong positioning of popover when using RTL languages ([#10428](https://github.com/RocketChat/Rocket.Chat/pull/10428) by [@karlprieb](https://github.com/karlprieb))
+
 - Messages was grouping wrong some times when server is slow ([#10472](https://github.com/RocketChat/Rocket.Chat/pull/10472) by [@gdelavald](https://github.com/gdelavald) & [@karlprieb](https://github.com/karlprieb))
+
 - GitLab authentication scope was too open, reduced to read only access ([#10225](https://github.com/RocketChat/Rocket.Chat/pull/10225) by [@rafaelks](https://github.com/rafaelks))
+
 - Renaming agent's username within Livechat's department ([#10344](https://github.com/RocketChat/Rocket.Chat/pull/10344))
+
 - Missing RocketApps input types ([#10394](https://github.com/RocketChat/Rocket.Chat/pull/10394) by [@karlprieb](https://github.com/karlprieb))
+
 - Livechat desktop notifications not being displayed ([#10221](https://github.com/RocketChat/Rocket.Chat/pull/10221))
+
 - Autocomplete list when inviting a user was partial hidden ([#10409](https://github.com/RocketChat/Rocket.Chat/pull/10409) by [@karlprieb](https://github.com/karlprieb))
+
 - Remove a user from the user's list when creating a new channel removes the wrong user ([#10423](https://github.com/RocketChat/Rocket.Chat/pull/10423) by [@gdelavald](https://github.com/gdelavald) & [@karlprieb](https://github.com/karlprieb))
+
 - Room's name was cutting instead of having ellipses on sidebar ([#10430](https://github.com/RocketChat/Rocket.Chat/pull/10430))
+
 - Button to delete rooms by the owners wasn't appearing ([#10438](https://github.com/RocketChat/Rocket.Chat/pull/10438) by [@karlprieb](https://github.com/karlprieb))
+
 - Updated OpenShift Template to take an Image as a Param ([#9946](https://github.com/RocketChat/Rocket.Chat/pull/9946) by [@christianh814](https://github.com/christianh814))
+
 - Incoming integrations being able to trigger an empty message with a GET ([#9576](https://github.com/RocketChat/Rocket.Chat/pull/9576))
+
 - Snaps installations are breaking on avatar requests ([#10390](https://github.com/RocketChat/Rocket.Chat/pull/10390))
+
 - Wordpress oAuth authentication wasn't behaving correctly ([#10550](https://github.com/RocketChat/Rocket.Chat/pull/10550) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
+
 - Switch buttons were cutting in RTL mode ([#10558](https://github.com/RocketChat/Rocket.Chat/pull/10558))
+
 - Stop Firefox announcement overflowing viewport ([#10503](https://github.com/RocketChat/Rocket.Chat/pull/10503) by [@brendangadd](https://github.com/brendangadd))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.64.0 ([#10613](https://github.com/RocketChat/Rocket.Chat/pull/10613) by [@TwizzyDizzy](https://github.com/TwizzyDizzy) & [@christianh814](https://github.com/christianh814) & [@gdelavald](https://github.com/gdelavald) & [@tttt-conan](https://github.com/tttt-conan))
+
 - Regression: Various search provider fixes ([#10591](https://github.com/RocketChat/Rocket.Chat/pull/10591) by [@tkurz](https://github.com/tkurz))
+
 - Regression: /api/v1/settings.oauth not sending needed info for SAML & CAS ([#10596](https://github.com/RocketChat/Rocket.Chat/pull/10596) by [@cardoso](https://github.com/cardoso))
+
 - Regression: Apps and Livechats not getting along well with each other ([#10598](https://github.com/RocketChat/Rocket.Chat/pull/10598))
+
 - Development: Add Visual Studio Code debugging configuration ([#10586](https://github.com/RocketChat/Rocket.Chat/pull/10586))
+
 - Included missing lib for migrations ([#10532](https://github.com/RocketChat/Rocket.Chat/pull/10532) by [@Hudell](https://github.com/Hudell))
+
 - Develop sync ([#10505](https://github.com/RocketChat/Rocket.Chat/pull/10505) by [@nsuchy](https://github.com/nsuchy) & [@rafaelks](https://github.com/rafaelks))
+
 - Fix: Remove "secret" from REST endpoint /settings.oauth response ([#10513](https://github.com/RocketChat/Rocket.Chat/pull/10513))
+
 - [OTHER] More Listeners for Apps & Utilize Promises inside Apps ([#10335](https://github.com/RocketChat/Rocket.Chat/pull/10335))
+
 - [OTHER] Develop sync ([#10487](https://github.com/RocketChat/Rocket.Chat/pull/10487))
+
 - Change Docker-Compose to use mmapv1 storage engine for mongo ([#10336](https://github.com/RocketChat/Rocket.Chat/pull/10336))
+
 - Add some missing translations ([#10435](https://github.com/RocketChat/Rocket.Chat/pull/10435) by [@gdelavald](https://github.com/gdelavald))
+
 - [OTHER] Removed the developer warning on the rest api ([#10441](https://github.com/RocketChat/Rocket.Chat/pull/10441))
+
 - Fix and improve vietnamese translation ([#10397](https://github.com/RocketChat/Rocket.Chat/pull/10397) by [@TDiNguyen](https://github.com/TDiNguyen) & [@tttt-conan](https://github.com/tttt-conan))
+
 - Use Node 8.9 for CI build ([#10405](https://github.com/RocketChat/Rocket.Chat/pull/10405))
+
 - Update allowed labels for bot ([#10360](https://github.com/RocketChat/Rocket.Chat/pull/10360) by [@TwizzyDizzy](https://github.com/TwizzyDizzy))
+
 - Remove @core team mention from Pull Request template ([#10384](https://github.com/RocketChat/Rocket.Chat/pull/10384))
+
 - New issue template for *Release Process* ([#10234](https://github.com/RocketChat/Rocket.Chat/pull/10234))
+
 - Master into Develop Branch Sync ([#10376](https://github.com/RocketChat/Rocket.Chat/pull/10376))
+
 - LingoHub based on develop ([#10545](https://github.com/RocketChat/Rocket.Chat/pull/10545))
+
 - Regression: Revert announcement structure ([#10544](https://github.com/RocketChat/Rocket.Chat/pull/10544) by [@gdelavald](https://github.com/gdelavald))
+
 - Regression: Upload was not working ([#10543](https://github.com/RocketChat/Rocket.Chat/pull/10543))
+
 - Deps update ([#10549](https://github.com/RocketChat/Rocket.Chat/pull/10549))
+
 - Regression: /api/v1/settings.oauth not returning clientId for Twitter ([#10560](https://github.com/RocketChat/Rocket.Chat/pull/10560) by [@cardoso](https://github.com/cardoso))
+
 - Regression: Webhooks breaking due to restricted test ([#10555](https://github.com/RocketChat/Rocket.Chat/pull/10555))
+
 - Regression: Rooms and Apps weren't playing nice with each other ([#10559](https://github.com/RocketChat/Rocket.Chat/pull/10559))
+
 - Regression: Fix announcement bar being displayed without content ([#10554](https://github.com/RocketChat/Rocket.Chat/pull/10554) by [@gdelavald](https://github.com/gdelavald))
+
 - Regression: Inconsistent response of settings.oauth endpoint ([#10553](https://github.com/RocketChat/Rocket.Chat/pull/10553))
+
 - Regression: Remove added mentions on quote/reply ([#10571](https://github.com/RocketChat/Rocket.Chat/pull/10571) by [@gdelavald](https://github.com/gdelavald))
+
 - Regression: Attachments and fields incorrectly failing on validation ([#10573](https://github.com/RocketChat/Rocket.Chat/pull/10573))
+
 - Regression: Rocket.Chat App author link opens in same window ([#10575](https://github.com/RocketChat/Rocket.Chat/pull/10575) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
 
 </details>
@@ -4762,6 +6960,7 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.63.3 ([#10504](https://github.com/RocketChat/Rocket.Chat/pull/10504) by [@rafaelks](https://github.com/rafaelks))
 
 </details>
@@ -4784,7 +6983,9 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.63.2 ([#10476](https://github.com/RocketChat/Rocket.Chat/pull/10476))
+
 - add redhat dockerfile to master ([#10408](https://github.com/RocketChat/Rocket.Chat/pull/10408))
 
 </details>
@@ -4804,6 +7005,7 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.63.1 ([#10374](https://github.com/RocketChat/Rocket.Chat/pull/10374) by [@TechyPeople](https://github.com/TechyPeople) & [@kaiiiiiiiii](https://github.com/kaiiiiiiiii) & [@tttt-conan](https://github.com/tttt-conan))
 
 </details>
@@ -4830,84 +7032,153 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Removed Private History Route ([#10103](https://github.com/RocketChat/Rocket.Chat/pull/10103) by [@Hudell](https://github.com/Hudell))
 
 ### 🎉 New features
 
+
 - Improve history generation ([#10319](https://github.com/RocketChat/Rocket.Chat/pull/10319))
+
 - Interface to install and manage RocketChat Apps (alpha) ([#10246](https://github.com/RocketChat/Rocket.Chat/pull/10246))
+
 - Livechat messages rest APIs ([#10054](https://github.com/RocketChat/Rocket.Chat/pull/10054) by [@hmagarotto](https://github.com/hmagarotto))
+
 - Endpoint to retrieve message read receipts ([#9907](https://github.com/RocketChat/Rocket.Chat/pull/9907))
+
 - Add option to login via REST using Facebook and Twitter tokens ([#9816](https://github.com/RocketChat/Rocket.Chat/pull/9816))
+
 - Add REST endpoint to get the list of custom emojis ([#9629](https://github.com/RocketChat/Rocket.Chat/pull/9629))
+
 - GDPR Right to be forgotten/erased ([#9947](https://github.com/RocketChat/Rocket.Chat/pull/9947) by [@Hudell](https://github.com/Hudell))
+
 - Added endpoint to retrieve mentions of a channel ([#10105](https://github.com/RocketChat/Rocket.Chat/pull/10105))
+
 - Add leave public channel & leave private channel permissions ([#9584](https://github.com/RocketChat/Rocket.Chat/pull/9584) by [@kb0304](https://github.com/kb0304))
+
 - Added GET/POST channels.notifications ([#10128](https://github.com/RocketChat/Rocket.Chat/pull/10128))
+
 - Reply preview ([#10086](https://github.com/RocketChat/Rocket.Chat/pull/10086) by [@ubarsaiyan](https://github.com/ubarsaiyan))
+
 - Support for agent's phone field ([#10123](https://github.com/RocketChat/Rocket.Chat/pull/10123))
+
 - Added endpoint to get the list of available oauth services ([#10144](https://github.com/RocketChat/Rocket.Chat/pull/10144))
+
 - REST API method to set room's announcement (channels.setAnnouncement) ([#9742](https://github.com/RocketChat/Rocket.Chat/pull/9742) by [@TopHattedCat](https://github.com/TopHattedCat))
+
 - Audio recording as mp3 and better ui for recording ([#9726](https://github.com/RocketChat/Rocket.Chat/pull/9726) by [@kb0304](https://github.com/kb0304))
+
 - Setting to configure max delta for 2fa ([#9732](https://github.com/RocketChat/Rocket.Chat/pull/9732) by [@Hudell](https://github.com/Hudell))
+
 - Livechat webhook request on message ([#9870](https://github.com/RocketChat/Rocket.Chat/pull/9870) by [@hmagarotto](https://github.com/hmagarotto))
+
 - Announcement bar color wasn't using color from theming variables ([#9367](https://github.com/RocketChat/Rocket.Chat/pull/9367) by [@cyclops24](https://github.com/cyclops24) & [@karlprieb](https://github.com/karlprieb))
 
 ### 🐛 Bug fixes
 
+
 - Audio Message UI fixes ([#10303](https://github.com/RocketChat/Rocket.Chat/pull/10303) by [@kb0304](https://github.com/kb0304))
+
 - "View All Members" button inside channel's "User Info" is over sized ([#10012](https://github.com/RocketChat/Rocket.Chat/pull/10012) by [@karlprieb](https://github.com/karlprieb))
+
 - Apostrophe-containing URL misparsed" ([#10242](https://github.com/RocketChat/Rocket.Chat/pull/10242))
+
 - user status on sidenav ([#10222](https://github.com/RocketChat/Rocket.Chat/pull/10222))
+
 - Dynamic CSS script isn't working on older browsers ([#10152](https://github.com/RocketChat/Rocket.Chat/pull/10152) by [@karlprieb](https://github.com/karlprieb))
+
 - Extended view mode on sidebar ([#10160](https://github.com/RocketChat/Rocket.Chat/pull/10160) by [@karlprieb](https://github.com/karlprieb))
+
 - Cannot answer to a livechat as a manager if agent has not answered yet ([#10082](https://github.com/RocketChat/Rocket.Chat/pull/10082) by [@kb0304](https://github.com/kb0304))
+
 - User status missing on user info ([#9866](https://github.com/RocketChat/Rocket.Chat/pull/9866) by [@lunaticmonk](https://github.com/lunaticmonk))
+
 - Name of files in file upload list cuts down at bottom due to overflow ([#9672](https://github.com/RocketChat/Rocket.Chat/pull/9672) by [@lunaticmonk](https://github.com/lunaticmonk))
+
 - No pattern for user's status text capitalization ([#9783](https://github.com/RocketChat/Rocket.Chat/pull/9783) by [@lunaticmonk](https://github.com/lunaticmonk))
+
 - Apostrophe-containing URL misparsed ([#9739](https://github.com/RocketChat/Rocket.Chat/pull/9739) by [@lunaticmonk](https://github.com/lunaticmonk))
+
 - Popover divs don't scroll if they overflow the viewport ([#9860](https://github.com/RocketChat/Rocket.Chat/pull/9860) by [@Joe-mcgee](https://github.com/Joe-mcgee))
+
 - Reactions not working on mobile ([#10104](https://github.com/RocketChat/Rocket.Chat/pull/10104))
+
 - Broken video call accept dialog ([#9872](https://github.com/RocketChat/Rocket.Chat/pull/9872) by [@ramrami](https://github.com/ramrami))
+
 - Wrong switch button border color ([#10081](https://github.com/RocketChat/Rocket.Chat/pull/10081) by [@kb0304](https://github.com/kb0304))
+
 - Nextcloud as custom oauth provider wasn't mapping data correctly ([#10090](https://github.com/RocketChat/Rocket.Chat/pull/10090) by [@pierreozoux](https://github.com/pierreozoux))
+
 - Missing sidebar default options on admin ([#10016](https://github.com/RocketChat/Rocket.Chat/pull/10016) by [@karlprieb](https://github.com/karlprieb))
+
 - Able to react with invalid emoji ([#8667](https://github.com/RocketChat/Rocket.Chat/pull/8667) by [@mutdmour](https://github.com/mutdmour))
+
 - User preferences can't be saved when roles are hidden in admin settings ([#10051](https://github.com/RocketChat/Rocket.Chat/pull/10051) by [@Hudell](https://github.com/Hudell))
+
 - Browser was auto-filling values when editing another user profile ([#9932](https://github.com/RocketChat/Rocket.Chat/pull/9932) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
+
 - Avatar input was accepting not supported image types ([#10011](https://github.com/RocketChat/Rocket.Chat/pull/10011) by [@karlprieb](https://github.com/karlprieb))
+
 - Initial loading feedback was missing ([#10028](https://github.com/RocketChat/Rocket.Chat/pull/10028) by [@karlprieb](https://github.com/karlprieb))
+
 - File had redirect delay when using external storage services and no option to proxy only avatars ([#10272](https://github.com/RocketChat/Rocket.Chat/pull/10272))
+
 - Missing pt-BR translations ([#10262](https://github.com/RocketChat/Rocket.Chat/pull/10262))
+
 - /me REST endpoint was missing user roles and preferences ([#10240](https://github.com/RocketChat/Rocket.Chat/pull/10240))
+
 - Unable to mention after newline in message ([#10078](https://github.com/RocketChat/Rocket.Chat/pull/10078) by [@c0dzilla](https://github.com/c0dzilla))
+
 - Wrong pagination information on /api/v1/channels.members ([#10224](https://github.com/RocketChat/Rocket.Chat/pull/10224))
+
 - Inline code following a url leads to autolinking of code with url ([#10163](https://github.com/RocketChat/Rocket.Chat/pull/10163) by [@c0dzilla](https://github.com/c0dzilla))
+
 - Incoming Webhooks were missing the raw content ([#10258](https://github.com/RocketChat/Rocket.Chat/pull/10258) by [@Hudell](https://github.com/Hudell))
+
 - Missing Translation Key on Reactions ([#10270](https://github.com/RocketChat/Rocket.Chat/pull/10270) by [@bernardoetrevisan](https://github.com/bernardoetrevisan))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.63.0 ([#10324](https://github.com/RocketChat/Rocket.Chat/pull/10324) by [@Hudell](https://github.com/Hudell) & [@Joe-mcgee](https://github.com/Joe-mcgee) & [@TopHattedCat](https://github.com/TopHattedCat) & [@hmagarotto](https://github.com/hmagarotto) & [@kaiiiiiiiii](https://github.com/kaiiiiiiiii) & [@karlprieb](https://github.com/karlprieb) & [@kb0304](https://github.com/kb0304) & [@lunaticmonk](https://github.com/lunaticmonk) & [@ramrami](https://github.com/ramrami))
+
 - Fix: Reaction endpoint/api only working with regular emojis ([#10323](https://github.com/RocketChat/Rocket.Chat/pull/10323))
+
 - Bump snap version to include security fix ([#10313](https://github.com/RocketChat/Rocket.Chat/pull/10313))
+
 - Update Meteor to 1.6.1.1 ([#10314](https://github.com/RocketChat/Rocket.Chat/pull/10314))
+
 - LingoHub based on develop ([#10243](https://github.com/RocketChat/Rocket.Chat/pull/10243))
+
 - Rename migration name on 108 to match file name ([#10237](https://github.com/RocketChat/Rocket.Chat/pull/10237))
+
 - Fix typo for Nextcloud login ([#10159](https://github.com/RocketChat/Rocket.Chat/pull/10159) by [@pierreozoux](https://github.com/pierreozoux))
+
 - Add a few listener supports for the Rocket.Chat Apps ([#10154](https://github.com/RocketChat/Rocket.Chat/pull/10154))
+
 - Add forums as a place to suggest, discuss and upvote features ([#10148](https://github.com/RocketChat/Rocket.Chat/pull/10148) by [@SeanPackham](https://github.com/SeanPackham))
+
 - Fix tests breaking randomly ([#10065](https://github.com/RocketChat/Rocket.Chat/pull/10065))
+
 - [OTHER] Reactivate all tests ([#10036](https://github.com/RocketChat/Rocket.Chat/pull/10036))
+
 - [OTHER] Reactivate API tests ([#9844](https://github.com/RocketChat/Rocket.Chat/pull/9844) by [@karlprieb](https://github.com/karlprieb))
+
 - Start 0.63.0-develop / develop sync from master ([#9985](https://github.com/RocketChat/Rocket.Chat/pull/9985))
+
 - Fix: Renaming channels.notifications Get/Post endpoints ([#10257](https://github.com/RocketChat/Rocket.Chat/pull/10257))
+
 - Fix caddy download link to pull from github ([#10260](https://github.com/RocketChat/Rocket.Chat/pull/10260))
+
 - Fix: possible errors on rocket.chat side of the apps ([#10252](https://github.com/RocketChat/Rocket.Chat/pull/10252))
+
 - Fix snap install. Remove execstack from sharp, and bypass grpc error ([#10015](https://github.com/RocketChat/Rocket.Chat/pull/10015))
+
 - Fix: inputs for rocketchat apps ([#10274](https://github.com/RocketChat/Rocket.Chat/pull/10274))
+
 - Fix: chat.react api not accepting previous emojis ([#10290](https://github.com/RocketChat/Rocket.Chat/pull/10290))
+
 - Fix: Scroll on content page ([#10300](https://github.com/RocketChat/Rocket.Chat/pull/10300))
 
 </details>
@@ -4951,16 +7222,23 @@
 
 ### 🐛 Bug fixes
 
+
 - Slack Import reports `invalid import file type` due to a call to BSON.native() which is now doesn't exist ([#10071](https://github.com/RocketChat/Rocket.Chat/pull/10071) by [@trongthanh](https://github.com/trongthanh))
+
 - Verified property of user is always set to false if not supplied ([#9719](https://github.com/RocketChat/Rocket.Chat/pull/9719))
+
 - Update preferences of users with settings: null was crashing the server ([#10076](https://github.com/RocketChat/Rocket.Chat/pull/10076))
+
 - REST API: Can't list all public channels when user has permission `view-joined-room` ([#10009](https://github.com/RocketChat/Rocket.Chat/pull/10009))
+
 - Message editing is crashing the server when read receipts are enabled ([#10061](https://github.com/RocketChat/Rocket.Chat/pull/10061))
+
 - Download links was duplicating Sub Paths ([#10029](https://github.com/RocketChat/Rocket.Chat/pull/10029))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.62.2 ([#10087](https://github.com/RocketChat/Rocket.Chat/pull/10087))
 
 </details>
@@ -4984,14 +7262,19 @@
 
 ### 🐛 Bug fixes
 
+
 - Delete user without username was removing direct rooms of all users ([#9986](https://github.com/RocketChat/Rocket.Chat/pull/9986))
+
 - New channel page on medium size screens ([#9988](https://github.com/RocketChat/Rocket.Chat/pull/9988) by [@karlprieb](https://github.com/karlprieb))
+
 - Empty sidenav when sorting by activity and there is a subscription without room ([#9960](https://github.com/RocketChat/Rocket.Chat/pull/9960))
+
 - Two factor authentication modal was not showing ([#9982](https://github.com/RocketChat/Rocket.Chat/pull/9982))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.62.1 ([#9989](https://github.com/RocketChat/Rocket.Chat/pull/9989))
 
 </details>
@@ -5015,95 +7298,175 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Remove Graphics/Image Magick support ([#9711](https://github.com/RocketChat/Rocket.Chat/pull/9711))
 
 ### 🎉 New features
 
+
 - Version update check ([#9793](https://github.com/RocketChat/Rocket.Chat/pull/9793))
+
 - General alert banner ([#9778](https://github.com/RocketChat/Rocket.Chat/pull/9778))
+
 - Browse more channels / Directory ([#9642](https://github.com/RocketChat/Rocket.Chat/pull/9642) by [@karlprieb](https://github.com/karlprieb))
+
 - Add user settings / preferences API endpoint ([#9457](https://github.com/RocketChat/Rocket.Chat/pull/9457) by [@jgtoriginal](https://github.com/jgtoriginal))
+
 - New sidebar layout ([#9608](https://github.com/RocketChat/Rocket.Chat/pull/9608) by [@karlprieb](https://github.com/karlprieb))
+
 - Message read receipts ([#9717](https://github.com/RocketChat/Rocket.Chat/pull/9717))
+
 - Alert admins when user requires approval & alert users when the account is approved/activated/deactivated ([#7098](https://github.com/RocketChat/Rocket.Chat/pull/7098) by [@luisfn](https://github.com/luisfn))
+
 - Allow configuration of SAML logout behavior ([#9527](https://github.com/RocketChat/Rocket.Chat/pull/9527) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Internal hubot support for Direct Messages and Private Groups ([#8933](https://github.com/RocketChat/Rocket.Chat/pull/8933) by [@ramrami](https://github.com/ramrami))
+
 - Improved default welcome message ([#9298](https://github.com/RocketChat/Rocket.Chat/pull/9298) by [@HammyHavoc](https://github.com/HammyHavoc))
+
 - Makes shield icon configurable ([#9746](https://github.com/RocketChat/Rocket.Chat/pull/9746) by [@c0dzilla](https://github.com/c0dzilla))
+
 - Global message search (beta: disabled by default) ([#9687](https://github.com/RocketChat/Rocket.Chat/pull/9687) by [@cyberhck](https://github.com/cyberhck) & [@savikko](https://github.com/savikko))
+
 - Allow sounds when conversation is focused ([#9312](https://github.com/RocketChat/Rocket.Chat/pull/9312) by [@RationalCoding](https://github.com/RationalCoding))
+
 - API to fetch permissions & user roles ([#9519](https://github.com/RocketChat/Rocket.Chat/pull/9519) by [@rafaelks](https://github.com/rafaelks))
+
 - REST API to use Spotlight ([#9509](https://github.com/RocketChat/Rocket.Chat/pull/9509) by [@rafaelks](https://github.com/rafaelks))
+
 - Option to proxy files and avatars through the server ([#9699](https://github.com/RocketChat/Rocket.Chat/pull/9699))
+
 - Allow request avatar placeholders as PNG or JPG instead of SVG ([#8193](https://github.com/RocketChat/Rocket.Chat/pull/8193) by [@lindoelio](https://github.com/lindoelio))
+
 - Image preview as 32x32 base64 jpeg ([#9218](https://github.com/RocketChat/Rocket.Chat/pull/9218) by [@jorgeluisrezende](https://github.com/jorgeluisrezende))
+
 - New REST API to mark channel as read ([#9507](https://github.com/RocketChat/Rocket.Chat/pull/9507) by [@rafaelks](https://github.com/rafaelks))
+
 - Add route to get user shield/badge ([#9549](https://github.com/RocketChat/Rocket.Chat/pull/9549) by [@kb0304](https://github.com/kb0304))
+
 - GraphQL API ([#8158](https://github.com/RocketChat/Rocket.Chat/pull/8158) by [@kamilkisiela](https://github.com/kamilkisiela))
+
 - Livestream tab ([#9255](https://github.com/RocketChat/Rocket.Chat/pull/9255) by [@gdelavald](https://github.com/gdelavald))
+
 - Add documentation requirement to PRs ([#9658](https://github.com/RocketChat/Rocket.Chat/pull/9658) by [@SeanPackham](https://github.com/SeanPackham))
+
 - Request mongoDB version in github issue template ([#9807](https://github.com/RocketChat/Rocket.Chat/pull/9807) by [@TwizzyDizzy](https://github.com/TwizzyDizzy))
 
 ### 🐛 Bug fixes
 
+
 - Typo on french translation for "Open" ([#9934](https://github.com/RocketChat/Rocket.Chat/pull/9934) by [@sizrar](https://github.com/sizrar))
+
 - Wrong behavior of rooms info's *Read Only* and *Collaborative* buttons ([#9665](https://github.com/RocketChat/Rocket.Chat/pull/9665) by [@karlprieb](https://github.com/karlprieb))
+
 - Close button on file upload bar was not working ([#9662](https://github.com/RocketChat/Rocket.Chat/pull/9662) by [@karlprieb](https://github.com/karlprieb))
+
 - Chrome 64 breaks jitsi-meet iframe ([#9560](https://github.com/RocketChat/Rocket.Chat/pull/9560) by [@speedy01](https://github.com/speedy01))
+
 - Harmonize channel-related actions ([#9697](https://github.com/RocketChat/Rocket.Chat/pull/9697) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Custom emoji was cropping sometimes ([#9676](https://github.com/RocketChat/Rocket.Chat/pull/9676) by [@anu-007](https://github.com/anu-007))
+
 - Show custom room types icon in channel header ([#9696](https://github.com/RocketChat/Rocket.Chat/pull/9696) by [@mrsimpson](https://github.com/mrsimpson))
+
 - 'Query' support for channels.list.joined, groups.list, groups.listAll, im.list ([#9424](https://github.com/RocketChat/Rocket.Chat/pull/9424) by [@xbolshe](https://github.com/xbolshe))
+
 - DeprecationWarning: prom-client ... when starting Rocket Chat server ([#9747](https://github.com/RocketChat/Rocket.Chat/pull/9747) by [@jgtoriginal](https://github.com/jgtoriginal))
+
 - API to retrive rooms was returning empty objects ([#9737](https://github.com/RocketChat/Rocket.Chat/pull/9737))
+
 - Chat Message Reactions REST API End Point ([#9487](https://github.com/RocketChat/Rocket.Chat/pull/9487) by [@jgtoriginal](https://github.com/jgtoriginal))
+
 - Messages can't be quoted sometimes ([#9720](https://github.com/RocketChat/Rocket.Chat/pull/9720))
+
 - GitLab OAuth does not work when GitLab’s URL ends with slash ([#9716](https://github.com/RocketChat/Rocket.Chat/pull/9716))
+
 - Close Livechat conversation by visitor not working in version 0.61.0 ([#9714](https://github.com/RocketChat/Rocket.Chat/pull/9714))
+
 - Formal pronouns and some small mistakes in German texts ([#9067](https://github.com/RocketChat/Rocket.Chat/pull/9067) by [@AmShaegar13](https://github.com/AmShaegar13))
+
 - Facebook integration in livechat not working on version 0.61.0 ([#9640](https://github.com/RocketChat/Rocket.Chat/pull/9640))
+
 - Weird rendering of emojis at sidebar when `last message` is activated ([#9623](https://github.com/RocketChat/Rocket.Chat/pull/9623))
+
 - Rest API helpers only applying to v1 ([#9520](https://github.com/RocketChat/Rocket.Chat/pull/9520))
+
 - Desktop notification not showing when avatar came from external storage service ([#9639](https://github.com/RocketChat/Rocket.Chat/pull/9639))
+
 - Missing link Site URLs in enrollment e-mails ([#9454](https://github.com/RocketChat/Rocket.Chat/pull/9454) by [@kemitchell](https://github.com/kemitchell))
+
 - Missing string 'Username_already_exist' on the accountProfile page ([#9610](https://github.com/RocketChat/Rocket.Chat/pull/9610) by [@lunaticmonk](https://github.com/lunaticmonk))
+
 - SVG avatars are not been displayed correctly when load in non HTML containers ([#9570](https://github.com/RocketChat/Rocket.Chat/pull/9570) by [@filipedelimabrito](https://github.com/filipedelimabrito))
+
 - Livechat is not working when running in a sub path ([#9599](https://github.com/RocketChat/Rocket.Chat/pull/9599))
+
 - Not receiving sound notifications in rooms created by new LiveChats ([#9802](https://github.com/RocketChat/Rocket.Chat/pull/9802))
+
 - Silence the update check error message ([#9858](https://github.com/RocketChat/Rocket.Chat/pull/9858))
+
 - Parsing messages with multiple markdown matches ignore some tokens ([#9884](https://github.com/RocketChat/Rocket.Chat/pull/9884) by [@c0dzilla](https://github.com/c0dzilla))
+
 - Importers no longer working due to the FileUpload changes ([#9850](https://github.com/RocketChat/Rocket.Chat/pull/9850))
+
 - Misplaced "Save Changes" button in user account panel ([#9888](https://github.com/RocketChat/Rocket.Chat/pull/9888) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
+
 - Snap build was failing ([#9879](https://github.com/RocketChat/Rocket.Chat/pull/9879))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.62.0 ([#9935](https://github.com/RocketChat/Rocket.Chat/pull/9935))
+
 - Regression: Fix livechat queue link ([#9928](https://github.com/RocketChat/Rocket.Chat/pull/9928) by [@karlprieb](https://github.com/karlprieb))
+
 - Regression: Directory now list default channel ([#9931](https://github.com/RocketChat/Rocket.Chat/pull/9931) by [@karlprieb](https://github.com/karlprieb))
+
 - Improve link handling for attachments ([#9908](https://github.com/RocketChat/Rocket.Chat/pull/9908))
+
 - Regression: Misplaced language dropdown in user preferences panel ([#9883](https://github.com/RocketChat/Rocket.Chat/pull/9883) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
+
 - Fix RHCC image path for OpenShift and default to the current namespace. ([#9901](https://github.com/RocketChat/Rocket.Chat/pull/9901) by [@jsm84](https://github.com/jsm84))
+
 - Sync from Master ([#9796](https://github.com/RocketChat/Rocket.Chat/pull/9796) by [@HammyHavoc](https://github.com/HammyHavoc))
+
 - [OTHER] Rocket.Chat Apps ([#9666](https://github.com/RocketChat/Rocket.Chat/pull/9666))
+
 - Move NRR package to inside the project and convert from CoffeeScript ([#9753](https://github.com/RocketChat/Rocket.Chat/pull/9753))
+
 - Update to meteor 1.6.1 ([#9546](https://github.com/RocketChat/Rocket.Chat/pull/9546))
+
 - Regression: Avatar now open account related options ([#9843](https://github.com/RocketChat/Rocket.Chat/pull/9843) by [@karlprieb](https://github.com/karlprieb))
+
 - Regression: Open search using ctrl/cmd + p and ctrl/cmd + k ([#9837](https://github.com/RocketChat/Rocket.Chat/pull/9837) by [@karlprieb](https://github.com/karlprieb))
+
 - Regression: Search bar is now full width ([#9839](https://github.com/RocketChat/Rocket.Chat/pull/9839) by [@karlprieb](https://github.com/karlprieb))
+
 - Dependencies update ([#9811](https://github.com/RocketChat/Rocket.Chat/pull/9811))
+
 - Fix: Custom fields not showing on user info panel ([#9821](https://github.com/RocketChat/Rocket.Chat/pull/9821))
+
 - Regression: Page was not respecting the window height on Firefox ([#9804](https://github.com/RocketChat/Rocket.Chat/pull/9804))
+
 - Update bot-config.yml ([#9784](https://github.com/RocketChat/Rocket.Chat/pull/9784) by [@JSzaszvari](https://github.com/JSzaszvari))
+
 - Develop fix sync from master ([#9797](https://github.com/RocketChat/Rocket.Chat/pull/9797))
+
 - Regression: Change create channel icon ([#9851](https://github.com/RocketChat/Rocket.Chat/pull/9851) by [@karlprieb](https://github.com/karlprieb))
+
 - Regression: Fix channel icons on safari ([#9852](https://github.com/RocketChat/Rocket.Chat/pull/9852) by [@karlprieb](https://github.com/karlprieb))
+
 - Regression: Fix admin/user settings item text ([#9845](https://github.com/RocketChat/Rocket.Chat/pull/9845) by [@karlprieb](https://github.com/karlprieb))
+
 - Regression: Improve sidebar filter ([#9905](https://github.com/RocketChat/Rocket.Chat/pull/9905) by [@karlprieb](https://github.com/karlprieb))
+
 - [OTHER] Fix Apps not working on multi-instance deployments ([#9902](https://github.com/RocketChat/Rocket.Chat/pull/9902))
+
 - [Fix] Not Translated Phrases ([#9877](https://github.com/RocketChat/Rocket.Chat/pull/9877) by [@bernardoetrevisan](https://github.com/bernardoetrevisan))
+
 - Regression: Overlapping header in user profile panel ([#9889](https://github.com/RocketChat/Rocket.Chat/pull/9889) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
+
 - Regression: sort on room's list not working correctly ([#9897](https://github.com/RocketChat/Rocket.Chat/pull/9897))
 
 </details>
@@ -5162,13 +7525,17 @@
 
 ### 🐛 Bug fixes
 
+
 - Livechat issues on external queue and lead capture ([#9750](https://github.com/RocketChat/Rocket.Chat/pull/9750))
+
 - Emoji rendering on last message ([#9776](https://github.com/RocketChat/Rocket.Chat/pull/9776))
+
 - Livechat conversation not receiving messages when start without form ([#9772](https://github.com/RocketChat/Rocket.Chat/pull/9772))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.61.2 ([#9786](https://github.com/RocketChat/Rocket.Chat/pull/9786))
 
 </details>
@@ -5189,6 +7556,7 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.61.1 ([#9721](https://github.com/RocketChat/Rocket.Chat/pull/9721))
 
 </details>
@@ -5206,48 +7574,81 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Decouple livechat visitors from regular users ([#9048](https://github.com/RocketChat/Rocket.Chat/pull/9048))
 
 ### 🎉 New features
 
+
 - Contextual Bar Redesign ([#8411](https://github.com/RocketChat/Rocket.Chat/pull/8411) by [@karlprieb](https://github.com/karlprieb))
+
 - Update documentation: provide example for multiple basedn ([#9442](https://github.com/RocketChat/Rocket.Chat/pull/9442) by [@rndmh3ro](https://github.com/rndmh3ro))
+
 - Sidebar menu option to mark room as unread ([#9216](https://github.com/RocketChat/Rocket.Chat/pull/9216) by [@karlprieb](https://github.com/karlprieb))
+
 - Add mention-here permission #7631 ([#9228](https://github.com/RocketChat/Rocket.Chat/pull/9228) by [@ryjones](https://github.com/ryjones))
+
 - Indicate the Self DM room ([#9234](https://github.com/RocketChat/Rocket.Chat/pull/9234))
+
 - new layout for emojipicker ([#9245](https://github.com/RocketChat/Rocket.Chat/pull/9245) by [@karlprieb](https://github.com/karlprieb))
+
 - add /home link to sidenav footer logo ([#9366](https://github.com/RocketChat/Rocket.Chat/pull/9366) by [@cyclops24](https://github.com/cyclops24))
+
 - Livechat extract lead data from message ([#9135](https://github.com/RocketChat/Rocket.Chat/pull/9135))
+
 - Add impersonate option for livechat triggers ([#9107](https://github.com/RocketChat/Rocket.Chat/pull/9107))
+
 - Add support to external livechat queue service provider ([#9053](https://github.com/RocketChat/Rocket.Chat/pull/9053))
+
 - Contextual bar mail messages ([#9510](https://github.com/RocketChat/Rocket.Chat/pull/9510) by [@karlprieb](https://github.com/karlprieb))
 
 ### 🐛 Bug fixes
 
+
 - [i18n] add room type translation support for room-changed-privacy message ([#9369](https://github.com/RocketChat/Rocket.Chat/pull/9369) by [@cyclops24](https://github.com/cyclops24))
+
 - Fix livechat register form ([#9452](https://github.com/RocketChat/Rocket.Chat/pull/9452))
+
 - Fix livechat build ([#9451](https://github.com/RocketChat/Rocket.Chat/pull/9451))
+
 - Fix closing livechat inquiry ([#9164](https://github.com/RocketChat/Rocket.Chat/pull/9164))
+
 - Slash command 'unarchive' throws exception if the channel does not exist  ([#9435](https://github.com/RocketChat/Rocket.Chat/pull/9435) by [@ramrami](https://github.com/ramrami))
+
 - Slash command 'archive' throws exception if the channel does not exist ([#9428](https://github.com/RocketChat/Rocket.Chat/pull/9428) by [@ramrami](https://github.com/ramrami))
+
 - Subscriptions not removed when removing user ([#9432](https://github.com/RocketChat/Rocket.Chat/pull/9432))
+
 - Highlight setting not working correctly ([#9364](https://github.com/RocketChat/Rocket.Chat/pull/9364) by [@cyclops24](https://github.com/cyclops24))
+
 - File access not working when passing credentials via querystring ([#9264](https://github.com/RocketChat/Rocket.Chat/pull/9264))
+
 - Contextual bar redesign ([#9481](https://github.com/RocketChat/Rocket.Chat/pull/9481) by [@gdelavald](https://github.com/gdelavald) & [@karlprieb](https://github.com/karlprieb))
+
 - mention-here is missing i18n text #9455 ([#9456](https://github.com/RocketChat/Rocket.Chat/pull/9456) by [@ryjones](https://github.com/ryjones))
+
 - Fix livechat visitor edit ([#9506](https://github.com/RocketChat/Rocket.Chat/pull/9506))
+
 - large names on userinfo, and admin user bug on users with no usernames ([#9493](https://github.com/RocketChat/Rocket.Chat/pull/9493) by [@gdelavald](https://github.com/gdelavald))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.61.0 ([#9533](https://github.com/RocketChat/Rocket.Chat/pull/9533) by [@karlprieb](https://github.com/karlprieb) & [@ryjones](https://github.com/ryjones))
+
 - Add community bot ([#9439](https://github.com/RocketChat/Rocket.Chat/pull/9439))
+
 - Use correct version of Mailparser module ([#9356](https://github.com/RocketChat/Rocket.Chat/pull/9356))
+
 - Develop sync - Bump version to 0.61.0-develop ([#9260](https://github.com/RocketChat/Rocket.Chat/pull/9260) by [@cpitman](https://github.com/cpitman) & [@karlprieb](https://github.com/karlprieb))
+
 - [Fix] oauth not working because of email array ([#9173](https://github.com/RocketChat/Rocket.Chat/pull/9173))
+
 - [DOCS] Update the links of our Mobile Apps in Features topic ([#9469](https://github.com/RocketChat/Rocket.Chat/pull/9469) by [@rafaelks](https://github.com/rafaelks))
+
 - Update license ([#9490](https://github.com/RocketChat/Rocket.Chat/pull/9490))
+
 - Prevent NPM package-lock inside livechat ([#9504](https://github.com/RocketChat/Rocket.Chat/pull/9504))
 
 </details>
@@ -5282,16 +7683,23 @@
 
 ### 🐛 Bug fixes
 
+
 - LDAP TLS not working in some cases ([#9343](https://github.com/RocketChat/Rocket.Chat/pull/9343))
+
 - popover on safari for iOS ([#9328](https://github.com/RocketChat/Rocket.Chat/pull/9328) by [@karlprieb](https://github.com/karlprieb))
+
 - announcement hyperlink color ([#9330](https://github.com/RocketChat/Rocket.Chat/pull/9330) by [@karlprieb](https://github.com/karlprieb))
+
 - Deleting message with store last message not removing ([#9335](https://github.com/RocketChat/Rocket.Chat/pull/9335))
+
 - last message cutting on bottom ([#9345](https://github.com/RocketChat/Rocket.Chat/pull/9345) by [@karlprieb](https://github.com/karlprieb))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.60.4 ([#9377](https://github.com/RocketChat/Rocket.Chat/pull/9377))
+
 - Update Marked dependecy to 0.3.9 ([#9346](https://github.com/RocketChat/Rocket.Chat/pull/9346))
 
 </details>
@@ -5314,20 +7722,31 @@
 
 ### 🐛 Bug fixes
 
+
 - custom emoji size on sidebar item ([#9314](https://github.com/RocketChat/Rocket.Chat/pull/9314) by [@karlprieb](https://github.com/karlprieb))
+
 - svg render on firefox ([#9311](https://github.com/RocketChat/Rocket.Chat/pull/9311) by [@karlprieb](https://github.com/karlprieb))
+
 - sidebar footer padding ([#9249](https://github.com/RocketChat/Rocket.Chat/pull/9249) by [@karlprieb](https://github.com/karlprieb))
+
 - LDAP/AD is not importing all users ([#9309](https://github.com/RocketChat/Rocket.Chat/pull/9309))
+
 - Wrong position of notifications alert in accounts preference page ([#9289](https://github.com/RocketChat/Rocket.Chat/pull/9289) by [@HammyHavoc](https://github.com/HammyHavoc))
+
 - English Typos ([#9285](https://github.com/RocketChat/Rocket.Chat/pull/9285) by [@HammyHavoc](https://github.com/HammyHavoc))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.60.3 ([#9320](https://github.com/RocketChat/Rocket.Chat/pull/9320) by [@HammyHavoc](https://github.com/HammyHavoc))
+
 - Fix: English language improvements ([#9299](https://github.com/RocketChat/Rocket.Chat/pull/9299) by [@HammyHavoc](https://github.com/HammyHavoc))
+
 - Fix: Change 'Wordpress' to 'WordPress ([#9291](https://github.com/RocketChat/Rocket.Chat/pull/9291) by [@HammyHavoc](https://github.com/HammyHavoc))
+
 - Fix: Improved README.md ([#9290](https://github.com/RocketChat/Rocket.Chat/pull/9290) by [@HammyHavoc](https://github.com/HammyHavoc))
+
 - Fix: README typo ([#9286](https://github.com/RocketChat/Rocket.Chat/pull/9286) by [@HammyHavoc](https://github.com/HammyHavoc))
 
 </details>
@@ -5350,13 +7769,17 @@
 
 ### 🐛 Bug fixes
 
+
 - Restore translations from other languages ([#9277](https://github.com/RocketChat/Rocket.Chat/pull/9277))
+
 - Remove sweetalert from livechat facebook integration page ([#9274](https://github.com/RocketChat/Rocket.Chat/pull/9274))
+
 - Missing translations ([#9272](https://github.com/RocketChat/Rocket.Chat/pull/9272))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.60.2 ([#9280](https://github.com/RocketChat/Rocket.Chat/pull/9280))
 
 </details>
@@ -5375,6 +7798,7 @@
 
 ### 🐛 Bug fixes
 
+
 - File access not working when passing credentials via querystring ([#9262](https://github.com/RocketChat/Rocket.Chat/pull/9262))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -5390,185 +7814,358 @@
 
 ### 🎉 New features
 
+
 - Allow user's default preferences configuration ([#7285](https://github.com/RocketChat/Rocket.Chat/pull/7285) by [@goiaba](https://github.com/goiaba))
+
 - Add "Favorites" and "Mark as read" options to the room list ([#8915](https://github.com/RocketChat/Rocket.Chat/pull/8915) by [@karlprieb](https://github.com/karlprieb))
+
 - Facebook livechat integration ([#8807](https://github.com/RocketChat/Rocket.Chat/pull/8807))
+
 - Added support for Dataporten's userid-feide scope ([#8902](https://github.com/RocketChat/Rocket.Chat/pull/8902) by [@torgeirl](https://github.com/torgeirl))
+
 - Describe file uploads when notifying by email ([#8924](https://github.com/RocketChat/Rocket.Chat/pull/8924))
+
 - Feature/livechat hide email ([#8149](https://github.com/RocketChat/Rocket.Chat/pull/8149) by [@icosamuel](https://github.com/icosamuel) & [@sarbasamuel](https://github.com/sarbasamuel))
+
 - Sender's name in email notifications. ([#7999](https://github.com/RocketChat/Rocket.Chat/pull/7999) by [@pkgodara](https://github.com/pkgodara))
+
 - Add "real name change" setting ([#8739](https://github.com/RocketChat/Rocket.Chat/pull/8739) by [@AmShaegar13](https://github.com/AmShaegar13))
+
 - Use enter separator rather than comma in highlight preferences + Auto refresh after change highlighted words ([#8433](https://github.com/RocketChat/Rocket.Chat/pull/8433) by [@cyclops24](https://github.com/cyclops24))
+
 - Adds admin option to globally set mobile devices to always be notified regardless of presence status. ([#7641](https://github.com/RocketChat/Rocket.Chat/pull/7641) by [@stalley](https://github.com/stalley))
+
 - Add new API endpoints ([#8947](https://github.com/RocketChat/Rocket.Chat/pull/8947))
+
 - Option to enable/disable auto away and configure timer ([#8029](https://github.com/RocketChat/Rocket.Chat/pull/8029) by [@armand1m](https://github.com/armand1m))
+
 - New Modal component ([#8882](https://github.com/RocketChat/Rocket.Chat/pull/8882) by [@karlprieb](https://github.com/karlprieb))
+
 - Improve room types API and usages ([#9009](https://github.com/RocketChat/Rocket.Chat/pull/9009) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Room counter sidebar preference ([#8866](https://github.com/RocketChat/Rocket.Chat/pull/8866) by [@karlprieb](https://github.com/karlprieb))
+
 - Save room's last message ([#8979](https://github.com/RocketChat/Rocket.Chat/pull/8979) by [@karlprieb](https://github.com/karlprieb))
+
 - Token Controlled Access channels ([#8060](https://github.com/RocketChat/Rocket.Chat/pull/8060) by [@karlprieb](https://github.com/karlprieb) & [@lindoelio](https://github.com/lindoelio))
+
 - Send category and title fields to iOS push notification ([#8905](https://github.com/RocketChat/Rocket.Chat/pull/8905))
+
 - code to get the updated messages ([#8857](https://github.com/RocketChat/Rocket.Chat/pull/8857))
+
 - Rest API endpoints to list, get, and run commands ([#8531](https://github.com/RocketChat/Rocket.Chat/pull/8531))
+
 - Upgrade Meteor to 1.6 ([#8715](https://github.com/RocketChat/Rocket.Chat/pull/8715) by [@karlprieb](https://github.com/karlprieb))
+
 - Add settings for allow user direct messages to yourself ([#8066](https://github.com/RocketChat/Rocket.Chat/pull/8066) by [@lindoelio](https://github.com/lindoelio))
+
 - Add sweet alert to video call tab ([#8108](https://github.com/RocketChat/Rocket.Chat/pull/8108))
+
 - Displays QR code for manually entering when enabling 2fa ([#8143](https://github.com/RocketChat/Rocket.Chat/pull/8143))
+
 - Add yunohost.org installation method to Readme.md ([#8037](https://github.com/RocketChat/Rocket.Chat/pull/8037) by [@selamanse](https://github.com/selamanse))
+
 - Modal ([#9092](https://github.com/RocketChat/Rocket.Chat/pull/9092) by [@karlprieb](https://github.com/karlprieb))
+
 - Make Custom oauth accept nested usernameField ([#9066](https://github.com/RocketChat/Rocket.Chat/pull/9066) by [@pierreozoux](https://github.com/pierreozoux))
 
 ### 🐛 Bug fixes
 
+
 - Can't react on Read Only rooms even when enabled ([#8925](https://github.com/RocketChat/Rocket.Chat/pull/8925) by [@karlprieb](https://github.com/karlprieb))
+
 - CAS does not share secrets when operating multiple server instances ([#8654](https://github.com/RocketChat/Rocket.Chat/pull/8654) by [@AmShaegar13](https://github.com/AmShaegar13))
+
 - Snippetted messages not working ([#8937](https://github.com/RocketChat/Rocket.Chat/pull/8937) by [@karlprieb](https://github.com/karlprieb))
+
 - Added afterUserCreated trigger after first CAS login ([#9022](https://github.com/RocketChat/Rocket.Chat/pull/9022) by [@AmShaegar13](https://github.com/AmShaegar13))
+
 - Notification is not sent when a video conference start ([#8828](https://github.com/RocketChat/Rocket.Chat/pull/8828) by [@deepseainside75](https://github.com/deepseainside75) & [@stefanoverducci](https://github.com/stefanoverducci))
+
 - long filename overlaps cancel button in progress bar ([#8868](https://github.com/RocketChat/Rocket.Chat/pull/8868) by [@joesitton](https://github.com/joesitton))
+
 - Changed oembedUrlWidget to prefer og:image and twitter:image over msapplication-TileImage ([#9012](https://github.com/RocketChat/Rocket.Chat/pull/9012) by [@wferris722](https://github.com/wferris722))
+
 - Update insecure moment.js dependency ([#9046](https://github.com/RocketChat/Rocket.Chat/pull/9046) by [@robbyoconnor](https://github.com/robbyoconnor))
+
 - Custom OAuth: Not able to set different token place for routes ([#9034](https://github.com/RocketChat/Rocket.Chat/pull/9034))
+
 - Can't use OAuth login against a Rocket.Chat OAuth server ([#9044](https://github.com/RocketChat/Rocket.Chat/pull/9044))
+
 - Notification sound is not disabling when busy ([#9042](https://github.com/RocketChat/Rocket.Chat/pull/9042))
+
 - Use encodeURI in AmazonS3 contentDisposition file.name to prevent fail ([#9024](https://github.com/RocketChat/Rocket.Chat/pull/9024) by [@paulovitin](https://github.com/paulovitin))
+
 - snap install by setting grpc package used by google/vision to 1.6.6 ([#9029](https://github.com/RocketChat/Rocket.Chat/pull/9029))
+
 - Enable CORS for Restivus ([#8671](https://github.com/RocketChat/Rocket.Chat/pull/8671) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Importers failing when usernames exists but cases don't match and improve the importer framework's performance ([#8966](https://github.com/RocketChat/Rocket.Chat/pull/8966))
+
 - Error when saving integration with symbol as only trigger ([#9023](https://github.com/RocketChat/Rocket.Chat/pull/9023))
+
 - Sync of non existent field throws exception ([#8006](https://github.com/RocketChat/Rocket.Chat/pull/8006) by [@goiaba](https://github.com/goiaba))
+
 - Autoupdate of CSS does not work when using a prefix ([#8107](https://github.com/RocketChat/Rocket.Chat/pull/8107) by [@Darkneon](https://github.com/Darkneon))
+
 - Contextual errors for this and RegExp declarations in IRC module ([#8656](https://github.com/RocketChat/Rocket.Chat/pull/8656) by [@Pharserror](https://github.com/Pharserror))
+
 - Wrong room counter name ([#9013](https://github.com/RocketChat/Rocket.Chat/pull/9013) by [@karlprieb](https://github.com/karlprieb))
+
 - Message-box autogrow flick ([#8932](https://github.com/RocketChat/Rocket.Chat/pull/8932) by [@karlprieb](https://github.com/karlprieb))
+
 - Don't strip trailing slash on autolinker urls ([#8812](https://github.com/RocketChat/Rocket.Chat/pull/8812) by [@jwilkins](https://github.com/jwilkins))
+
 - Change the unread messages style ([#8883](https://github.com/RocketChat/Rocket.Chat/pull/8883) by [@karlprieb](https://github.com/karlprieb))
+
 - Missing sidebar footer padding ([#8884](https://github.com/RocketChat/Rocket.Chat/pull/8884) by [@karlprieb](https://github.com/karlprieb))
+
 - Long room announcement cut off ([#8907](https://github.com/RocketChat/Rocket.Chat/pull/8907) by [@karlprieb](https://github.com/karlprieb))
+
 - DM email notifications always being sent regardless of account setting ([#8917](https://github.com/RocketChat/Rocket.Chat/pull/8917) by [@ashward](https://github.com/ashward))
+
 - Typo Fix ([#8938](https://github.com/RocketChat/Rocket.Chat/pull/8938) by [@seangeleno](https://github.com/seangeleno))
+
 - Katex markdown link changed ([#8948](https://github.com/RocketChat/Rocket.Chat/pull/8948) by [@mritunjaygoutam12](https://github.com/mritunjaygoutam12))
+
 - if ogImage exists use it over image in oembedUrlWidget ([#9000](https://github.com/RocketChat/Rocket.Chat/pull/9000) by [@satyapramodh](https://github.com/satyapramodh))
+
 - Cannot edit or delete custom sounds ([#8889](https://github.com/RocketChat/Rocket.Chat/pull/8889) by [@ccfang](https://github.com/ccfang))
+
 - Change old 'rocketbot' username to 'InternalHubot_Username' setting ([#8928](https://github.com/RocketChat/Rocket.Chat/pull/8928) by [@ramrami](https://github.com/ramrami))
+
 - Link for channels are not rendering correctly ([#8985](https://github.com/RocketChat/Rocket.Chat/pull/8985) by [@karlprieb](https://github.com/karlprieb))
+
 - Xenforo [BD]API for 'user.user_id; instead of 'id' ([#8968](https://github.com/RocketChat/Rocket.Chat/pull/8968) by [@wesnspace](https://github.com/wesnspace))
+
 - flextab height on smaller screens ([#8994](https://github.com/RocketChat/Rocket.Chat/pull/8994) by [@karlprieb](https://github.com/karlprieb))
+
 - Check for mention-all permission in room scope ([#8931](https://github.com/RocketChat/Rocket.Chat/pull/8931))
+
 - fix emoji package path so they show up correctly in browser ([#8822](https://github.com/RocketChat/Rocket.Chat/pull/8822) by [@ryoshimizu](https://github.com/ryoshimizu))
+
 - Set correct Twitter link ([#8830](https://github.com/RocketChat/Rocket.Chat/pull/8830) by [@jotafeldmann](https://github.com/jotafeldmann))
+
 - User email settings on DM ([#8810](https://github.com/RocketChat/Rocket.Chat/pull/8810) by [@karlprieb](https://github.com/karlprieb))
+
 - i18n'd Resend_verification_mail, username_initials, upload avatar ([#8721](https://github.com/RocketChat/Rocket.Chat/pull/8721) by [@arungalva](https://github.com/arungalva))
+
 - Username clipping on firefox ([#8716](https://github.com/RocketChat/Rocket.Chat/pull/8716) by [@karlprieb](https://github.com/karlprieb))
+
 - Improved grammar and made it clearer to the user ([#8795](https://github.com/RocketChat/Rocket.Chat/pull/8795) by [@HammyHavoc](https://github.com/HammyHavoc))
+
 - Show real name of current user at top of side nav if setting enabled ([#8718](https://github.com/RocketChat/Rocket.Chat/pull/8718) by [@alexbrazier](https://github.com/alexbrazier))
+
 - Range Slider Value label has bug in RTL ([#8441](https://github.com/RocketChat/Rocket.Chat/pull/8441) by [@cyclops24](https://github.com/cyclops24))
+
 - Add historic chats icon in Livechat ([#8708](https://github.com/RocketChat/Rocket.Chat/pull/8708) by [@mrsimpson](https://github.com/mrsimpson))
+
 - Sort direct messages by full name if show real names setting enabled ([#8717](https://github.com/RocketChat/Rocket.Chat/pull/8717) by [@alexbrazier](https://github.com/alexbrazier))
+
 - Improving consistency of UX ([#8796](https://github.com/RocketChat/Rocket.Chat/pull/8796) by [@HammyHavoc](https://github.com/HammyHavoc))
+
 - fixed some typos ([#8787](https://github.com/RocketChat/Rocket.Chat/pull/8787) by [@TheReal1604](https://github.com/TheReal1604))
+
 - Changed all rocket.chat/docs/ to docs.rocket.chat/ ([#8588](https://github.com/RocketChat/Rocket.Chat/pull/8588) by [@RekkyRek](https://github.com/RekkyRek))
+
 - Email verification indicator added ([#7923](https://github.com/RocketChat/Rocket.Chat/pull/7923) by [@aditya19496](https://github.com/aditya19496))
+
 - REST API file upload not respecting size limit ([#9108](https://github.com/RocketChat/Rocket.Chat/pull/9108))
+
 - Creating channels on Firefox ([#9109](https://github.com/RocketChat/Rocket.Chat/pull/9109) by [@karlprieb](https://github.com/karlprieb))
+
 - Some UI problems on 0.60 ([#9095](https://github.com/RocketChat/Rocket.Chat/pull/9095) by [@karlprieb](https://github.com/karlprieb))
+
 - Update rocketchat:streamer to be compatible with previous version ([#9094](https://github.com/RocketChat/Rocket.Chat/pull/9094))
+
 - Importers not recovering when an error occurs ([#9134](https://github.com/RocketChat/Rocket.Chat/pull/9134))
+
 - Do not block room while loading history ([#9121](https://github.com/RocketChat/Rocket.Chat/pull/9121))
+
 - Channel page error ([#9091](https://github.com/RocketChat/Rocket.Chat/pull/9091) by [@ggrish](https://github.com/ggrish))
+
 - Update Rocket.Chat for sandstorm ([#9062](https://github.com/RocketChat/Rocket.Chat/pull/9062) by [@peterlee0127](https://github.com/peterlee0127))
+
 - modal data on enter and modal style for file preview ([#9171](https://github.com/RocketChat/Rocket.Chat/pull/9171) by [@karlprieb](https://github.com/karlprieb))
+
 - show oauth logins when adblock is used ([#9170](https://github.com/RocketChat/Rocket.Chat/pull/9170) by [@karlprieb](https://github.com/karlprieb))
+
 - Last sent message reoccurs in textbox ([#9169](https://github.com/RocketChat/Rocket.Chat/pull/9169))
+
 - Made welcome emails more readable ([#9193](https://github.com/RocketChat/Rocket.Chat/pull/9193) by [@HammyHavoc](https://github.com/HammyHavoc))
+
 - Unread bar position when room have announcement ([#9188](https://github.com/RocketChat/Rocket.Chat/pull/9188) by [@karlprieb](https://github.com/karlprieb))
+
 - Emoji size on last message preview ([#9186](https://github.com/RocketChat/Rocket.Chat/pull/9186) by [@karlprieb](https://github.com/karlprieb))
+
 - Cursor position when reply on safari ([#9185](https://github.com/RocketChat/Rocket.Chat/pull/9185) by [@karlprieb](https://github.com/karlprieb))
+
 - "Use Emoji" preference not working ([#9182](https://github.com/RocketChat/Rocket.Chat/pull/9182) by [@karlprieb](https://github.com/karlprieb))
+
 - make the cross icon on user selection at channel creation page work ([#9176](https://github.com/RocketChat/Rocket.Chat/pull/9176) by [@karlprieb](https://github.com/karlprieb) & [@vitor-nagao](https://github.com/vitor-nagao))
+
 - go to replied message ([#9172](https://github.com/RocketChat/Rocket.Chat/pull/9172) by [@karlprieb](https://github.com/karlprieb))
+
 - channel create scroll on small screens ([#9168](https://github.com/RocketChat/Rocket.Chat/pull/9168) by [@karlprieb](https://github.com/karlprieb))
+
 - Error when user roles is missing or is invalid ([#9040](https://github.com/RocketChat/Rocket.Chat/pull/9040) by [@paulovitin](https://github.com/paulovitin))
+
 - Make mentions and menu icons color darker ([#8922](https://github.com/RocketChat/Rocket.Chat/pull/8922) by [@karlprieb](https://github.com/karlprieb))
+
 - Show modal with announcement ([#9241](https://github.com/RocketChat/Rocket.Chat/pull/9241) by [@karlprieb](https://github.com/karlprieb))
+
 - File upload not working on IE and weird on Chrome ([#9206](https://github.com/RocketChat/Rocket.Chat/pull/9206) by [@karlprieb](https://github.com/karlprieb))
+
 - "Enter usernames" placeholder is cutting in "create channel" view ([#9194](https://github.com/RocketChat/Rocket.Chat/pull/9194) by [@TheReal1604](https://github.com/TheReal1604))
+
 - Move emojipicker css to theme package ([#9243](https://github.com/RocketChat/Rocket.Chat/pull/9243) by [@karlprieb](https://github.com/karlprieb))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.60.0 ([#9259](https://github.com/RocketChat/Rocket.Chat/pull/9259))
+
 - Fix tag build ([#9084](https://github.com/RocketChat/Rocket.Chat/pull/9084))
+
 - Turn off prettyJson if the node environment isn't development ([#9068](https://github.com/RocketChat/Rocket.Chat/pull/9068))
+
 - Fix api regression (exception when deleting user) ([#9049](https://github.com/RocketChat/Rocket.Chat/pull/9049))
+
 - Use real names for user and room in emails ([#7922](https://github.com/RocketChat/Rocket.Chat/pull/7922) by [@danischreiber](https://github.com/danischreiber))
+
 - [MOVE] Move mentions files to client/server ([#8142](https://github.com/RocketChat/Rocket.Chat/pull/8142) by [@vcapretz](https://github.com/vcapretz))
+
 - Update multiple-instance-status package ([#9018](https://github.com/RocketChat/Rocket.Chat/pull/9018))
+
 - Use redhat official image with openshift ([#9007](https://github.com/RocketChat/Rocket.Chat/pull/9007))
+
 - Added d2c.io to deployment ([#8975](https://github.com/RocketChat/Rocket.Chat/pull/8975) by [@mastappl](https://github.com/mastappl))
+
 - LingoHub based on develop ([#8831](https://github.com/RocketChat/Rocket.Chat/pull/8831))
+
 - Fix snap download url ([#8981](https://github.com/RocketChat/Rocket.Chat/pull/8981))
+
 - Add a few dots in readme.md ([#8906](https://github.com/RocketChat/Rocket.Chat/pull/8906) by [@dusta](https://github.com/dusta))
+
 - Changed wording for "Maximum Allowed Message Size" ([#8872](https://github.com/RocketChat/Rocket.Chat/pull/8872) by [@HammyHavoc](https://github.com/HammyHavoc))
+
 - Fix Docker image build ([#8862](https://github.com/RocketChat/Rocket.Chat/pull/8862))
+
 - Fix link to .asc file on S3 ([#8829](https://github.com/RocketChat/Rocket.Chat/pull/8829))
+
 - Bump version to 0.60.0-develop ([#8820](https://github.com/RocketChat/Rocket.Chat/pull/8820) by [@gdelavald](https://github.com/gdelavald) & [@karlprieb](https://github.com/karlprieb))
+
 - Update path for s3 redirect in circle ci ([#8819](https://github.com/RocketChat/Rocket.Chat/pull/8819))
+
 - Remove chatops package ([#8742](https://github.com/RocketChat/Rocket.Chat/pull/8742))
+
 - Removed tmeasday:crypto-md5 ([#8743](https://github.com/RocketChat/Rocket.Chat/pull/8743))
+
 - Update meteor package to 1.8.1 ([#8802](https://github.com/RocketChat/Rocket.Chat/pull/8802))
+
 - Fix typo ([#8705](https://github.com/RocketChat/Rocket.Chat/pull/8705) by [@rmetzler](https://github.com/rmetzler))
+
 - [Fix] Store Outgoing Integration Result as String in Mongo ([#8413](https://github.com/RocketChat/Rocket.Chat/pull/8413) by [@cpitman](https://github.com/cpitman))
+
 - Update DEMO to OPEN links ([#8793](https://github.com/RocketChat/Rocket.Chat/pull/8793))
+
 - Fix Travis CI build ([#8750](https://github.com/RocketChat/Rocket.Chat/pull/8750))
+
 - Updated comments. ([#8719](https://github.com/RocketChat/Rocket.Chat/pull/8719) by [@jasonjyu](https://github.com/jasonjyu))
+
 - Fix community links in readme ([#8589](https://github.com/RocketChat/Rocket.Chat/pull/8589))
+
 - [MOVE] Move favico to client folder ([#8077](https://github.com/RocketChat/Rocket.Chat/pull/8077) by [@vcapretz](https://github.com/vcapretz))
+
 - [MOVE] Move files from emojione to client/server folders ([#8078](https://github.com/RocketChat/Rocket.Chat/pull/8078) by [@vcapretz](https://github.com/vcapretz))
+
 - [MOVE] Move files from slashcommands-unarchive to client/server folders ([#8084](https://github.com/RocketChat/Rocket.Chat/pull/8084) by [@vcapretz](https://github.com/vcapretz))
+
 - [MOVE] Move slashcommands-open to client folder ([#8132](https://github.com/RocketChat/Rocket.Chat/pull/8132) by [@vcapretz](https://github.com/vcapretz))
+
 - [MOVE] Move kick command to client/server folders ([#8135](https://github.com/RocketChat/Rocket.Chat/pull/8135) by [@vcapretz](https://github.com/vcapretz))
+
 - [MOVE] Move join command to client/server folder ([#8136](https://github.com/RocketChat/Rocket.Chat/pull/8136) by [@vcapretz](https://github.com/vcapretz))
+
 - [MOVE] Move inviteall command to client/server folder ([#8137](https://github.com/RocketChat/Rocket.Chat/pull/8137) by [@vcapretz](https://github.com/vcapretz))
+
 - [MOVE] Move invite command to client/server folder ([#8138](https://github.com/RocketChat/Rocket.Chat/pull/8138) by [@vcapretz](https://github.com/vcapretz))
+
 - [MOVE] Move create command to client/server folder ([#8139](https://github.com/RocketChat/Rocket.Chat/pull/8139) by [@vcapretz](https://github.com/vcapretz))
+
 - [MOVE] Move archiveroom command to client/server folders ([#8140](https://github.com/RocketChat/Rocket.Chat/pull/8140) by [@vcapretz](https://github.com/vcapretz))
+
 - [MOVE] Move slackbridge to client/server folders ([#8141](https://github.com/RocketChat/Rocket.Chat/pull/8141) by [@vcapretz](https://github.com/vcapretz))
+
 - [MOVE] Move logger files to client/server folders ([#8150](https://github.com/RocketChat/Rocket.Chat/pull/8150) by [@vcapretz](https://github.com/vcapretz))
+
 - [MOVE] Move timesync files to client/server folders ([#8152](https://github.com/RocketChat/Rocket.Chat/pull/8152) by [@vcapretz](https://github.com/vcapretz))
+
 - Adding: How to Install in WeDeploy ([#8036](https://github.com/RocketChat/Rocket.Chat/pull/8036) by [@thompsonemerson](https://github.com/thompsonemerson))
+
 - Revert "npm deps update" ([#7983](https://github.com/RocketChat/Rocket.Chat/pull/7983))
+
 - npm deps update ([#7969](https://github.com/RocketChat/Rocket.Chat/pull/7969))
+
 - Added RocketChatLauncher (SaaS) ([#6606](https://github.com/RocketChat/Rocket.Chat/pull/6606) by [@designgurudotorg](https://github.com/designgurudotorg))
+
 - Develop sync ([#7866](https://github.com/RocketChat/Rocket.Chat/pull/7866))
+
 - Fix: users listed as online after API login ([#9111](https://github.com/RocketChat/Rocket.Chat/pull/9111))
+
 - Fix regression in api channels.members ([#9110](https://github.com/RocketChat/Rocket.Chat/pull/9110))
+
 - Fix: Clear all unreads modal not closing after confirming ([#9137](https://github.com/RocketChat/Rocket.Chat/pull/9137))
+
 - Fix: Message action quick buttons drops if "new message" divider is being shown ([#9138](https://github.com/RocketChat/Rocket.Chat/pull/9138))
+
 - Fix: Confirmation modals showing `Send` button ([#9136](https://github.com/RocketChat/Rocket.Chat/pull/9136))
+
 - Fix: Multiple unread indicators ([#9120](https://github.com/RocketChat/Rocket.Chat/pull/9120))
+
 - Fix: Messages being displayed in reverse order ([#9144](https://github.com/RocketChat/Rocket.Chat/pull/9144))
+
 - Fix: UI: Descenders of glyphs are cut off ([#9166](https://github.com/RocketChat/Rocket.Chat/pull/9166))
+
 - Fix: Click on channel name - hover area bigger than link area ([#9165](https://github.com/RocketChat/Rocket.Chat/pull/9165))
+
 - Fix: Can’t login using LDAP via REST ([#9162](https://github.com/RocketChat/Rocket.Chat/pull/9162))
+
 - Fix: Unread line ([#9149](https://github.com/RocketChat/Rocket.Chat/pull/9149))
+
 - Fix test without oplog by waiting a successful login on changing users ([#9146](https://github.com/RocketChat/Rocket.Chat/pull/9146))
+
 - Replace postcss-nesting with postcss-nested ([#9200](https://github.com/RocketChat/Rocket.Chat/pull/9200))
+
 - Dependencies Update ([#9197](https://github.com/RocketChat/Rocket.Chat/pull/9197))
+
 - Fix: Rooms and users are using different avatar style ([#9196](https://github.com/RocketChat/Rocket.Chat/pull/9196))
+
 - Typo: German language file ([#9190](https://github.com/RocketChat/Rocket.Chat/pull/9190) by [@TheReal1604](https://github.com/TheReal1604))
+
 - Fix: Snippet name to not showing in snippet list ([#9184](https://github.com/RocketChat/Rocket.Chat/pull/9184) by [@karlprieb](https://github.com/karlprieb))
+
 - Fix/api me only return verified ([#9183](https://github.com/RocketChat/Rocket.Chat/pull/9183))
+
 - Fix: UI: Descenders of glyphs are cut off ([#9181](https://github.com/RocketChat/Rocket.Chat/pull/9181))
+
 - Fix: Unneeded warning in payload of REST API calls ([#9240](https://github.com/RocketChat/Rocket.Chat/pull/9240))
+
 - Fix: Missing option to set user's avatar from a url ([#9229](https://github.com/RocketChat/Rocket.Chat/pull/9229))
+
 - Fix: updating last message on message edit or delete ([#9227](https://github.com/RocketChat/Rocket.Chat/pull/9227))
+
 - Fix: Username find is matching partially ([#9217](https://github.com/RocketChat/Rocket.Chat/pull/9217))
+
 - Fix: Upload access control too distributed ([#9215](https://github.com/RocketChat/Rocket.Chat/pull/9215))
+
 - Do not change room icon color when room is unread ([#9257](https://github.com/RocketChat/Rocket.Chat/pull/9257))
+
 - LingoHub based on develop ([#9256](https://github.com/RocketChat/Rocket.Chat/pull/9256))
+
 - Add curl, its missing on worker nodes so has to be explicitly added ([#9248](https://github.com/RocketChat/Rocket.Chat/pull/9248))
+
 - Fix: Sidebar item on rtl and small devices ([#9247](https://github.com/RocketChat/Rocket.Chat/pull/9247) by [@karlprieb](https://github.com/karlprieb))
 
 </details>
@@ -5648,6 +8245,7 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Fix tag build ([#8973](https://github.com/RocketChat/Rocket.Chat/pull/8973))
 
 </details>
@@ -5666,6 +8264,7 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Fix CircleCI deploy filter ([#8972](https://github.com/RocketChat/Rocket.Chat/pull/8972))
 
 </details>
@@ -5683,12 +8282,15 @@
 
 ### 🐛 Bug fixes
 
+
 - Channel settings buttons ([#8753](https://github.com/RocketChat/Rocket.Chat/pull/8753) by [@karlprieb](https://github.com/karlprieb))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release/0.59.4 ([#8967](https://github.com/RocketChat/Rocket.Chat/pull/8967) by [@cpitman](https://github.com/cpitman) & [@karlprieb](https://github.com/karlprieb))
+
 - Add CircleCI ([#8685](https://github.com/RocketChat/Rocket.Chat/pull/8685))
 
 </details>
@@ -5713,18 +8315,27 @@
 
 ### 🐛 Bug fixes
 
+
 - AmazonS3: Quote file.name for ContentDisposition for files with commas ([#8593](https://github.com/RocketChat/Rocket.Chat/pull/8593) by [@xenithorb](https://github.com/xenithorb))
+
 - Fix e-mail message forward ([#8645](https://github.com/RocketChat/Rocket.Chat/pull/8645))
+
 - Audio message icon ([#8648](https://github.com/RocketChat/Rocket.Chat/pull/8648) by [@karlprieb](https://github.com/karlprieb))
+
 - Highlighted color height issue ([#8431](https://github.com/RocketChat/Rocket.Chat/pull/8431) by [@cyclops24](https://github.com/cyclops24))
+
 - Update pt-BR translation ([#8655](https://github.com/RocketChat/Rocket.Chat/pull/8655) by [@rodorgas](https://github.com/rodorgas))
+
 - Fix typos ([#8679](https://github.com/RocketChat/Rocket.Chat/pull/8679))
+
 - LDAP not respecting UTF8 characters & Sync Interval not working ([#8691](https://github.com/RocketChat/Rocket.Chat/pull/8691))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - removing a duplicate line ([#8434](https://github.com/RocketChat/Rocket.Chat/pull/8434) by [@vikaskedia](https://github.com/vikaskedia))
+
 - install grpc package manually to fix snap armhf build ([#8653](https://github.com/RocketChat/Rocket.Chat/pull/8653))
 
 </details>
@@ -5752,11 +8363,17 @@
 
 ### 🐛 Bug fixes
 
+
 - Missing scroll at create channel page ([#8637](https://github.com/RocketChat/Rocket.Chat/pull/8637) by [@karlprieb](https://github.com/karlprieb))
+
 - Message popup menu on mobile/cordova ([#8634](https://github.com/RocketChat/Rocket.Chat/pull/8634) by [@karlprieb](https://github.com/karlprieb))
+
 - API channel/group.members not sorting ([#8635](https://github.com/RocketChat/Rocket.Chat/pull/8635))
+
 - LDAP not merging existent users && Wrong id link generation ([#8613](https://github.com/RocketChat/Rocket.Chat/pull/8613))
+
 - encode filename in url to prevent links breaking ([#8551](https://github.com/RocketChat/Rocket.Chat/pull/8551) by [@joesitton](https://github.com/joesitton))
+
 - Fix guest pool inquiry taking ([#8577](https://github.com/RocketChat/Rocket.Chat/pull/8577))
 
 ### 👩‍💻👨‍💻 Contributors 😍
@@ -5778,9 +8395,13 @@
 
 ### 🐛 Bug fixes
 
+
 - Color reset when default value editor is different ([#8543](https://github.com/RocketChat/Rocket.Chat/pull/8543))
+
 - Wrong colors after migration 103 ([#8547](https://github.com/RocketChat/Rocket.Chat/pull/8547))
+
 - LDAP login error regression at 0.59.0 ([#8541](https://github.com/RocketChat/Rocket.Chat/pull/8541))
+
 - Migration 103 wrong converting primrary colors ([#8544](https://github.com/RocketChat/Rocket.Chat/pull/8544))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -5797,202 +8418,392 @@
 
 ### 🎉 New features
 
+
 - Replace message cog for vertical menu ([#7864](https://github.com/RocketChat/Rocket.Chat/pull/7864) by [@karlprieb](https://github.com/karlprieb))
+
 - block users to mention unknow users ([#7830](https://github.com/RocketChat/Rocket.Chat/pull/7830))
+
 - Allow ldap mapping of customFields ([#7614](https://github.com/RocketChat/Rocket.Chat/pull/7614) by [@goiaba](https://github.com/goiaba))
+
 - Create a standard for our svg icons ([#7853](https://github.com/RocketChat/Rocket.Chat/pull/7853) by [@karlprieb](https://github.com/karlprieb))
+
 - Allows admin to list all groups with API ([#7565](https://github.com/RocketChat/Rocket.Chat/pull/7565) by [@mboudet](https://github.com/mboudet))
+
 - Add markdown parser "marked" ([#7852](https://github.com/RocketChat/Rocket.Chat/pull/7852) by [@nishimaki10](https://github.com/nishimaki10))
+
 - Audio Notification updated in sidebar ([#7817](https://github.com/RocketChat/Rocket.Chat/pull/7817) by [@aditya19496](https://github.com/aditya19496) & [@maarten-v](https://github.com/maarten-v))
+
 - Search users by fields defined by admin ([#7612](https://github.com/RocketChat/Rocket.Chat/pull/7612) by [@goiaba](https://github.com/goiaba))
+
 - Template to show Custom Fields in user info view ([#7688](https://github.com/RocketChat/Rocket.Chat/pull/7688) by [@goiaba](https://github.com/goiaba))
+
 - Add room type as a class to the ul-group of rooms ([#7711](https://github.com/RocketChat/Rocket.Chat/pull/7711) by [@danischreiber](https://github.com/danischreiber))
+
 - Add classes to notification menu so they can be hidden in css ([#7636](https://github.com/RocketChat/Rocket.Chat/pull/7636) by [@danischreiber](https://github.com/danischreiber))
+
 - Adds a Keyboard Shortcut option to the flextab ([#5902](https://github.com/RocketChat/Rocket.Chat/pull/5902) by [@cnash](https://github.com/cnash) & [@karlprieb](https://github.com/karlprieb))
+
 - Integrated personal email gateway (GSoC'17) ([#7342](https://github.com/RocketChat/Rocket.Chat/pull/7342) by [@pkgodara](https://github.com/pkgodara))
+
 - Add tags to uploaded images using Google Cloud Vision API ([#6301](https://github.com/RocketChat/Rocket.Chat/pull/6301) by [@karlprieb](https://github.com/karlprieb))
+
 - Package to render issue numbers into links to an issue tracker. ([#6700](https://github.com/RocketChat/Rocket.Chat/pull/6700) by [@TAdeJong](https://github.com/TAdeJong) & [@TobiasKappe](https://github.com/TobiasKappe))
+
 - Automatically select the first channel ([#7350](https://github.com/RocketChat/Rocket.Chat/pull/7350) by [@antaryami-sahoo](https://github.com/antaryami-sahoo))
+
 - Rocket.Chat UI Redesign ([#7643](https://github.com/RocketChat/Rocket.Chat/pull/7643))
+
 - Upgrade to meteor 1.5.2 ([#8073](https://github.com/RocketChat/Rocket.Chat/pull/8073))
+
 - Enable read only channel creation ([#8260](https://github.com/RocketChat/Rocket.Chat/pull/8260) by [@karlprieb](https://github.com/karlprieb))
+
 - Add RD Station integration to livechat ([#8304](https://github.com/RocketChat/Rocket.Chat/pull/8304))
+
 - Unify unread and mentions badge ([#8361](https://github.com/RocketChat/Rocket.Chat/pull/8361) by [@karlprieb](https://github.com/karlprieb))
+
 - make sidebar item width 100% ([#8362](https://github.com/RocketChat/Rocket.Chat/pull/8362) by [@karlprieb](https://github.com/karlprieb))
+
 - Smaller accountBox ([#8360](https://github.com/RocketChat/Rocket.Chat/pull/8360) by [@karlprieb](https://github.com/karlprieb))
+
 - Setting to disable MarkDown and enable AutoLinker ([#8459](https://github.com/RocketChat/Rocket.Chat/pull/8459))
 
 ### 🐛 Bug fixes
 
+
 - File upload on multi-instances using a path prefix ([#7855](https://github.com/RocketChat/Rocket.Chat/pull/7855) by [@Darkneon](https://github.com/Darkneon))
+
 - Fix migration 100 ([#7863](https://github.com/RocketChat/Rocket.Chat/pull/7863))
+
 - Email message forward error ([#7846](https://github.com/RocketChat/Rocket.Chat/pull/7846))
+
 - Add CSS support for Safari versions > 7 ([#7854](https://github.com/RocketChat/Rocket.Chat/pull/7854))
+
 - Fix black background on transparent avatars ([#7168](https://github.com/RocketChat/Rocket.Chat/pull/7168))
+
 - Google vision NSFW tag ([#7825](https://github.com/RocketChat/Rocket.Chat/pull/7825))
+
 - meteor-accounts-saml issue with ns0,ns1 namespaces, makes it compatible with pysaml2 lib ([#7721](https://github.com/RocketChat/Rocket.Chat/pull/7721) by [@arminfelder](https://github.com/arminfelder))
+
 - Fix new-message button showing on search ([#7823](https://github.com/RocketChat/Rocket.Chat/pull/7823))
+
 - Settings not getting applied from Meteor.settings and process.env  ([#7779](https://github.com/RocketChat/Rocket.Chat/pull/7779) by [@Darkneon](https://github.com/Darkneon))
+
 - scroll on flex-tab ([#7748](https://github.com/RocketChat/Rocket.Chat/pull/7748))
+
 - Dutch translations ([#7815](https://github.com/RocketChat/Rocket.Chat/pull/7815) by [@maarten-v](https://github.com/maarten-v))
+
 - Fix Dutch translation ([#7814](https://github.com/RocketChat/Rocket.Chat/pull/7814) by [@maarten-v](https://github.com/maarten-v))
+
 - Update Snap links ([#7778](https://github.com/RocketChat/Rocket.Chat/pull/7778) by [@MichaelGooden](https://github.com/MichaelGooden))
+
 - Remove redundant "do" in "Are you sure ...?" messages. ([#7809](https://github.com/RocketChat/Rocket.Chat/pull/7809) by [@xurizaemon](https://github.com/xurizaemon))
+
 - Fixed function closure syntax allowing validation emails to be sent. ([#7758](https://github.com/RocketChat/Rocket.Chat/pull/7758) by [@snoozan](https://github.com/snoozan))
+
 - Fix avatar upload fail on Cordova app ([#7656](https://github.com/RocketChat/Rocket.Chat/pull/7656) by [@ccfang](https://github.com/ccfang))
+
 - Make link inside YouTube preview open in new tab ([#7679](https://github.com/RocketChat/Rocket.Chat/pull/7679) by [@1lann](https://github.com/1lann))
+
 - Remove references to non-existent tests ([#7672](https://github.com/RocketChat/Rocket.Chat/pull/7672) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - Example usage of unsubscribe.js ([#7673](https://github.com/RocketChat/Rocket.Chat/pull/7673) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - sidebar paddings ([#7880](https://github.com/RocketChat/Rocket.Chat/pull/7880) by [@karlprieb](https://github.com/karlprieb))
+
 - Adds default search text padding for emoji search ([#7878](https://github.com/RocketChat/Rocket.Chat/pull/7878) by [@gdelavald](https://github.com/gdelavald))
+
 - search results position on sidebar ([#7881](https://github.com/RocketChat/Rocket.Chat/pull/7881) by [@karlprieb](https://github.com/karlprieb))
+
 - hyperlink style on sidebar footer ([#7882](https://github.com/RocketChat/Rocket.Chat/pull/7882) by [@karlprieb](https://github.com/karlprieb))
+
 - popover position on mobile ([#7883](https://github.com/RocketChat/Rocket.Chat/pull/7883) by [@karlprieb](https://github.com/karlprieb))
+
 - message actions over unread bar ([#7885](https://github.com/RocketChat/Rocket.Chat/pull/7885) by [@karlprieb](https://github.com/karlprieb))
+
 - livechat icon ([#7886](https://github.com/RocketChat/Rocket.Chat/pull/7886) by [@karlprieb](https://github.com/karlprieb))
+
 - Makes text action menu width based on content size ([#7887](https://github.com/RocketChat/Rocket.Chat/pull/7887) by [@gdelavald](https://github.com/gdelavald))
+
 - sidebar buttons and badge paddings ([#7888](https://github.com/RocketChat/Rocket.Chat/pull/7888) by [@karlprieb](https://github.com/karlprieb))
+
 - Fix google play logo on repo README ([#7912](https://github.com/RocketChat/Rocket.Chat/pull/7912) by [@luizbills](https://github.com/luizbills))
+
 - Fix livechat toggle UI issue ([#7904](https://github.com/RocketChat/Rocket.Chat/pull/7904))
+
 - Remove break change in Realtime API ([#7895](https://github.com/RocketChat/Rocket.Chat/pull/7895))
+
 - Window exception when parsing Markdown on server ([#7893](https://github.com/RocketChat/Rocket.Chat/pull/7893))
+
 - Text area buttons and layout on mobile  ([#7985](https://github.com/RocketChat/Rocket.Chat/pull/7985))
+
 - Double scroll on 'keyboard shortcuts' menu in sidepanel ([#7927](https://github.com/RocketChat/Rocket.Chat/pull/7927) by [@aditya19496](https://github.com/aditya19496))
+
 - Broken embedded view layout ([#7944](https://github.com/RocketChat/Rocket.Chat/pull/7944) by [@karlprieb](https://github.com/karlprieb))
+
 - Textarea on firefox ([#7986](https://github.com/RocketChat/Rocket.Chat/pull/7986))
+
 - Chat box no longer auto-focuses when typing ([#7984](https://github.com/RocketChat/Rocket.Chat/pull/7984))
+
 - Add padding on messages to allow space to the action buttons ([#7971](https://github.com/RocketChat/Rocket.Chat/pull/7971))
+
 - Small alignment fixes ([#7970](https://github.com/RocketChat/Rocket.Chat/pull/7970))
+
 - Markdown being rendered in code tags ([#7965](https://github.com/RocketChat/Rocket.Chat/pull/7965))
+
 - Fix the status on the members list ([#7963](https://github.com/RocketChat/Rocket.Chat/pull/7963))
+
 - status and active room colors on sidebar ([#7960](https://github.com/RocketChat/Rocket.Chat/pull/7960) by [@karlprieb](https://github.com/karlprieb))
+
 - OTR buttons padding ([#7954](https://github.com/RocketChat/Rocket.Chat/pull/7954) by [@karlprieb](https://github.com/karlprieb))
+
 - username ellipsis on firefox ([#7953](https://github.com/RocketChat/Rocket.Chat/pull/7953) by [@karlprieb](https://github.com/karlprieb))
+
 - Document README.md. Drupal repo out of date ([#7948](https://github.com/RocketChat/Rocket.Chat/pull/7948) by [@Lawri-van-Buel](https://github.com/Lawri-van-Buel))
+
 - Fix placeholders in account profile ([#7945](https://github.com/RocketChat/Rocket.Chat/pull/7945) by [@josiasds](https://github.com/josiasds))
+
 - Broken emoji picker on firefox ([#7943](https://github.com/RocketChat/Rocket.Chat/pull/7943) by [@karlprieb](https://github.com/karlprieb))
+
 - Create channel button on Firefox ([#7942](https://github.com/RocketChat/Rocket.Chat/pull/7942) by [@karlprieb](https://github.com/karlprieb))
+
 - Show leader on first load ([#7712](https://github.com/RocketChat/Rocket.Chat/pull/7712) by [@danischreiber](https://github.com/danischreiber))
+
 - Vertical menu on flex-tab ([#7988](https://github.com/RocketChat/Rocket.Chat/pull/7988) by [@karlprieb](https://github.com/karlprieb))
+
 - Invisible leader bar on hover ([#8048](https://github.com/RocketChat/Rocket.Chat/pull/8048))
+
 - Prevent autotranslate tokens race condition ([#8046](https://github.com/RocketChat/Rocket.Chat/pull/8046))
+
 - copy to clipboard and update clipboard.js library ([#8039](https://github.com/RocketChat/Rocket.Chat/pull/8039) by [@karlprieb](https://github.com/karlprieb))
+
 - message-box autogrow ([#8019](https://github.com/RocketChat/Rocket.Chat/pull/8019) by [@karlprieb](https://github.com/karlprieb))
+
 - search results height ([#8018](https://github.com/RocketChat/Rocket.Chat/pull/8018) by [@gdelavald](https://github.com/gdelavald) & [@karlprieb](https://github.com/karlprieb))
+
 - room icon on header ([#8017](https://github.com/RocketChat/Rocket.Chat/pull/8017) by [@karlprieb](https://github.com/karlprieb))
+
 - Hide scrollbar on login page if not necessary ([#8014](https://github.com/RocketChat/Rocket.Chat/pull/8014) by [@alexbrazier](https://github.com/alexbrazier))
+
 - Error when translating message ([#8001](https://github.com/RocketChat/Rocket.Chat/pull/8001))
+
 - Recent emojis not updated when adding via text ([#7998](https://github.com/RocketChat/Rocket.Chat/pull/7998))
+
 - [PL] Polish translation ([#7989](https://github.com/RocketChat/Rocket.Chat/pull/7989) by [@Rzeszow](https://github.com/Rzeszow))
+
 - Fix email on mention ([#7754](https://github.com/RocketChat/Rocket.Chat/pull/7754))
+
 - RTL ([#8112](https://github.com/RocketChat/Rocket.Chat/pull/8112))
+
 - Dynamic popover ([#8101](https://github.com/RocketChat/Rocket.Chat/pull/8101) by [@karlprieb](https://github.com/karlprieb))
+
 - Settings description not showing ([#8122](https://github.com/RocketChat/Rocket.Chat/pull/8122))
+
 - Fix setting user avatar on LDAP login ([#8099](https://github.com/RocketChat/Rocket.Chat/pull/8099))
+
 - Not sending email to mentioned users with unchanged preference ([#8059](https://github.com/RocketChat/Rocket.Chat/pull/8059))
+
 - Scroll on messagebox ([#8047](https://github.com/RocketChat/Rocket.Chat/pull/8047))
+
 - Allow unknown file types if no allowed whitelist has been set (#7074) ([#8172](https://github.com/RocketChat/Rocket.Chat/pull/8172) by [@TriPhoenix](https://github.com/TriPhoenix))
+
 - Issue #8166 where empty analytics setting breaks to load Piwik script ([#8167](https://github.com/RocketChat/Rocket.Chat/pull/8167) by [@ruKurz](https://github.com/ruKurz))
+
 - Sidebar and RTL alignments ([#8154](https://github.com/RocketChat/Rocket.Chat/pull/8154) by [@karlprieb](https://github.com/karlprieb))
+
 - "*.members" rest api being useless and only returning usernames ([#8147](https://github.com/RocketChat/Rocket.Chat/pull/8147))
+
 - Fix iframe login API response (issue #8145) ([#8146](https://github.com/RocketChat/Rocket.Chat/pull/8146) by [@astax-t](https://github.com/astax-t))
+
 - Text area lost text when page reloads ([#8159](https://github.com/RocketChat/Rocket.Chat/pull/8159))
+
 - Fix new room sound being played too much ([#8144](https://github.com/RocketChat/Rocket.Chat/pull/8144))
+
 - Add admin audio preferences translations ([#8094](https://github.com/RocketChat/Rocket.Chat/pull/8094))
+
 - Leave and hide buttons was removed ([#8213](https://github.com/RocketChat/Rocket.Chat/pull/8213) by [@karlprieb](https://github.com/karlprieb))
+
 - Incorrect URL for login terms when using prefix ([#8211](https://github.com/RocketChat/Rocket.Chat/pull/8211) by [@Darkneon](https://github.com/Darkneon))
+
 - User avatar in DM list. ([#8210](https://github.com/RocketChat/Rocket.Chat/pull/8210))
+
 - Scrollbar not using new style ([#8190](https://github.com/RocketChat/Rocket.Chat/pull/8190))
+
 - sidenav colors, hide and leave, create channel on safari ([#8257](https://github.com/RocketChat/Rocket.Chat/pull/8257) by [@karlprieb](https://github.com/karlprieb))
+
 - make sidebar item animation fast ([#8262](https://github.com/RocketChat/Rocket.Chat/pull/8262) by [@karlprieb](https://github.com/karlprieb))
+
 - RTL on reply ([#8261](https://github.com/RocketChat/Rocket.Chat/pull/8261) by [@karlprieb](https://github.com/karlprieb))
+
 - clipboard and permalink on new popover ([#8259](https://github.com/RocketChat/Rocket.Chat/pull/8259) by [@karlprieb](https://github.com/karlprieb))
+
 - sidenav mentions on hover ([#8252](https://github.com/RocketChat/Rocket.Chat/pull/8252) by [@karlprieb](https://github.com/karlprieb))
+
 - Api groups.files is always returning empty ([#8241](https://github.com/RocketChat/Rocket.Chat/pull/8241))
+
 - Case insensitive SAML email check ([#8216](https://github.com/RocketChat/Rocket.Chat/pull/8216) by [@arminfelder](https://github.com/arminfelder))
+
 - Execute meteor reset on TRAVIS_TAG builds ([#8310](https://github.com/RocketChat/Rocket.Chat/pull/8310))
+
 - Call buttons with wrong margin on RTL ([#8307](https://github.com/RocketChat/Rocket.Chat/pull/8307) by [@karlprieb](https://github.com/karlprieb))
+
 - Emoji Picker hidden for reactions in RTL ([#8300](https://github.com/RocketChat/Rocket.Chat/pull/8300) by [@karlprieb](https://github.com/karlprieb))
+
 - Amin menu not showing all items & File list breaking line ([#8299](https://github.com/RocketChat/Rocket.Chat/pull/8299) by [@karlprieb](https://github.com/karlprieb))
+
 - TypeError: Cannot read property 't' of undefined ([#8298](https://github.com/RocketChat/Rocket.Chat/pull/8298))
+
 - Wrong file name when upload to AWS S3 ([#8296](https://github.com/RocketChat/Rocket.Chat/pull/8296))
+
 - Check attachments is defined before accessing first element ([#8295](https://github.com/RocketChat/Rocket.Chat/pull/8295) by [@Darkneon](https://github.com/Darkneon))
+
 - Missing placeholder translations ([#8286](https://github.com/RocketChat/Rocket.Chat/pull/8286))
+
 - fix color on unread messages ([#8282](https://github.com/RocketChat/Rocket.Chat/pull/8282))
+
 - "Cancel button" on modal in RTL in Firefox 55 ([#8278](https://github.com/RocketChat/Rocket.Chat/pull/8278) by [@cyclops24](https://github.com/cyclops24))
+
 - Attachment icons alignment in LTR and RTL ([#8271](https://github.com/RocketChat/Rocket.Chat/pull/8271) by [@cyclops24](https://github.com/cyclops24))
+
 - [i18n] My Profile & README.md links ([#8270](https://github.com/RocketChat/Rocket.Chat/pull/8270) by [@Rzeszow](https://github.com/Rzeszow))
+
 - some placeholder and phrase traslation fix ([#8269](https://github.com/RocketChat/Rocket.Chat/pull/8269) by [@cyclops24](https://github.com/cyclops24))
+
 - "Channel Setting" buttons alignment in RTL ([#8266](https://github.com/RocketChat/Rocket.Chat/pull/8266) by [@cyclops24](https://github.com/cyclops24))
+
 - Removing pipe and commas from custom emojis (#8168) ([#8237](https://github.com/RocketChat/Rocket.Chat/pull/8237) by [@matheusml](https://github.com/matheusml))
+
 - After deleting the room, cache is not synchronizing ([#8314](https://github.com/RocketChat/Rocket.Chat/pull/8314) by [@szluohua](https://github.com/szluohua))
+
 - Remove sidebar header on admin embedded version ([#8334](https://github.com/RocketChat/Rocket.Chat/pull/8334) by [@karlprieb](https://github.com/karlprieb))
+
 - Email Subjects not being sent ([#8317](https://github.com/RocketChat/Rocket.Chat/pull/8317))
+
 - Put delete action on another popover group ([#8315](https://github.com/RocketChat/Rocket.Chat/pull/8315) by [@karlprieb](https://github.com/karlprieb))
+
 - Mention unread indicator was removed ([#8316](https://github.com/RocketChat/Rocket.Chat/pull/8316))
+
 - Various LDAP issues & Missing pagination ([#8372](https://github.com/RocketChat/Rocket.Chat/pull/8372))
+
 - remove accountBox from admin menu ([#8358](https://github.com/RocketChat/Rocket.Chat/pull/8358) by [@karlprieb](https://github.com/karlprieb))
+
 - Missing i18n translations ([#8357](https://github.com/RocketChat/Rocket.Chat/pull/8357))
+
 - Sidebar item menu position in RTL ([#8397](https://github.com/RocketChat/Rocket.Chat/pull/8397) by [@cyclops24](https://github.com/cyclops24))
+
 - disabled katex tooltip on messageBox ([#8386](https://github.com/RocketChat/Rocket.Chat/pull/8386))
+
 - LDAP memory issues when pagination is not available ([#8457](https://github.com/RocketChat/Rocket.Chat/pull/8457))
+
 - Uncessary route reload break some routes ([#8514](https://github.com/RocketChat/Rocket.Chat/pull/8514))
+
 - Invalid Code message for password protected channel ([#8491](https://github.com/RocketChat/Rocket.Chat/pull/8491))
+
 - Wrong message when reseting password and 2FA is enabled ([#8489](https://github.com/RocketChat/Rocket.Chat/pull/8489))
+
 - Do not send joinCode field to clients ([#8527](https://github.com/RocketChat/Rocket.Chat/pull/8527))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Merge 0.58.4 to master ([#8420](https://github.com/RocketChat/Rocket.Chat/pull/8420))
+
 - 0.58.3 ([#8335](https://github.com/RocketChat/Rocket.Chat/pull/8335))
+
 - Mobile sidenav ([#7865](https://github.com/RocketChat/Rocket.Chat/pull/7865))
+
 - npm deps update ([#7842](https://github.com/RocketChat/Rocket.Chat/pull/7842))
+
 - LingoHub based on develop ([#7803](https://github.com/RocketChat/Rocket.Chat/pull/7803))
+
 - Additions to the REST API ([#7793](https://github.com/RocketChat/Rocket.Chat/pull/7793))
+
 - npm deps update ([#7755](https://github.com/RocketChat/Rocket.Chat/pull/7755))
+
 - FIX: Error when starting local development environment ([#7728](https://github.com/RocketChat/Rocket.Chat/pull/7728) by [@rdebeasi](https://github.com/rdebeasi))
+
 - Remove CircleCI ([#7739](https://github.com/RocketChat/Rocket.Chat/pull/7739))
+
 - Meteor packages and npm dependencies update ([#7677](https://github.com/RocketChat/Rocket.Chat/pull/7677))
+
 - [MOVE] Client folder rocketchat-colors ([#7664](https://github.com/RocketChat/Rocket.Chat/pull/7664) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - [MOVE] Client folder rocketchat-custom-oauth ([#7665](https://github.com/RocketChat/Rocket.Chat/pull/7665) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - [MOVE] Client folder rocketchat-tooltip ([#7666](https://github.com/RocketChat/Rocket.Chat/pull/7666) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - [MOVE] Client folder rocketchat-autolinker ([#7667](https://github.com/RocketChat/Rocket.Chat/pull/7667) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - [MOVE] Client folder rocketchat-cas ([#7668](https://github.com/RocketChat/Rocket.Chat/pull/7668) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - [MOVE] Client folder rocketchat-highlight-words ([#7669](https://github.com/RocketChat/Rocket.Chat/pull/7669) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - [MOVE] Client folder rocketchat-custom-sounds ([#7670](https://github.com/RocketChat/Rocket.Chat/pull/7670) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - [MOVE] Client folder rocketchat-emoji ([#7671](https://github.com/RocketChat/Rocket.Chat/pull/7671) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - Fix typo in generated URI ([#7661](https://github.com/RocketChat/Rocket.Chat/pull/7661) by [@Rohlik](https://github.com/Rohlik))
+
 - Bump version to 0.59.0-develop ([#7625](https://github.com/RocketChat/Rocket.Chat/pull/7625))
+
 - implemented new page-loader animated icon ([#2](https://github.com/RocketChat/Rocket.Chat/pull/2))
+
 - Hide flex-tab close button ([#7894](https://github.com/RocketChat/Rocket.Chat/pull/7894) by [@karlprieb](https://github.com/karlprieb))
+
 - Update BlackDuck URL ([#7941](https://github.com/RocketChat/Rocket.Chat/pull/7941))
+
 - [DOCS] Add native mobile app links into README and update button images ([#7909](https://github.com/RocketChat/Rocket.Chat/pull/7909) by [@rafaelks](https://github.com/rafaelks))
+
 - Remove unnecessary returns in cors common ([#8054](https://github.com/RocketChat/Rocket.Chat/pull/8054) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - npm deps update ([#8197](https://github.com/RocketChat/Rocket.Chat/pull/8197))
+
 - Fix more rtl issues ([#8194](https://github.com/RocketChat/Rocket.Chat/pull/8194) by [@karlprieb](https://github.com/karlprieb))
+
 - readme-file: fix broken link ([#8253](https://github.com/RocketChat/Rocket.Chat/pull/8253) by [@vcapretz](https://github.com/vcapretz))
+
 - Disable perfect scrollbar ([#8244](https://github.com/RocketChat/Rocket.Chat/pull/8244))
+
 - Fix `leave and hide` click, color and position ([#8243](https://github.com/RocketChat/Rocket.Chat/pull/8243) by [@karlprieb](https://github.com/karlprieb))
+
 - Deps update ([#8273](https://github.com/RocketChat/Rocket.Chat/pull/8273))
+
 - Update meteor to 1.5.2.2-rc.0 ([#8355](https://github.com/RocketChat/Rocket.Chat/pull/8355))
+
 - [FIX-RC] Mobile file upload not working ([#8331](https://github.com/RocketChat/Rocket.Chat/pull/8331) by [@karlprieb](https://github.com/karlprieb))
+
 - LingoHub based on develop ([#8375](https://github.com/RocketChat/Rocket.Chat/pull/8375))
+
 - Update Meteor to 1.5.2.2 ([#8364](https://github.com/RocketChat/Rocket.Chat/pull/8364))
+
 - Sync translations from LingoHub ([#8363](https://github.com/RocketChat/Rocket.Chat/pull/8363))
+
 - Remove field `lastActivity` from subscription data ([#8345](https://github.com/RocketChat/Rocket.Chat/pull/8345))
+
 - Fix: Account menu position on RTL ([#8416](https://github.com/RocketChat/Rocket.Chat/pull/8416) by [@karlprieb](https://github.com/karlprieb))
+
 - Fix: Missing LDAP option to show internal logs ([#8417](https://github.com/RocketChat/Rocket.Chat/pull/8417))
+
 - Fix: Missing LDAP reconnect setting ([#8414](https://github.com/RocketChat/Rocket.Chat/pull/8414))
+
 - Add i18n Title to snippet messages ([#8394](https://github.com/RocketChat/Rocket.Chat/pull/8394))
+
 - Fix: Missing settings to configure LDAP size and page limits ([#8398](https://github.com/RocketChat/Rocket.Chat/pull/8398))
+
 - Improve markdown parser code ([#8451](https://github.com/RocketChat/Rocket.Chat/pull/8451))
+
 - Change artifact path ([#8515](https://github.com/RocketChat/Rocket.Chat/pull/8515))
+
 - Color variables migration ([#8463](https://github.com/RocketChat/Rocket.Chat/pull/8463) by [@karlprieb](https://github.com/karlprieb))
+
 - Fix: Change password not working in new UI ([#8516](https://github.com/RocketChat/Rocket.Chat/pull/8516))
+
 - Enable AutoLinker back ([#8490](https://github.com/RocketChat/Rocket.Chat/pull/8490))
+
 - Fix artifact path ([#8518](https://github.com/RocketChat/Rocket.Chat/pull/8518))
+
 - Fix high CPU load when sending messages on large rooms (regression) ([#8520](https://github.com/RocketChat/Rocket.Chat/pull/8520))
+
 - Improve room sync speed ([#8529](https://github.com/RocketChat/Rocket.Chat/pull/8529))
 
 </details>
@@ -6064,6 +8875,7 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.58.2 ([#7841](https://github.com/RocketChat/Rocket.Chat/pull/7841) by [@snoozan](https://github.com/snoozan))
 
 </details>
@@ -6085,11 +8897,13 @@
 
 ### 🐛 Bug fixes
 
+
 - Fix flex tab not opening and getting offscreen ([#7781](https://github.com/RocketChat/Rocket.Chat/pull/7781))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.58.1 ([#7782](https://github.com/RocketChat/Rocket.Chat/pull/7782))
 
 </details>
@@ -6108,93 +8922,171 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Remove Sandstorm login method ([#7556](https://github.com/RocketChat/Rocket.Chat/pull/7556))
 
 ### 🎉 New features
 
+
 - Allow special chars on room names ([#7595](https://github.com/RocketChat/Rocket.Chat/pull/7595))
+
 - Add admin and user setting for notifications #4339 ([#7479](https://github.com/RocketChat/Rocket.Chat/pull/7479) by [@stalley](https://github.com/stalley))
+
 - Edit user permissions ([#7309](https://github.com/RocketChat/Rocket.Chat/pull/7309))
+
 - Adding support for piwik sub domain settings ([#7324](https://github.com/RocketChat/Rocket.Chat/pull/7324) by [@ruKurz](https://github.com/ruKurz))
+
 - Add setting to change User Agent of OEmbed calls ([#6753](https://github.com/RocketChat/Rocket.Chat/pull/6753) by [@AhmetS](https://github.com/AhmetS))
+
 - Configurable Volume for Notifications #6087 ([#7517](https://github.com/RocketChat/Rocket.Chat/pull/7517) by [@lindoelio](https://github.com/lindoelio))
+
 - Add customFields in rooms/get method ([#6564](https://github.com/RocketChat/Rocket.Chat/pull/6564) by [@borsden](https://github.com/borsden))
+
 - Option to select unread count style ([#7589](https://github.com/RocketChat/Rocket.Chat/pull/7589))
+
 - Show different shape for alert numbers when have mentions ([#7580](https://github.com/RocketChat/Rocket.Chat/pull/7580))
+
 - Add reaction to the last message when get the shortcut +: ([#7569](https://github.com/RocketChat/Rocket.Chat/pull/7569) by [@danilomiranda](https://github.com/danilomiranda))
+
 - Show emojis and file uploads on notifications ([#7559](https://github.com/RocketChat/Rocket.Chat/pull/7559))
+
 - Closes tab bar on mobile when leaving room ([#7561](https://github.com/RocketChat/Rocket.Chat/pull/7561) by [@gdelavald](https://github.com/gdelavald))
+
 - Adds preference to one-click-to-direct-message and basic functionality ([#7564](https://github.com/RocketChat/Rocket.Chat/pull/7564) by [@gdelavald](https://github.com/gdelavald))
+
 - Search users also by email in toolbar ([#7334](https://github.com/RocketChat/Rocket.Chat/pull/7334) by [@shahar3012](https://github.com/shahar3012))
+
 - Do not rate limit bots on createDirectMessage ([#7326](https://github.com/RocketChat/Rocket.Chat/pull/7326) by [@jangmarker](https://github.com/jangmarker))
+
 - Allow channel property in the integrations returned content ([#7214](https://github.com/RocketChat/Rocket.Chat/pull/7214))
+
 - Add room type identifier to room list header ([#7520](https://github.com/RocketChat/Rocket.Chat/pull/7520) by [@danischreiber](https://github.com/danischreiber))
+
 - Room type and recipient data for global event ([#7523](https://github.com/RocketChat/Rocket.Chat/pull/7523) by [@danischreiber](https://github.com/danischreiber))
+
 - Show room leader at top of chat when user scrolls down. Set and unset leader as admin. ([#7526](https://github.com/RocketChat/Rocket.Chat/pull/7526) by [@danischreiber](https://github.com/danischreiber))
+
 - Add toolbar buttons for iframe API ([#7525](https://github.com/RocketChat/Rocket.Chat/pull/7525))
+
 - Add close button to flex tabs ([#7529](https://github.com/RocketChat/Rocket.Chat/pull/7529))
+
 - Update meteor to 1.5.1 ([#7496](https://github.com/RocketChat/Rocket.Chat/pull/7496))
+
 - flex-tab now is side by side with message list ([#7448](https://github.com/RocketChat/Rocket.Chat/pull/7448) by [@karlprieb](https://github.com/karlprieb))
+
 - Option to select unread count behavior ([#7477](https://github.com/RocketChat/Rocket.Chat/pull/7477))
+
 - Add healthchecks in OpenShift templates ([#7184](https://github.com/RocketChat/Rocket.Chat/pull/7184) by [@jfchevrette](https://github.com/jfchevrette))
+
 - Add unread options for direct messages ([#7658](https://github.com/RocketChat/Rocket.Chat/pull/7658))
 
 ### 🐛 Bug fixes
 
+
 - Error when updating message with an empty attachment array ([#7624](https://github.com/RocketChat/Rocket.Chat/pull/7624))
+
 - Uploading an unknown file type erroring out ([#7623](https://github.com/RocketChat/Rocket.Chat/pull/7623))
+
 - Error when acessing settings before ready ([#7622](https://github.com/RocketChat/Rocket.Chat/pull/7622))
+
 - Message box on safari ([#7621](https://github.com/RocketChat/Rocket.Chat/pull/7621))
+
 - The username not being allowed to be passed into the user.setAvatar ([#7620](https://github.com/RocketChat/Rocket.Chat/pull/7620))
+
 - Fix Custom Fields Crashing on Register ([#7617](https://github.com/RocketChat/Rocket.Chat/pull/7617))
+
 - Fix admin room list show the correct i18n type ([#7582](https://github.com/RocketChat/Rocket.Chat/pull/7582) by [@ccfang](https://github.com/ccfang))
+
 - URL parse error fix for issue #7169 ([#7538](https://github.com/RocketChat/Rocket.Chat/pull/7538) by [@satyapramodh](https://github.com/satyapramodh))
+
 - User avatar image background ([#7572](https://github.com/RocketChat/Rocket.Chat/pull/7572) by [@filipedelimabrito](https://github.com/filipedelimabrito))
+
 - Look for livechat visitor IP address on X-Forwarded-For header ([#7554](https://github.com/RocketChat/Rocket.Chat/pull/7554))
+
 - Revert emojione package version upgrade ([#7557](https://github.com/RocketChat/Rocket.Chat/pull/7557))
+
 - Stop logging mentions object to console ([#7562](https://github.com/RocketChat/Rocket.Chat/pull/7562) by [@gdelavald](https://github.com/gdelavald))
+
 - Fix hiding flex-tab on embedded view ([#7486](https://github.com/RocketChat/Rocket.Chat/pull/7486))
+
 - Fix emoji picker translations ([#7195](https://github.com/RocketChat/Rocket.Chat/pull/7195))
+
 - Issue #7365: added check for the existence of a parameter in the CAS URL ([#7471](https://github.com/RocketChat/Rocket.Chat/pull/7471) by [@wsw70](https://github.com/wsw70))
+
 - Fix Word Placement Anywhere on WebHooks ([#7392](https://github.com/RocketChat/Rocket.Chat/pull/7392))
+
 - Prevent new room status from playing when user status changes ([#7487](https://github.com/RocketChat/Rocket.Chat/pull/7487))
+
 - url click events in the cordova app open in external browser or not at all ([#7205](https://github.com/RocketChat/Rocket.Chat/pull/7205) by [@flaviogrossi](https://github.com/flaviogrossi))
+
 - sweetalert alignment on mobile ([#7404](https://github.com/RocketChat/Rocket.Chat/pull/7404) by [@karlprieb](https://github.com/karlprieb))
+
 - Sweet-Alert modal popup position on mobile devices ([#7376](https://github.com/RocketChat/Rocket.Chat/pull/7376) by [@Oliver84](https://github.com/Oliver84))
+
 - Update node-engine in Snap to latest v4 LTS relase: 4.8.3 ([#7355](https://github.com/RocketChat/Rocket.Chat/pull/7355) by [@al3x](https://github.com/al3x))
+
 - Remove warning about 2FA support being unavailable in mobile apps ([#7354](https://github.com/RocketChat/Rocket.Chat/pull/7354) by [@al3x](https://github.com/al3x))
+
 - Fix geolocation button ([#7322](https://github.com/RocketChat/Rocket.Chat/pull/7322))
+
 - Fix Block Delete Message After (n) Minutes ([#7207](https://github.com/RocketChat/Rocket.Chat/pull/7207))
+
 - Use I18n on "File Uploaded" ([#7199](https://github.com/RocketChat/Rocket.Chat/pull/7199))
+
 - Fix error on image preview due to undefined description|title  ([#7187](https://github.com/RocketChat/Rocket.Chat/pull/7187))
+
 - Fix messagebox growth ([#7629](https://github.com/RocketChat/Rocket.Chat/pull/7629))
+
 - Wrong render of snippet’s name ([#7630](https://github.com/RocketChat/Rocket.Chat/pull/7630))
+
 - Fix room load on first hit ([#7687](https://github.com/RocketChat/Rocket.Chat/pull/7687))
+
 - Markdown noopener/noreferrer: use correct HTML attribute ([#7644](https://github.com/RocketChat/Rocket.Chat/pull/7644) by [@jangmarker](https://github.com/jangmarker))
+
 - Wrong email subject when "All Messages" setting enabled ([#7639](https://github.com/RocketChat/Rocket.Chat/pull/7639))
+
 - Csv importer: work with more problematic data ([#7456](https://github.com/RocketChat/Rocket.Chat/pull/7456) by [@reist](https://github.com/reist))
+
 - make flex-tab visible again when reduced width ([#7738](https://github.com/RocketChat/Rocket.Chat/pull/7738))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Release 0.58.0 ([#7752](https://github.com/RocketChat/Rocket.Chat/pull/7752) by [@flaviogrossi](https://github.com/flaviogrossi) & [@jangmarker](https://github.com/jangmarker) & [@karlprieb](https://github.com/karlprieb) & [@pierreozoux](https://github.com/pierreozoux) & [@ryoshimizu](https://github.com/ryoshimizu))
+
 - Sync Master with 0.57.3 ([#7690](https://github.com/RocketChat/Rocket.Chat/pull/7690))
+
 - Add missing parts of `one click to direct message` ([#7608](https://github.com/RocketChat/Rocket.Chat/pull/7608))
+
 - LingoHub based on develop ([#7613](https://github.com/RocketChat/Rocket.Chat/pull/7613))
+
 - Improve link parser using tokens ([#7615](https://github.com/RocketChat/Rocket.Chat/pull/7615))
+
 - Improve login error messages ([#7616](https://github.com/RocketChat/Rocket.Chat/pull/7616))
+
 - LingoHub based on develop ([#7594](https://github.com/RocketChat/Rocket.Chat/pull/7594))
+
 - Improve room leader ([#7578](https://github.com/RocketChat/Rocket.Chat/pull/7578))
+
 - Develop sync ([#7590](https://github.com/RocketChat/Rocket.Chat/pull/7590))
+
 - [Fix] Don't save user to DB when a custom field is invalid ([#7513](https://github.com/RocketChat/Rocket.Chat/pull/7513) by [@Darkneon](https://github.com/Darkneon))
+
 - Develop sync ([#7500](https://github.com/RocketChat/Rocket.Chat/pull/7500) by [@thinkeridea](https://github.com/thinkeridea))
+
 - Better Issue Template ([#7492](https://github.com/RocketChat/Rocket.Chat/pull/7492))
+
 - Add helm chart kubernetes deployment ([#6340](https://github.com/RocketChat/Rocket.Chat/pull/6340) by [@pierreozoux](https://github.com/pierreozoux))
+
 - Develop sync ([#7363](https://github.com/RocketChat/Rocket.Chat/pull/7363) by [@JSzaszvari](https://github.com/JSzaszvari))
+
 - Escape error messages ([#7308](https://github.com/RocketChat/Rocket.Chat/pull/7308))
+
 - update meteor to 1.5.0 ([#7287](https://github.com/RocketChat/Rocket.Chat/pull/7287))
+
 - [New] Add instance id to response headers ([#7211](https://github.com/RocketChat/Rocket.Chat/pull/7211))
+
 - Only use "File Uploaded" prefix on files ([#7652](https://github.com/RocketChat/Rocket.Chat/pull/7652))
 
 </details>
@@ -6246,8 +9138,11 @@
 
 ### 🐛 Bug fixes
 
+
 - Slack import failing and not being able to be restarted ([#8390](https://github.com/RocketChat/Rocket.Chat/pull/8390))
+
 - Duplicate code in rest api letting in a few bugs with the rest api ([#8408](https://github.com/RocketChat/Rocket.Chat/pull/8408))
+
 - Add needed dependency for snaps ([#8389](https://github.com/RocketChat/Rocket.Chat/pull/8389))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -6264,18 +9159,27 @@
 
 ### 🐛 Bug fixes
 
+
 - Modernize rate limiting of sendMessage ([#7325](https://github.com/RocketChat/Rocket.Chat/pull/7325) by [@jangmarker](https://github.com/jangmarker))
+
 - custom soundEdit.html ([#7390](https://github.com/RocketChat/Rocket.Chat/pull/7390) by [@rasos](https://github.com/rasos))
+
 - Use UTF8 setting for /create command ([#7394](https://github.com/RocketChat/Rocket.Chat/pull/7394))
+
 - file upload broken when running in subdirectory https://github.com… ([#7395](https://github.com/RocketChat/Rocket.Chat/pull/7395) by [@ryoshimizu](https://github.com/ryoshimizu))
+
 - Fix Anonymous User ([#7444](https://github.com/RocketChat/Rocket.Chat/pull/7444))
+
 - Missing eventName in unUser ([#7533](https://github.com/RocketChat/Rocket.Chat/pull/7533) by [@Darkneon](https://github.com/Darkneon))
+
 - Fix Join Channel Without Preview Room Permission ([#7535](https://github.com/RocketChat/Rocket.Chat/pull/7535))
+
 - Improve build script example ([#7555](https://github.com/RocketChat/Rocket.Chat/pull/7555))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - [Fix] Users and Channels list not respecting permissions ([#7212](https://github.com/RocketChat/Rocket.Chat/pull/7212))
 
 </details>
@@ -6302,11 +9206,17 @@
 
 ### 🐛 Bug fixes
 
+
 - Fix Emails in User Admin View ([#7431](https://github.com/RocketChat/Rocket.Chat/pull/7431))
+
 - Always set LDAP properties on login ([#7472](https://github.com/RocketChat/Rocket.Chat/pull/7472))
+
 - Fix Unread Bar Disappearing ([#7403](https://github.com/RocketChat/Rocket.Chat/pull/7403))
+
 - Fix file upload on Slack import ([#7469](https://github.com/RocketChat/Rocket.Chat/pull/7469))
+
 - Fix Private Channel List Submit ([#7432](https://github.com/RocketChat/Rocket.Chat/pull/7432))
+
 - S3 uploads not working for custom URLs ([#7443](https://github.com/RocketChat/Rocket.Chat/pull/7443))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -6324,6 +9234,7 @@
 
 ### 🐛 Bug fixes
 
+
 - Fix migration of avatars from version 0.57.0 ([#7428](https://github.com/RocketChat/Rocket.Chat/pull/7428))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -6340,100 +9251,185 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - Internal hubot does not load hubot-scripts anymore, it loads scripts from custom folders ([#7095](https://github.com/RocketChat/Rocket.Chat/pull/7095))
 
 ### 🎉 New features
 
+
 - New avatar storage types ([#6788](https://github.com/RocketChat/Rocket.Chat/pull/6788))
+
 - Show full name in mentions if use full name setting enabled ([#6690](https://github.com/RocketChat/Rocket.Chat/pull/6690) by [@alexbrazier](https://github.com/alexbrazier))
+
 - Increase unread message count on @here mention ([#7059](https://github.com/RocketChat/Rocket.Chat/pull/7059))
+
 - API method and REST Endpoint for getting a single message by id ([#7085](https://github.com/RocketChat/Rocket.Chat/pull/7085))
+
 - Migration to add <html> tags to email header and footer ([#7080](https://github.com/RocketChat/Rocket.Chat/pull/7080))
+
 - postcss parser and cssnext implementation ([#6982](https://github.com/RocketChat/Rocket.Chat/pull/6982))
+
 - Start running unit tests ([#6605](https://github.com/RocketChat/Rocket.Chat/pull/6605))
+
 - Make channel/group delete call answer to roomName ([#6857](https://github.com/RocketChat/Rocket.Chat/pull/6857) by [@reist](https://github.com/reist))
+
 - Feature/delete any message permission ([#6919](https://github.com/RocketChat/Rocket.Chat/pull/6919) by [@phutchins](https://github.com/phutchins))
+
 - Force use of MongoDB for spotlight queries ([#7311](https://github.com/RocketChat/Rocket.Chat/pull/7311))
 
 ### 🐛 Bug fixes
 
+
 - Message being displayed unescaped ([#7379](https://github.com/RocketChat/Rocket.Chat/pull/7379) by [@gdelavald](https://github.com/gdelavald))
+
 - Fix highlightjs bug ([#6991](https://github.com/RocketChat/Rocket.Chat/pull/6991))
+
 - do only store password if LDAP_Login_Fallback is on ([#7030](https://github.com/RocketChat/Rocket.Chat/pull/7030) by [@pmb0](https://github.com/pmb0))
+
 - fix bug in preview image ([#7121](https://github.com/RocketChat/Rocket.Chat/pull/7121))
+
 - Fix the failing tests  ([#7094](https://github.com/RocketChat/Rocket.Chat/pull/7094))
+
 - Add option to ignore TLS in SMTP server settings ([#7084](https://github.com/RocketChat/Rocket.Chat/pull/7084) by [@colin-campbell](https://github.com/colin-campbell))
+
 - Add support for carriage return in markdown code blocks ([#7072](https://github.com/RocketChat/Rocket.Chat/pull/7072) by [@jm-factorin](https://github.com/jm-factorin))
+
 - Parse HTML on admin setting's descriptions ([#7014](https://github.com/RocketChat/Rocket.Chat/pull/7014))
+
 - edit button on firefox ([#7105](https://github.com/RocketChat/Rocket.Chat/pull/7105))
+
 - Fix missing CSS files on production builds ([#7104](https://github.com/RocketChat/Rocket.Chat/pull/7104))
+
 - clipboard (permalink, copy, pin, star buttons) ([#7103](https://github.com/RocketChat/Rocket.Chat/pull/7103))
+
 - Fixed typo hmtl -> html ([#7092](https://github.com/RocketChat/Rocket.Chat/pull/7092) by [@jautero](https://github.com/jautero))
+
 - Add <html> and </html> to header and footer ([#7025](https://github.com/RocketChat/Rocket.Chat/pull/7025) by [@ExTechOp](https://github.com/ExTechOp))
+
 - Prevent Ctrl key on message field from reloading messages list ([#7033](https://github.com/RocketChat/Rocket.Chat/pull/7033))
+
 - New screen sharing Chrome extension checking method ([#7044](https://github.com/RocketChat/Rocket.Chat/pull/7044))
+
 - Improve Tests ([#7049](https://github.com/RocketChat/Rocket.Chat/pull/7049))
+
 - Fix avatar upload via users.setAvatar REST endpoint ([#7045](https://github.com/RocketChat/Rocket.Chat/pull/7045))
+
 - Sidenav roomlist ([#7023](https://github.com/RocketChat/Rocket.Chat/pull/7023))
+
 - video message recording dialog is shown in an incorrect position ([#7012](https://github.com/RocketChat/Rocket.Chat/pull/7012) by [@flaviogrossi](https://github.com/flaviogrossi))
+
 - Remove room from roomPick setting ([#6912](https://github.com/RocketChat/Rocket.Chat/pull/6912))
+
 - Parse markdown links last ([#6997](https://github.com/RocketChat/Rocket.Chat/pull/6997))
+
 - overlapping text for users-typing-message ([#6999](https://github.com/RocketChat/Rocket.Chat/pull/6999) by [@darkv](https://github.com/darkv))
+
 - Updating Incoming Integration Post As Field Not Allowed ([#6903](https://github.com/RocketChat/Rocket.Chat/pull/6903))
+
 - Fix error handling for non-valid avatar URL ([#6972](https://github.com/RocketChat/Rocket.Chat/pull/6972))
+
 - SAML: Only set KeyDescriptor when non empty ([#6961](https://github.com/RocketChat/Rocket.Chat/pull/6961) by [@sathieu](https://github.com/sathieu))
+
 - Fix the other tests failing due chimp update ([#6986](https://github.com/RocketChat/Rocket.Chat/pull/6986))
+
 - Fix badge counter on iOS push notifications ([#6950](https://github.com/RocketChat/Rocket.Chat/pull/6950))
+
 - Fix login with Meteor saving an object as email address ([#6974](https://github.com/RocketChat/Rocket.Chat/pull/6974))
+
 - Check that username is not in the room when being muted / unmuted ([#6840](https://github.com/RocketChat/Rocket.Chat/pull/6840) by [@matthewshirley](https://github.com/matthewshirley))
+
 - Use AWS Signature Version 4 signed URLs for uploads ([#6947](https://github.com/RocketChat/Rocket.Chat/pull/6947))
+
 - Bugs in `isUserFromParams` helper ([#6904](https://github.com/RocketChat/Rocket.Chat/pull/6904) by [@abrom](https://github.com/abrom))
+
 - Allow image insert from slack through slackbridge ([#6910](https://github.com/RocketChat/Rocket.Chat/pull/6910))
+
 - Slackbridge text replacements ([#6913](https://github.com/RocketChat/Rocket.Chat/pull/6913))
+
 - Fix all reactions having the same username ([#7157](https://github.com/RocketChat/Rocket.Chat/pull/7157))
+
 - Fix editing others messages ([#7200](https://github.com/RocketChat/Rocket.Chat/pull/7200))
+
 - Fix oembed previews not being shown ([#7208](https://github.com/RocketChat/Rocket.Chat/pull/7208))
+
 - "requirePasswordChange" property not being saved when set to false ([#7209](https://github.com/RocketChat/Rocket.Chat/pull/7209))
+
 - Removing the kadira package install from example build script. ([#7160](https://github.com/RocketChat/Rocket.Chat/pull/7160) by [@JSzaszvari](https://github.com/JSzaszvari))
+
 - Fix user's customFields not being saved correctly ([#7358](https://github.com/RocketChat/Rocket.Chat/pull/7358))
+
 - Improve avatar migration ([#7352](https://github.com/RocketChat/Rocket.Chat/pull/7352))
+
 - Fix jump to unread button ([#7320](https://github.com/RocketChat/Rocket.Chat/pull/7320))
+
 - click on image in a message ([#7345](https://github.com/RocketChat/Rocket.Chat/pull/7345))
+
 - Proxy upload to correct instance ([#7304](https://github.com/RocketChat/Rocket.Chat/pull/7304))
+
 - Fix Secret Url ([#7321](https://github.com/RocketChat/Rocket.Chat/pull/7321))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - add server methods getRoomNameById ([#7102](https://github.com/RocketChat/Rocket.Chat/pull/7102) by [@thinkeridea](https://github.com/thinkeridea))
+
 - Convert hipchat importer to js ([#7146](https://github.com/RocketChat/Rocket.Chat/pull/7146))
+
 - Convert file unsubscribe.coffee to js ([#7145](https://github.com/RocketChat/Rocket.Chat/pull/7145))
+
 - Convert oauth2-server-config package  to js ([#7017](https://github.com/RocketChat/Rocket.Chat/pull/7017))
+
 - Convert irc package to js ([#7022](https://github.com/RocketChat/Rocket.Chat/pull/7022))
+
 - Ldap: User_Data_FieldMap description ([#7055](https://github.com/RocketChat/Rocket.Chat/pull/7055) by [@bbrauns](https://github.com/bbrauns))
+
 - Remove Useless Jasmine Tests  ([#7062](https://github.com/RocketChat/Rocket.Chat/pull/7062))
+
 - converted rocketchat-importer ([#7018](https://github.com/RocketChat/Rocket.Chat/pull/7018))
+
 - LingoHub based on develop ([#7114](https://github.com/RocketChat/Rocket.Chat/pull/7114))
+
 - Convert Livechat from Coffeescript to JavaScript ([#7096](https://github.com/RocketChat/Rocket.Chat/pull/7096))
+
 - Rocketchat ui3 ([#7006](https://github.com/RocketChat/Rocket.Chat/pull/7006))
+
 - converted rocketchat-ui coffee to js part 2 ([#6836](https://github.com/RocketChat/Rocket.Chat/pull/6836))
+
 - LingoHub based on develop ([#7005](https://github.com/RocketChat/Rocket.Chat/pull/7005))
+
 - rocketchat-lib[4] coffee to js ([#6735](https://github.com/RocketChat/Rocket.Chat/pull/6735))
+
 - rocketchat-importer-slack coffee to js ([#6987](https://github.com/RocketChat/Rocket.Chat/pull/6987))
+
 - Convert ui-admin package to js ([#6911](https://github.com/RocketChat/Rocket.Chat/pull/6911))
+
 - Rocketchat ui message ([#6914](https://github.com/RocketChat/Rocket.Chat/pull/6914))
+
 - [New] LDAP: Use variables in User_Data_FieldMap for name mapping ([#6921](https://github.com/RocketChat/Rocket.Chat/pull/6921) by [@bbrauns](https://github.com/bbrauns))
+
 - Convert meteor-autocomplete package to js ([#6936](https://github.com/RocketChat/Rocket.Chat/pull/6936))
+
 - Convert Ui Account Package to Js ([#6795](https://github.com/RocketChat/Rocket.Chat/pull/6795))
+
 - LingoHub based on develop ([#6978](https://github.com/RocketChat/Rocket.Chat/pull/6978))
+
 - fix the crashing tests ([#6976](https://github.com/RocketChat/Rocket.Chat/pull/6976))
+
 - Convert WebRTC Package to Js ([#6775](https://github.com/RocketChat/Rocket.Chat/pull/6775))
+
 - Remove missing CoffeeScript dependencies ([#7154](https://github.com/RocketChat/Rocket.Chat/pull/7154))
+
 - Switch logic of artifact name ([#7158](https://github.com/RocketChat/Rocket.Chat/pull/7158))
+
 - Fix the Zapier oAuth return url to the new one ([#7215](https://github.com/RocketChat/Rocket.Chat/pull/7215))
+
 - Fix the admin oauthApps view not working ([#7196](https://github.com/RocketChat/Rocket.Chat/pull/7196))
+
 - Fix forbidden error on setAvatar REST endpoint ([#7159](https://github.com/RocketChat/Rocket.Chat/pull/7159))
+
 - Fix the admin oauthApps view not working ([#7196](https://github.com/RocketChat/Rocket.Chat/pull/7196))
+
 - Fix mobile avatars ([#7177](https://github.com/RocketChat/Rocket.Chat/pull/7177))
 
 </details>
@@ -6478,61 +9474,110 @@
 
 ### 🎉 New features
 
+
 - Add a pointer cursor to message images ([#6881](https://github.com/RocketChat/Rocket.Chat/pull/6881))
+
 - Make channels.info accept roomName, just like groups.info ([#6827](https://github.com/RocketChat/Rocket.Chat/pull/6827) by [@reist](https://github.com/reist))
+
 - Option to allow to signup as anonymous ([#6797](https://github.com/RocketChat/Rocket.Chat/pull/6797))
+
 - create a method 'create token' ([#6807](https://github.com/RocketChat/Rocket.Chat/pull/6807))
+
 - Add option on Channel Settings: Hide Notifications and Hide Unread Room Status (#2707, #2143) ([#5373](https://github.com/RocketChat/Rocket.Chat/pull/5373))
+
 - Remove lesshat ([#6722](https://github.com/RocketChat/Rocket.Chat/pull/6722) by [@karlprieb](https://github.com/karlprieb))
+
 - Use tokenSentVia parameter for clientid/secret to token endpoint ([#6692](https://github.com/RocketChat/Rocket.Chat/pull/6692) by [@intelradoux](https://github.com/intelradoux))
+
 - Add a setting to not run outgoing integrations on message edits ([#6615](https://github.com/RocketChat/Rocket.Chat/pull/6615))
+
 - Improve CI/Docker build/release ([#6938](https://github.com/RocketChat/Rocket.Chat/pull/6938))
+
 - Add SMTP settings for Protocol and Pool ([#6940](https://github.com/RocketChat/Rocket.Chat/pull/6940))
+
 - Show info about multiple instances at admin page ([#6953](https://github.com/RocketChat/Rocket.Chat/pull/6953))
 
 ### 🐛 Bug fixes
 
+
 - start/unstar message ([#6861](https://github.com/RocketChat/Rocket.Chat/pull/6861))
+
 - Added helper for testing if the current user matches the params ([#6845](https://github.com/RocketChat/Rocket.Chat/pull/6845) by [@abrom](https://github.com/abrom))
+
 - REST API user.update throwing error due to rate limiting ([#6796](https://github.com/RocketChat/Rocket.Chat/pull/6796))
+
 - fix german translation ([#6790](https://github.com/RocketChat/Rocket.Chat/pull/6790) by [@sscholl](https://github.com/sscholl))
+
 - Improve and correct Iframe Integration help text ([#6793](https://github.com/RocketChat/Rocket.Chat/pull/6793))
+
 - Quoted and replied messages not retaining the original message's alias ([#6800](https://github.com/RocketChat/Rocket.Chat/pull/6800))
+
 - Fix iframe wise issues ([#6798](https://github.com/RocketChat/Rocket.Chat/pull/6798))
+
 - Incorrect error message when creating channel ([#6747](https://github.com/RocketChat/Rocket.Chat/pull/6747) by [@gdelavald](https://github.com/gdelavald))
+
 - Hides nav buttons when selecting own profile ([#6760](https://github.com/RocketChat/Rocket.Chat/pull/6760) by [@gdelavald](https://github.com/gdelavald))
+
 - Search full name on client side ([#6767](https://github.com/RocketChat/Rocket.Chat/pull/6767) by [@alexbrazier](https://github.com/alexbrazier))
+
 - Sort by real name if use real name setting is enabled ([#6758](https://github.com/RocketChat/Rocket.Chat/pull/6758) by [@alexbrazier](https://github.com/alexbrazier))
+
 - CSV importer: require that there is some data in the zip, not ALL data ([#6768](https://github.com/RocketChat/Rocket.Chat/pull/6768) by [@reist](https://github.com/reist))
+
 - Archiving Direct Messages ([#6737](https://github.com/RocketChat/Rocket.Chat/pull/6737))
+
 - Fix Caddy by forcing go 1.7 as needed by one of caddy's dependencies ([#6721](https://github.com/RocketChat/Rocket.Chat/pull/6721))
+
 - Users status on main menu always offline ([#6896](https://github.com/RocketChat/Rocket.Chat/pull/6896))
+
 - Not showing unread count on electron app’s icon ([#6923](https://github.com/RocketChat/Rocket.Chat/pull/6923))
+
 - Compile CSS color variables ([#6939](https://github.com/RocketChat/Rocket.Chat/pull/6939))
+
 - Remove spaces from env PORT and INSTANCE_IP ([#6955](https://github.com/RocketChat/Rocket.Chat/pull/6955))
+
 - make channels.create API check for create-c ([#6968](https://github.com/RocketChat/Rocket.Chat/pull/6968) by [@reist](https://github.com/reist))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - [New] Snap arm support ([#6842](https://github.com/RocketChat/Rocket.Chat/pull/6842))
+
 - Meteor update ([#6858](https://github.com/RocketChat/Rocket.Chat/pull/6858))
+
 - Converted rocketchat-lib 3 ([#6672](https://github.com/RocketChat/Rocket.Chat/pull/6672))
+
 - Convert Message-Star Package to js  ([#6781](https://github.com/RocketChat/Rocket.Chat/pull/6781))
+
 - Convert Mailer Package to Js ([#6780](https://github.com/RocketChat/Rocket.Chat/pull/6780))
+
 - LingoHub based on develop ([#6816](https://github.com/RocketChat/Rocket.Chat/pull/6816))
+
 - Missing useful fields in admin user list #5110 ([#6804](https://github.com/RocketChat/Rocket.Chat/pull/6804) by [@vlogic](https://github.com/vlogic))
+
 - Convert Katex Package to Js ([#6671](https://github.com/RocketChat/Rocket.Chat/pull/6671))
+
 - Convert Oembed Package to Js ([#6688](https://github.com/RocketChat/Rocket.Chat/pull/6688))
+
 - Convert Mentions-Flextab Package to Js ([#6689](https://github.com/RocketChat/Rocket.Chat/pull/6689))
+
 - Anonymous use ([#5986](https://github.com/RocketChat/Rocket.Chat/pull/5986))
+
 - Breaking long URLS to prevent overflow ([#6368](https://github.com/RocketChat/Rocket.Chat/pull/6368) by [@robertdown](https://github.com/robertdown))
+
 - Rocketchat lib2 ([#6593](https://github.com/RocketChat/Rocket.Chat/pull/6593))
+
 - disable proxy configuration ([#6654](https://github.com/RocketChat/Rocket.Chat/pull/6654) by [@glehmann](https://github.com/glehmann))
+
 - Convert markdown to js ([#6694](https://github.com/RocketChat/Rocket.Chat/pull/6694) by [@ehkasper](https://github.com/ehkasper))
+
 - LingoHub based on develop ([#6715](https://github.com/RocketChat/Rocket.Chat/pull/6715))
+
 - meteor update to 1.4.4 ([#6706](https://github.com/RocketChat/Rocket.Chat/pull/6706))
+
 - LingoHub based on develop ([#6703](https://github.com/RocketChat/Rocket.Chat/pull/6703))
+
 - [Fix] Error when trying to show preview of undefined filetype ([#6935](https://github.com/RocketChat/Rocket.Chat/pull/6935))
 
 </details>
@@ -6572,6 +9617,7 @@
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - [Fix] Bug with incoming integration (0.55.1) ([#6734](https://github.com/RocketChat/Rocket.Chat/pull/6734))
 
 </details>
@@ -6589,137 +9635,259 @@
 
 ### ⚠️ BREAKING CHANGES
 
+
 - `getUsersOfRoom` API to return array of objects with user and username, instead of array of strings
 
 ### 🎉 New features
 
+
 - Add shield.svg api route to generate custom shields/badges ([#6565](https://github.com/RocketChat/Rocket.Chat/pull/6565) by [@alexbrazier](https://github.com/alexbrazier))
+
 - resolve merge share function ([#6577](https://github.com/RocketChat/Rocket.Chat/pull/6577) by [@karlprieb](https://github.com/karlprieb) & [@tgxn](https://github.com/tgxn))
+
 - Two Factor Auth ([#6476](https://github.com/RocketChat/Rocket.Chat/pull/6476))
+
 - Permission `join-without-join-code` assigned to admins and bots by default ([#6430](https://github.com/RocketChat/Rocket.Chat/pull/6430))
+
 - Integrations, both incoming and outgoing, now have access to the models. Example: `Users.findOneById(id)` ([#6420](https://github.com/RocketChat/Rocket.Chat/pull/6420))
+
 - 'users.resetAvatar' rest api endpoint ([#6616](https://github.com/RocketChat/Rocket.Chat/pull/6616))
+
 - Drupal oAuth Integration for Rocketchat ([#6632](https://github.com/RocketChat/Rocket.Chat/pull/6632) by [@Lawri-van-Buel](https://github.com/Lawri-van-Buel))
+
 - Add monitoring package ([#6634](https://github.com/RocketChat/Rocket.Chat/pull/6634))
+
 - Expose Livechat to Incoming Integrations and allow response ([#6681](https://github.com/RocketChat/Rocket.Chat/pull/6681))
 
 ### 🐛 Bug fixes
 
+
 - Incoming integrations would break when trying to use the `Store` feature.`
+
 - Removed Deprecated Package rocketchat:sharedsecret`
+
 - emoji picker exception ([#6709](https://github.com/RocketChat/Rocket.Chat/pull/6709) by [@gdelavald](https://github.com/gdelavald))
+
 - Large files crashed browser when trying to show preview ([#6598](https://github.com/RocketChat/Rocket.Chat/pull/6598))
+
 - messageBox: put "joinCodeRequired" back ([#6600](https://github.com/RocketChat/Rocket.Chat/pull/6600) by [@karlprieb](https://github.com/karlprieb))
+
 - Do not add default roles for users without services field ([#6594](https://github.com/RocketChat/Rocket.Chat/pull/6594))
+
 - Accounts from LinkedIn OAuth without name ([#6590](https://github.com/RocketChat/Rocket.Chat/pull/6590))
+
 - Usage of subtagged languages ([#6575](https://github.com/RocketChat/Rocket.Chat/pull/6575))
+
 - UTC offset missing UTC text when positive ([#6562](https://github.com/RocketChat/Rocket.Chat/pull/6562) by [@alexbrazier](https://github.com/alexbrazier))
+
 - can not get access_token when using custom oauth ([#6531](https://github.com/RocketChat/Rocket.Chat/pull/6531) by [@fengt](https://github.com/fengt))
+
 - Outgoing webhooks which have an error and they're retrying would still retry even if the integration was disabled` ([#6478](https://github.com/RocketChat/Rocket.Chat/pull/6478))
+
 - Incorrect curl command being generated on incoming integrations ([#6620](https://github.com/RocketChat/Rocket.Chat/pull/6620))
+
 - arguments logger ([#6617](https://github.com/RocketChat/Rocket.Chat/pull/6617))
+
 - Improve markdown code ([#6650](https://github.com/RocketChat/Rocket.Chat/pull/6650))
+
 - Encode avatar url to prevent CSS injection ([#6651](https://github.com/RocketChat/Rocket.Chat/pull/6651))
+
 - Do not escaping markdown on message attachments ([#6648](https://github.com/RocketChat/Rocket.Chat/pull/6648))
+
 - Revert unwanted UI changes ([#6658](https://github.com/RocketChat/Rocket.Chat/pull/6658))
+
 - Fix Logger stdout publication ([#6682](https://github.com/RocketChat/Rocket.Chat/pull/6682))
+
 - Downgrade email package to from 1.2.0 to 1.1.18 ([#6680](https://github.com/RocketChat/Rocket.Chat/pull/6680))
+
 - Administrators being rate limited when editing users data ([#6659](https://github.com/RocketChat/Rocket.Chat/pull/6659))
+
 - Make sure username exists in findByActiveUsersExcept ([#6674](https://github.com/RocketChat/Rocket.Chat/pull/6674))
+
 - Update server cache indexes on record updates ([#6686](https://github.com/RocketChat/Rocket.Chat/pull/6686))
+
 - Allow question on OAuth token path ([#6684](https://github.com/RocketChat/Rocket.Chat/pull/6684))
+
 - Error when returning undefined from incoming intergation’s script ([#6683](https://github.com/RocketChat/Rocket.Chat/pull/6683))
+
 - Fix message types ([#6704](https://github.com/RocketChat/Rocket.Chat/pull/6704))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
+
 - Add candidate snap channel ([#6614](https://github.com/RocketChat/Rocket.Chat/pull/6614))
+
 - Add `fname` to subscriptions in memory ([#6597](https://github.com/RocketChat/Rocket.Chat/pull/6597))
+
 - [New] Switch Snaps to use oplog ([#6608](https://github.com/RocketChat/Rocket.Chat/pull/6608))
+
 - Convert Message Pin Package to JS ([#6576](https://github.com/RocketChat/Rocket.Chat/pull/6576))
+
 - Move room display name logic to roomType definition ([#6585](https://github.com/RocketChat/Rocket.Chat/pull/6585))
+
 - Only configure LoggerManager on server ([#6596](https://github.com/RocketChat/Rocket.Chat/pull/6596))
+
 - POC Google Natural Language integration ([#6298](https://github.com/RocketChat/Rocket.Chat/pull/6298))
+
 - Fix recently introduced bug: OnePassword not defined ([#6591](https://github.com/RocketChat/Rocket.Chat/pull/6591))
+
 - rocketchat-lib part1 ([#6553](https://github.com/RocketChat/Rocket.Chat/pull/6553))
+
 - dependencies upgrade ([#6584](https://github.com/RocketChat/Rocket.Chat/pull/6584))
+
 - fixed typo in readme.md ([#6580](https://github.com/RocketChat/Rocket.Chat/pull/6580) by [@sezinkarli](https://github.com/sezinkarli))
+
 - Use real name instead of username for messages and direct messages list ([#3851](https://github.com/RocketChat/Rocket.Chat/pull/3851) by [@alexbrazier](https://github.com/alexbrazier))
+
 - Convert Ui-Login Package to Js ([#6561](https://github.com/RocketChat/Rocket.Chat/pull/6561))
+
 - rocketchat-channel-settings coffee to js ([#6551](https://github.com/RocketChat/Rocket.Chat/pull/6551))
+
 - Move wordpress packages client files to client folder ([#6571](https://github.com/RocketChat/Rocket.Chat/pull/6571))
+
 - convert rocketchat-ui part 2 ([#6539](https://github.com/RocketChat/Rocket.Chat/pull/6539))
+
 - rocketchat-channel-settings-mail-messages coffee to js ([#6541](https://github.com/RocketChat/Rocket.Chat/pull/6541))
+
 - LingoHub based on develop ([#6574](https://github.com/RocketChat/Rocket.Chat/pull/6574))
+
 - LingoHub based on develop ([#6567](https://github.com/RocketChat/Rocket.Chat/pull/6567))
+
 - [New] Added oauth2 userinfo endpoint ([#6554](https://github.com/RocketChat/Rocket.Chat/pull/6554))
+
 - Remove Deprecated Shared Secret Package ([#6540](https://github.com/RocketChat/Rocket.Chat/pull/6540))
+
 - Remove coffeescript package from ui-sidenav ([#6542](https://github.com/RocketChat/Rocket.Chat/pull/6542) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - Remove coffeescript package from ui-flextab ([#6543](https://github.com/RocketChat/Rocket.Chat/pull/6543) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - Convert Theme Package to JS ([#6491](https://github.com/RocketChat/Rocket.Chat/pull/6491))
+
 - Fix typo of the safari pinned tab label ([#6487](https://github.com/RocketChat/Rocket.Chat/pull/6487) by [@qge](https://github.com/qge))
+
 - fix channel merge option of user preferences ([#6493](https://github.com/RocketChat/Rocket.Chat/pull/6493) by [@billtt](https://github.com/billtt))
+
 - converted Rocketchat logger coffee to js ([#6495](https://github.com/RocketChat/Rocket.Chat/pull/6495))
+
 - converted rocketchat-integrations coffee to js ([#6502](https://github.com/RocketChat/Rocket.Chat/pull/6502))
+
 - 'allow reacting' should be a toggle option.otherwise, the style will display an error ([#6522](https://github.com/RocketChat/Rocket.Chat/pull/6522) by [@szluohua](https://github.com/szluohua))
+
 - Clipboard [Firefox version < 50] ([#6280](https://github.com/RocketChat/Rocket.Chat/pull/6280))
+
 - Convert ui-vrecord Package to JS ([#6473](https://github.com/RocketChat/Rocket.Chat/pull/6473))
+
 - converted slashcommands-mute coffee to js ([#6474](https://github.com/RocketChat/Rocket.Chat/pull/6474))
+
 - Convert Version Package to JS ([#6494](https://github.com/RocketChat/Rocket.Chat/pull/6494))
+
 - Convert Ui-Master Package to Js ([#6498](https://github.com/RocketChat/Rocket.Chat/pull/6498))
+
 - converted messageAttachment coffee to js ([#6500](https://github.com/RocketChat/Rocket.Chat/pull/6500))
+
 - Convert File Package to js ([#6503](https://github.com/RocketChat/Rocket.Chat/pull/6503))
+
 - Create groups.addAll endpoint and add activeUsersOnly param. ([#6505](https://github.com/RocketChat/Rocket.Chat/pull/6505) by [@nathanmarcos](https://github.com/nathanmarcos))
+
 - New feature: Room announcement ([#6351](https://github.com/RocketChat/Rocket.Chat/pull/6351) by [@billtt](https://github.com/billtt))
+
 - converted slashcommand-me coffee to js ([#6468](https://github.com/RocketChat/Rocket.Chat/pull/6468))
+
 - converted slashcommand-join coffee to js ([#6469](https://github.com/RocketChat/Rocket.Chat/pull/6469))
+
 - converted slashcommand-leave coffee to js ([#6470](https://github.com/RocketChat/Rocket.Chat/pull/6470))
+
 - convert mapview package to js ([#6471](https://github.com/RocketChat/Rocket.Chat/pull/6471))
+
 - converted getAvatarUrlFromUsername ([#6496](https://github.com/RocketChat/Rocket.Chat/pull/6496))
+
 - converted slashcommand-invite coffee to js ([#6497](https://github.com/RocketChat/Rocket.Chat/pull/6497))
+
 - Convert Wordpress Package to js ([#6499](https://github.com/RocketChat/Rocket.Chat/pull/6499))
+
 - converted slashcommand-msg coffee to js ([#6501](https://github.com/RocketChat/Rocket.Chat/pull/6501))
+
 - rocketchat-ui coffee to js part1 ([#6504](https://github.com/RocketChat/Rocket.Chat/pull/6504))
+
 - converted rocketchat-mentions coffee to js ([#6467](https://github.com/RocketChat/Rocket.Chat/pull/6467))
+
 - ESLint add rule `no-void` ([#6479](https://github.com/RocketChat/Rocket.Chat/pull/6479))
+
 - Add ESLint rules `prefer-template` and `template-curly-spacing` ([#6456](https://github.com/RocketChat/Rocket.Chat/pull/6456))
+
 - Fix livechat permissions ([#6466](https://github.com/RocketChat/Rocket.Chat/pull/6466))
+
 - Add ESLint rule `object-shorthand` ([#6457](https://github.com/RocketChat/Rocket.Chat/pull/6457))
+
 - Add ESLint rules `one-var` and `no-var` ([#6459](https://github.com/RocketChat/Rocket.Chat/pull/6459))
+
 - Add ESLint rule `one-var` ([#6458](https://github.com/RocketChat/Rocket.Chat/pull/6458))
+
 - Side-nav CoffeeScript to JavaScript III  ([#6274](https://github.com/RocketChat/Rocket.Chat/pull/6274))
+
 - Flex-Tab CoffeeScript to JavaScript II ([#6277](https://github.com/RocketChat/Rocket.Chat/pull/6277))
+
 - Side-nav CoffeeScript to JavaScript II ([#6266](https://github.com/RocketChat/Rocket.Chat/pull/6266))
+
 - Allow Livechat visitors to switch the department ([#6035](https://github.com/RocketChat/Rocket.Chat/pull/6035) by [@drallgood](https://github.com/drallgood))
+
 - fix livechat widget on small screens ([#6122](https://github.com/RocketChat/Rocket.Chat/pull/6122) by [@karlprieb](https://github.com/karlprieb))
+
 - Allow livechat managers to transfer chats ([#6180](https://github.com/RocketChat/Rocket.Chat/pull/6180) by [@drallgood](https://github.com/drallgood))
+
 - focus first textbox element ([#6257](https://github.com/RocketChat/Rocket.Chat/pull/6257) by [@a5his](https://github.com/a5his))
+
 - Join command ([#6268](https://github.com/RocketChat/Rocket.Chat/pull/6268))
+
 - Fix visitor ending livechat if multiples still open ([#6419](https://github.com/RocketChat/Rocket.Chat/pull/6419))
+
 - Password reset Cleaner text ([#6319](https://github.com/RocketChat/Rocket.Chat/pull/6319))
+
 - Add permission check to the import methods and not just the UI ([#6400](https://github.com/RocketChat/Rocket.Chat/pull/6400))
+
 - Max textarea height ([#6409](https://github.com/RocketChat/Rocket.Chat/pull/6409))
+
 - Livechat fix office hours order ([#6413](https://github.com/RocketChat/Rocket.Chat/pull/6413))
+
 - Convert Spotify Package to JS ([#6449](https://github.com/RocketChat/Rocket.Chat/pull/6449))
+
 - Make favicon package easier to read. ([#6422](https://github.com/RocketChat/Rocket.Chat/pull/6422) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - Just admins can change a Default Channel to Private (the channel will be a non default channel) ([#6426](https://github.com/RocketChat/Rocket.Chat/pull/6426))
+
 - Hide email settings on Sandstorm ([#6429](https://github.com/RocketChat/Rocket.Chat/pull/6429))
+
 - Do not show reset button for hidden settings ([#6432](https://github.com/RocketChat/Rocket.Chat/pull/6432))
+
 - Convert Dolphin Package to JavaScript ([#6427](https://github.com/RocketChat/Rocket.Chat/pull/6427))
+
 - converted rocketchat-message-mark-as-unread coffee/js ([#6445](https://github.com/RocketChat/Rocket.Chat/pull/6445))
+
 - converted rocketchat-slashcommands-kick coffee to js ([#6453](https://github.com/RocketChat/Rocket.Chat/pull/6453))
+
 - converted meteor-accounts-saml coffee to js ([#6450](https://github.com/RocketChat/Rocket.Chat/pull/6450))
+
 - Convert Statistics Package to JS ([#6447](https://github.com/RocketChat/Rocket.Chat/pull/6447))
+
 - Convert ChatOps Package to JavaScript ([#6425](https://github.com/RocketChat/Rocket.Chat/pull/6425))
+
 - Change all instances of Meteor.Collection for Mongo.Collection ([#6410](https://github.com/RocketChat/Rocket.Chat/pull/6410))
+
 - Flex-Tab CoffeeScript to JavaScript III ([#6278](https://github.com/RocketChat/Rocket.Chat/pull/6278))
+
 - Flex-Tab CoffeeScript to JavaScript I  ([#6276](https://github.com/RocketChat/Rocket.Chat/pull/6276))
+
 - Side-nav CoffeeScript to JavaScript ([#6264](https://github.com/RocketChat/Rocket.Chat/pull/6264))
+
 - Convert Tutum Package to JS ([#6446](https://github.com/RocketChat/Rocket.Chat/pull/6446))
+
 - Added Deploy method and platform to stats ([#6649](https://github.com/RocketChat/Rocket.Chat/pull/6649))
+
 - LingoHub based on develop ([#6647](https://github.com/RocketChat/Rocket.Chat/pull/6647))
+
 - meteor update ([#6631](https://github.com/RocketChat/Rocket.Chat/pull/6631))
+
 - Env override initial setting ([#6163](https://github.com/RocketChat/Rocket.Chat/pull/6163) by [@mrsimpson](https://github.com/mrsimpson))
 
 </details>
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index 824c3e9bcca4..7dd2932fa497 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.0.7"
+	"version": "3.0.8"
 }
diff --git a/package.json b/package.json
index 6363e22d4376..9a22672d7af4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.0.7",
+	"version": "3.0.8",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

From e1986069266f8df351d9498fc0c7db944c7642df Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Mon, 30 Mar 2020 18:32:18 -0300
Subject: [PATCH 113/223] Update .eslintrc

---
 .eslintrc | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/.eslintrc b/.eslintrc
index 46805bc5b654..efef5b7d68d8 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -24,12 +24,21 @@
     "react/jsx-fragments": [
       "error",
       "syntax"
-    ],
+    ]
   },
   "settings": {
-    "react": {
-      "version": "detect",
+    "import/resolver": {
+      "node": {
+        "extensions": [
+          ".js",
+          ".ts",
+          ".tsx"
+        ]
+      }
     },
+    "react": {
+      "version": "detect"
+    }
   },
   "overrides": [
     {
@@ -38,9 +47,9 @@
         "**/*.tsx"
       ],
       "extends": [
-        "@rocket.chat/eslint-config",
         "plugin:@typescript-eslint/recommended",
-        "plugin:@typescript-eslint/eslint-recommended"
+        "plugin:@typescript-eslint/eslint-recommended",
+        "@rocket.chat/eslint-config"
       ],
       "globals": {
         "Atomics": "readonly",
@@ -73,6 +82,10 @@
           "syntax"
         ],
         "@typescript-eslint/ban-ts-ignore": "off",
+        "@typescript-eslint/indent": [
+          "error",
+          "tab"
+        ],
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/interface-name-prefix": [
           "error",

From 66c82df886886b3b3eb576dcfc0c75b452aca60c Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Mon, 30 Mar 2020 21:16:45 -0300
Subject: [PATCH 114/223] Bump version to 3.1.0-rc.4

---
 .docker/Dockerfile.rhel   |  2 +-
 .github/history.json      | 69 +++++++++++++++++++++++++++++++++++++++
 HISTORY.md                | 29 ++++++++++++++++
 app/utils/rocketchat.info |  2 +-
 package.json              |  2 +-
 5 files changed, 101 insertions(+), 3 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index aeff4306f56c..1b0b23a34016 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.1.0-rc.3
+ENV RC_VERSION 3.1.0-rc.4
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index 86592a7a05db..6085f85ba4ba 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -41562,6 +41562,75 @@
           ]
         }
       ]
+    },
+    "3.1.0-rc.4": {
+      "node_version": "12.16.1",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "17078",
+          "title": "Regression: Remove model observe that was used to control the status of the Omnichannel agents",
+          "userLogin": "renatobecker",
+          "milestone": "3.0.8",
+          "contributors": [
+            "renatobecker",
+            "web-flow",
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "17086",
+          "title": "[FIX] Emit livechat events to instace only",
+          "userLogin": "sampaiodiego",
+          "milestone": "3.0.8",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "17089",
+          "title": "[FIX] Error when websocket received status update event",
+          "userLogin": "d-gubert",
+          "milestone": "3.0.8",
+          "contributors": [
+            "d-gubert"
+          ]
+        },
+        {
+          "pr": "17088",
+          "title": "Reduce notifyUser propagation",
+          "userLogin": "rodrigok",
+          "milestone": "3.0.8",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "17078",
+          "title": "Regression: Remove model observe that was used to control the status of the Omnichannel agents",
+          "userLogin": "renatobecker",
+          "milestone": "3.0.8",
+          "contributors": [
+            "renatobecker",
+            "web-flow",
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "17087",
+          "title": "Regression: Check Omnichannel routing system before emitting queue changes",
+          "userLogin": "renatobecker",
+          "milestone": "3.1.0",
+          "contributors": [
+            "renatobecker"
+          ]
+        }
+      ]
     }
   }
 }
diff --git a/HISTORY.md b/HISTORY.md
index e12c846dcb21..e43eee68b89f 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,6 +1,35 @@
 
 # 3.1.0 (Under Release Candidate Process)
 
+## 3.1.0-rc.4
+`2020-03-30  ·  4 🐛  ·  6 🔍  ·  4 👩‍💻👨‍💻`
+
+### 🐛 Bug fixes
+
+
+- Emit livechat events to instace only ([#17086](https://github.com/RocketChat/Rocket.Chat/pull/17086))
+
+- Error when websocket received status update event ([#17089](https://github.com/RocketChat/Rocket.Chat/pull/17089))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Regression: Remove model observe that was used to control the status of the Omnichannel agents ([#17078](https://github.com/RocketChat/Rocket.Chat/pull/17078))
+
+- Reduce notifyUser propagation ([#17088](https://github.com/RocketChat/Rocket.Chat/pull/17088))
+
+- Regression: Check Omnichannel routing system before emitting queue changes ([#17087](https://github.com/RocketChat/Rocket.Chat/pull/17087))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@d-gubert](https://github.com/d-gubert)
+- [@renatobecker](https://github.com/renatobecker)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 ## 3.1.0-rc.3
 `2020-03-30  ·  2 🎉  ·  2 🚀  ·  1 🐛  ·  3 🔍  ·  7 👩‍💻👨‍💻`
 
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index 04d13e2d8e18..f5c360f56b86 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.1.0-rc.3"
+	"version": "3.1.0-rc.4"
 }
diff --git a/package.json b/package.json
index 6b623ada5fc2..76226bb395ca 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.1.0-rc.3",
+	"version": "3.1.0-rc.4",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

From d47921abc9550e4d5369cab9f81d7bd95a61ebc5 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Tue, 31 Mar 2020 00:29:07 -0300
Subject: [PATCH 115/223] [FIX] Apps Engine notifyRoom sending notification to
 wrong users (#17093)

---
 app/apps/server/bridges/messages.js | 39 ++++++++++++++++-------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/app/apps/server/bridges/messages.js b/app/apps/server/bridges/messages.js
index 1071117d180e..cc53aa392bd4 100644
--- a/app/apps/server/bridges/messages.js
+++ b/app/apps/server/bridges/messages.js
@@ -59,24 +59,27 @@ export class AppMessageBridge {
 	async notifyRoom(room, message, appId) {
 		this.orch.debugLog(`The App ${ appId } is notifying a room's users.`);
 
-		if (room) {
-			const msg = this.orch.getConverters().get('messages').convertAppMessage(message);
-			const rmsg = Object.assign(msg, {
-				_id: Random.id(),
-				rid: room.id,
-				ts: new Date(),
-				u: undefined,
-				editor: undefined,
-			});
-
-			const users = Subscriptions.findByRoomIdWhenUserIdExists(room._id, { fields: { 'u._id': 1 } })
-				.fetch()
-				.map((s) => s.u._id);
-			Users.findByIds(users, { fields: { _id: 1 } })
-				.fetch()
-				.forEach(({ _id }) =>
-					Notifications.notifyUser(_id, 'message', rmsg),
-				);
+		if (!room || !room.id) {
+			return;
 		}
+
+		const msg = this.orch.getConverters().get('messages').convertAppMessage(message);
+		const rmsg = Object.assign(msg, {
+			_id: Random.id(),
+			rid: room.id,
+			ts: new Date(),
+			u: undefined,
+			editor: undefined,
+		});
+
+		const users = Subscriptions.findByRoomIdWhenUserIdExists(room.id, { fields: { 'u._id': 1 } })
+			.fetch()
+			.map((s) => s.u._id);
+
+		Users.findByIds(users, { fields: { _id: 1 } })
+			.fetch()
+			.forEach(({ _id }) =>
+				Notifications.notifyUser(_id, 'message', rmsg),
+			);
 	}
 }

From 2bc1714bce10dc2fb7ab90ca41ec43f67008c6fe Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Tue, 31 Mar 2020 00:29:07 -0300
Subject: [PATCH 116/223] [FIX] Apps Engine notifyRoom sending notification to
 wrong users (#17093)

---
 app/apps/server/bridges/messages.js | 39 ++++++++++++++++-------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/app/apps/server/bridges/messages.js b/app/apps/server/bridges/messages.js
index 1071117d180e..cc53aa392bd4 100644
--- a/app/apps/server/bridges/messages.js
+++ b/app/apps/server/bridges/messages.js
@@ -59,24 +59,27 @@ export class AppMessageBridge {
 	async notifyRoom(room, message, appId) {
 		this.orch.debugLog(`The App ${ appId } is notifying a room's users.`);
 
-		if (room) {
-			const msg = this.orch.getConverters().get('messages').convertAppMessage(message);
-			const rmsg = Object.assign(msg, {
-				_id: Random.id(),
-				rid: room.id,
-				ts: new Date(),
-				u: undefined,
-				editor: undefined,
-			});
-
-			const users = Subscriptions.findByRoomIdWhenUserIdExists(room._id, { fields: { 'u._id': 1 } })
-				.fetch()
-				.map((s) => s.u._id);
-			Users.findByIds(users, { fields: { _id: 1 } })
-				.fetch()
-				.forEach(({ _id }) =>
-					Notifications.notifyUser(_id, 'message', rmsg),
-				);
+		if (!room || !room.id) {
+			return;
 		}
+
+		const msg = this.orch.getConverters().get('messages').convertAppMessage(message);
+		const rmsg = Object.assign(msg, {
+			_id: Random.id(),
+			rid: room.id,
+			ts: new Date(),
+			u: undefined,
+			editor: undefined,
+		});
+
+		const users = Subscriptions.findByRoomIdWhenUserIdExists(room.id, { fields: { 'u._id': 1 } })
+			.fetch()
+			.map((s) => s.u._id);
+
+		Users.findByIds(users, { fields: { _id: 1 } })
+			.fetch()
+			.forEach(({ _id }) =>
+				Notifications.notifyUser(_id, 'message', rmsg),
+			);
 	}
 }

From fd07bcf275e0c99d124dc7c8393aae7b34e6bad0 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Tue, 31 Mar 2020 00:34:23 -0300
Subject: [PATCH 117/223] Bump version to 3.0.9

---
 .docker/Dockerfile.rhel   |  2 +-
 .github/history.json      | 20 ++++++++++++++++++++
 HISTORY.md                | 17 +++++++++++++++++
 app/utils/rocketchat.info |  2 +-
 package.json              |  2 +-
 5 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 1c275a564352..4c1e89dd7881 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.0.8
+ENV RC_VERSION 3.0.9
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index 8cfc9224330c..cdc2a0f28905 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -40116,6 +40116,26 @@
           ]
         }
       ]
+    },
+    "3.0.9": {
+      "node_version": "12.14.0",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "17093",
+          "title": "[FIX] Apps Engine notifyRoom sending notification to wrong users",
+          "userLogin": "sampaiodiego",
+          "milestone": "3.0.9",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/HISTORY.md b/HISTORY.md
index b01aa11ac67d..cfd87f2017fb 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,21 @@
 
+# 3.0.9
+`2020-03-31  ·  1 🐛  ·  1 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `12.14.0`
+- NPM: `6.13.4`
+- MongoDB: `3.4, 3.6, 4.0`
+
+### 🐛 Bug fixes
+
+
+- Apps Engine notifyRoom sending notification to wrong users ([#17093](https://github.com/RocketChat/Rocket.Chat/pull/17093))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 3.0.8
 `2020-03-30  ·  2 🐛  ·  2 🔍  ·  4 👩‍💻👨‍💻`
 
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index 7dd2932fa497..b91fdaf87e64 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.0.8"
+	"version": "3.0.9"
 }
diff --git a/package.json b/package.json
index 9a22672d7af4..02d510d54f46 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.0.8",
+	"version": "3.0.9",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

From 6ce901d5383c581565c20a98a2945cd653606001 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Tue, 31 Mar 2020 01:30:11 -0300
Subject: [PATCH 118/223] Bump version to 3.1.0-rc.5

---
 .docker/Dockerfile.rhel   |    2 +-
 .github/history.json      |   50 +-
 HISTORY.md                | 1713 ++++++++++++++++++++++++++++++-------
 app/utils/rocketchat.info |    2 +-
 package.json              |    2 +-
 5 files changed, 1436 insertions(+), 333 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 1b0b23a34016..bd0adbbbda24 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.1.0-rc.4
+ENV RC_VERSION 3.1.0-rc.5
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index 6085f85ba4ba..38b2712206e6 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -41631,6 +41631,54 @@
           ]
         }
       ]
+    },
+    "3.0.9": {
+      "node_version": "12.14.0",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "17094",
+          "title": "Release 3.0.9",
+          "userLogin": "sampaiodiego",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "17093",
+          "title": "[FIX] Apps Engine notifyRoom sending notification to wrong users",
+          "userLogin": "sampaiodiego",
+          "milestone": "3.0.9",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        }
+      ]
+    },
+    "3.1.0-rc.5": {
+      "node_version": "12.16.1",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "17093",
+          "title": "[FIX] Apps Engine notifyRoom sending notification to wrong users",
+          "userLogin": "sampaiodiego",
+          "milestone": "3.0.9",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        }
+      ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/HISTORY.md b/HISTORY.md
index e43eee68b89f..bcdf18a0766b 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,8 +1,20 @@
 
 # 3.1.0 (Under Release Candidate Process)
 
+## 3.1.0-rc.5
+`2020-03-31  ·  1 🐛  ·  1 👩‍💻👨‍💻`
+
+### 🐛 Bug fixes
+
+
+- Apps Engine notifyRoom sending notification to wrong users ([#17093](https://github.com/RocketChat/Rocket.Chat/pull/17093))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 ## 3.1.0-rc.4
-`2020-03-30  ·  4 🐛  ·  6 🔍  ·  4 👩‍💻👨‍💻`
+`2020-03-30  ·  2 🐛  ·  2 🔍  ·  4 👩‍💻👨‍💻`
 
 ### 🐛 Bug fixes
 
@@ -15,8 +27,6 @@
 <summary>🔍 Minor changes</summary>
 
 
-- Regression: Remove model observe that was used to control the status of the Omnichannel agents ([#17078](https://github.com/RocketChat/Rocket.Chat/pull/17078))
-
 - Reduce notifyUser propagation ([#17088](https://github.com/RocketChat/Rocket.Chat/pull/17088))
 
 - Regression: Check Omnichannel routing system before emitting queue changes ([#17087](https://github.com/RocketChat/Rocket.Chat/pull/17087))
@@ -131,7 +141,7 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 ## 3.1.0-rc.0
-`2020-03-26  ·  18 🎉  ·  15 🚀  ·  37 🐛  ·  39 🔍  ·  34 👩‍💻👨‍💻`
+`2020-03-26  ·  18 🎉  ·  16 🚀  ·  57 🐛  ·  41 🔍  ·  35 👩‍💻👨‍💻`
 
 ### 🎉 New features
 
@@ -159,7 +169,7 @@
 - Two Factor authentication via email ([#15949](https://github.com/RocketChat/Rocket.Chat/pull/15949))
 
 - Translation via MS translate ([#16363](https://github.com/RocketChat/Rocket.Chat/pull/16363) by [@mrsimpson](https://github.com/mrsimpson))
-  Adds Microsoft's translation service (https://translator.microsoft.com/) as a provider for translation of messages.
+  Adds Microsoft's translation service (https://translator.microsoft.com/) as a provider for translation of messages.
   In addition to implementing the interface (similar to google and DeepL), a small change has been done in order to display the translation provider on the UI.
 
 - API `users.deactivateIdle` for mass-disabling of idle users ([#16849](https://github.com/RocketChat/Rocket.Chat/pull/16849))
@@ -199,6 +209,8 @@
 
 - Accept open formarts of text, spreadsheet, presentation for upload by default ([#16502](https://github.com/RocketChat/Rocket.Chat/pull/16502))
 
+- Send files over REST API ([#16617](https://github.com/RocketChat/Rocket.Chat/pull/16617))
+
 - Added autofocus to Directory ([#16217](https://github.com/RocketChat/Rocket.Chat/pull/16217) by [@ashwaniYDV](https://github.com/ashwaniYDV))
 
 - Added timer in video message recorder ([#16221](https://github.com/RocketChat/Rocket.Chat/pull/16221) by [@ashwaniYDV](https://github.com/ashwaniYDV))
@@ -212,6 +224,8 @@
 
 - Wrong message count statistics in Admin info page ([#16680](https://github.com/RocketChat/Rocket.Chat/pull/16680) by [@subham103](https://github.com/subham103))
 
+- Race conditions on/before login ([#16989](https://github.com/RocketChat/Rocket.Chat/pull/16989))
+
 - CAS ignores username attribute map ([#16942](https://github.com/RocketChat/Rocket.Chat/pull/16942) by [@pmayer](https://github.com/pmayer))
 
 - Ancestral departments were not updated when an Omnichannel room is forwarded to another department ([#16958](https://github.com/RocketChat/Rocket.Chat/pull/16958))
@@ -232,6 +246,8 @@
 
 - Omnichannel Inquiry names not being updated when the guest name changes ([#16782](https://github.com/RocketChat/Rocket.Chat/pull/16782))
 
+- Keeps the agent in the room after accepting a new Omnichannel request ([#16787](https://github.com/RocketChat/Rocket.Chat/pull/16787))
+
 - Real-time data rendering on Omnichannel room info panel  ([#16783](https://github.com/RocketChat/Rocket.Chat/pull/16783))
 
 - Show error message if password and confirm password not equal  ([#16247](https://github.com/RocketChat/Rocket.Chat/pull/16247) by [@ashwaniYDV](https://github.com/ashwaniYDV))
@@ -248,6 +264,8 @@
 
 - Custom OAuth Bug ([#16811](https://github.com/RocketChat/Rocket.Chat/pull/16811) by [@PrajvalRaval](https://github.com/PrajvalRaval))
 
+- Integrations page pagination ([#16838](https://github.com/RocketChat/Rocket.Chat/pull/16838))
+
 - Facebook integration missing visitor data after registerGuest ([#16810](https://github.com/RocketChat/Rocket.Chat/pull/16810) by [@antkaz](https://github.com/antkaz))
 
 - Invite links counting users already joined ([#16591](https://github.com/RocketChat/Rocket.Chat/pull/16591) by [@ritwizsinha](https://github.com/ritwizsinha))
@@ -266,10 +284,21 @@
 
 - Slackbridge-import command doesn't work ([#16645](https://github.com/RocketChat/Rocket.Chat/pull/16645) by [@antkaz](https://github.com/antkaz))
 
+- Language country has been ignored on translation load ([#16757](https://github.com/RocketChat/Rocket.Chat/pull/16757))
+  Languages including country variations like `pt-BR` were ignoring the country party because the user's preference has been saved in lowercase `pt-br` causing the language to not match the available languages. Now we enforce the uppercase of the country part when loading the language.
+
 - Cannot edit Profile when Full Name is empty and not required ([#16744](https://github.com/RocketChat/Rocket.Chat/pull/16744))
 
+- Manual Register use correct state for determining registered ([#16726](https://github.com/RocketChat/Rocket.Chat/pull/16726))
+
+- Rocket.Chat takes too long to set the username when it fails to send enrollment email ([#16723](https://github.com/RocketChat/Rocket.Chat/pull/16723))
+
+- TypeError when trying to load avatar of an invalid room. ([#16699](https://github.com/RocketChat/Rocket.Chat/pull/16699))
+
 - Color setting editing issues ([#16706](https://github.com/RocketChat/Rocket.Chat/pull/16706))
 
+- ie11 support ([#16682](https://github.com/RocketChat/Rocket.Chat/pull/16682))
+
 - Deleting messages while searching causes the whole room chat to disappear ([#16568](https://github.com/RocketChat/Rocket.Chat/pull/16568) by [@karimelghazouly](https://github.com/karimelghazouly))
 
 - Prune message saying `files deleted` and `messages deleted` even when singular message or file in prune ([#16322](https://github.com/RocketChat/Rocket.Chat/pull/16322) by [@ritwizsinha](https://github.com/ritwizsinha))
@@ -282,14 +311,42 @@
 
 - There is no option to pin a thread message by admin ([#16457](https://github.com/RocketChat/Rocket.Chat/pull/16457) by [@ashwaniYDV](https://github.com/ashwaniYDV))
 
+- LDAP sync admin action was not syncing existent users ([#16671](https://github.com/RocketChat/Rocket.Chat/pull/16671))
+
+- Check agent status when starting a new conversation with an agent assigned ([#16618](https://github.com/RocketChat/Rocket.Chat/pull/16618))
+
 - Additional scroll when contextual bar is open ([#16667](https://github.com/RocketChat/Rocket.Chat/pull/16667))
 
+- Clear unread red line when the ESC key is pressed  ([#16668](https://github.com/RocketChat/Rocket.Chat/pull/16668))
+
+- users.info endpoint not handling the error if the user does not exist ([#16495](https://github.com/RocketChat/Rocket.Chat/pull/16495))
+
+- Admin height if the blue banner is opened ([#16629](https://github.com/RocketChat/Rocket.Chat/pull/16629))
+
+- Data converters overriding fields added by apps ([#16639](https://github.com/RocketChat/Rocket.Chat/pull/16639))
+
+- Block user option inside admin view ([#16626](https://github.com/RocketChat/Rocket.Chat/pull/16626))
+
+- Regression: New 'app' role with no permissions when updating to 3.0.0 ([#16637](https://github.com/RocketChat/Rocket.Chat/pull/16637))
+
+- Omnichannel Inquiry queues when removing chats ([#16603](https://github.com/RocketChat/Rocket.Chat/pull/16603))
+
+- livechat/rooms endpoint not working with big amount of livechats ([#16623](https://github.com/RocketChat/Rocket.Chat/pull/16623))
+
+- Regression: Jitsi on external window infinite loop ([#16625](https://github.com/RocketChat/Rocket.Chat/pull/16625))
+
+- UiKit not updating new actionIds received as responses from actions ([#16624](https://github.com/RocketChat/Rocket.Chat/pull/16624))
+
 <details>
 <summary>🔍 Minor changes</summary>
 
 
 - Fix: 2FA DDP method not getting code on API call that doesn’t requires 2FA ([#16998](https://github.com/RocketChat/Rocket.Chat/pull/16998))
 
+- Regression: Remove deprecated Omnichannel setting used to fetch the queue data through subscription  ([#17017](https://github.com/RocketChat/Rocket.Chat/pull/17017))
+
+- Regression: Replace the Omnichannel queue model observe with Stream ([#16999](https://github.com/RocketChat/Rocket.Chat/pull/16999))
+
 - Fix StreamCast info ([#16995](https://github.com/RocketChat/Rocket.Chat/pull/16995))
 
 - Fix: StreamCast was not working correctly ([#16983](https://github.com/RocketChat/Rocket.Chat/pull/16983))
@@ -403,11 +460,37 @@
 - [@ggazzo](https://github.com/ggazzo)
 - [@lolimay](https://github.com/lolimay)
 - [@marceloschmidt](https://github.com/marceloschmidt)
+- [@pierre-lehnen-rc](https://github.com/pierre-lehnen-rc)
 - [@renatobecker](https://github.com/renatobecker)
 - [@rodrigok](https://github.com/rodrigok)
 - [@sampaiodiego](https://github.com/sampaiodiego)
 - [@tassoevan](https://github.com/tassoevan)
 
+# 3.0.9
+`2020-03-31  ·  1 🐛  ·  1 🔍  ·  1 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `12.14.0`
+- NPM: `6.13.4`
+- MongoDB: `3.4, 3.6, 4.0`
+
+### 🐛 Bug fixes
+
+
+- Apps Engine notifyRoom sending notification to wrong users ([#17093](https://github.com/RocketChat/Rocket.Chat/pull/17093))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Release 3.0.9 ([#17094](https://github.com/RocketChat/Rocket.Chat/pull/17094))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 3.0.8
 `2020-03-30  ·  2 🐛  ·  2 🔍  ·  4 👩‍💻👨‍💻`
 
@@ -558,7 +641,7 @@
 - [@rodrigok](https://github.com/rodrigok)
 
 # 3.0.2
-`2020-02-21  ·  3 🐛  ·  3 👩‍💻👨‍💻`
+`2020-02-21  ·  4 🐛  ·  5 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `12.14.0`
@@ -572,13 +655,17 @@
 
 - Omnichannel Inquiry queues when removing chats ([#16603](https://github.com/RocketChat/Rocket.Chat/pull/16603))
 
+- users.info endpoint not handling the error if the user does not exist ([#16495](https://github.com/RocketChat/Rocket.Chat/pull/16495))
+
 - Clear unread red line when the ESC key is pressed  ([#16668](https://github.com/RocketChat/Rocket.Chat/pull/16668))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
 
+- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
 - [@gabriellsh](https://github.com/gabriellsh)
 - [@ggazzo](https://github.com/ggazzo)
 - [@renatobecker](https://github.com/renatobecker)
+- [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 3.0.1
 `2020-02-19  ·  7 🐛  ·  4 👩‍💻👨‍💻`
@@ -613,7 +700,7 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 3.0.0
-`2020-02-14  ·  7 ️️️⚠️  ·  10 🎉  ·  11 🚀  ·  32 🐛  ·  43 🔍  ·  21 👩‍💻👨‍💻`
+`2020-02-14  ·  7 ️️️⚠️  ·  10 🎉  ·  11 🚀  ·  41 🐛  ·  49 🔍  ·  21 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `12.14.0`
@@ -690,6 +777,10 @@
 
 - Result of get avatar from url can be null ([#16123](https://github.com/RocketChat/Rocket.Chat/pull/16123))
 
+- `stdout` streamer infinite loop ([#16452](https://github.com/RocketChat/Rocket.Chat/pull/16452))
+
+- Option to make a channel default ([#16433](https://github.com/RocketChat/Rocket.Chat/pull/16433))
+
 - Rooms not being marked as read sometimes ([#16397](https://github.com/RocketChat/Rocket.Chat/pull/16397))
 
 - Container heights ([#16388](https://github.com/RocketChat/Rocket.Chat/pull/16388))
@@ -700,16 +791,30 @@
 
 - Adding 'lang' tag ([#16375](https://github.com/RocketChat/Rocket.Chat/pull/16375))
 
+- App removal was moving logs to the trash collection ([#16362](https://github.com/RocketChat/Rocket.Chat/pull/16362))
+
 - Role tags missing - Description field explanation ([#16356](https://github.com/RocketChat/Rocket.Chat/pull/16356))
 
+- Invite links usage by channel owners/moderators ([#16176](https://github.com/RocketChat/Rocket.Chat/pull/16176))
+
+- Unknown error when sending message if 'Set a User Name to Alias in Message' setting is enabled ([#16347](https://github.com/RocketChat/Rocket.Chat/pull/16347))
+
+- Slack CSV User Importer ([#16253](https://github.com/RocketChat/Rocket.Chat/pull/16253))
+
 - The "click to load" text is hard-coded and not translated. ([#16142](https://github.com/RocketChat/Rocket.Chat/pull/16142) by [@ashwaniYDV](https://github.com/ashwaniYDV))
 
+- Integrations list without pagination and outgoing integration creation ([#16233](https://github.com/RocketChat/Rocket.Chat/pull/16233))
+
+- Setup Wizard inputs and Admin Settings ([#16147](https://github.com/RocketChat/Rocket.Chat/pull/16147))
+
 - FileUpload.getBuffer was not working through the Apps-Engine ([#16234](https://github.com/RocketChat/Rocket.Chat/pull/16234))
 
 - Integrations admin page ([#16183](https://github.com/RocketChat/Rocket.Chat/pull/16183))
 
 - Readme Help wanted section ([#16197](https://github.com/RocketChat/Rocket.Chat/pull/16197))
 
+- User stuck after reset password ([#16184](https://github.com/RocketChat/Rocket.Chat/pull/16184))
+
 - auto translate cache ([#15768](https://github.com/RocketChat/Rocket.Chat/pull/15768) by [@vickyokrm](https://github.com/vickyokrm))
 
 - Save password without confirmation ([#16060](https://github.com/RocketChat/Rocket.Chat/pull/16060) by [@ashwaniYDV](https://github.com/ashwaniYDV))
@@ -772,6 +877,10 @@
 
 - Regression: Fix status bar margins ([#16438](https://github.com/RocketChat/Rocket.Chat/pull/16438))
 
+- Fix index creation for apps_logs collection ([#16401](https://github.com/RocketChat/Rocket.Chat/pull/16401))
+
+- Revert message properties validation ([#16395](https://github.com/RocketChat/Rocket.Chat/pull/16395))
+
 - Update apps engine to 1.12.0-beta.2496 ([#16398](https://github.com/RocketChat/Rocket.Chat/pull/16398))
 
 - Regression: App deletion wasn’t returning the correct information ([#16360](https://github.com/RocketChat/Rocket.Chat/pull/16360))
@@ -780,6 +889,8 @@
 
 - Fix Preview Docker image build ([#16379](https://github.com/RocketChat/Rocket.Chat/pull/16379))
 
+- Regression: Rate limiter was not working due to Meteor internal changes ([#16361](https://github.com/RocketChat/Rocket.Chat/pull/16361))
+
 - Fix assets download on CI ([#16352](https://github.com/RocketChat/Rocket.Chat/pull/16352))
 
 - Send build artifacts to S3 ([#16237](https://github.com/RocketChat/Rocket.Chat/pull/16237))
@@ -792,10 +903,14 @@
 
 - Merge master into develop & Set version to 2.5.0-develop ([#16107](https://github.com/RocketChat/Rocket.Chat/pull/16107))
 
+- Release 2.4.7 ([#16444](https://github.com/RocketChat/Rocket.Chat/pull/16444))
+
 - Fix tests ([#16469](https://github.com/RocketChat/Rocket.Chat/pull/16469))
 
 - Regression: prevent submit modal ([#16488](https://github.com/RocketChat/Rocket.Chat/pull/16488))
 
+- Update presence package to 2.6.1 ([#16486](https://github.com/RocketChat/Rocket.Chat/pull/16486))
+
 - Regression: allow private channels to hide system messages ([#16483](https://github.com/RocketChat/Rocket.Chat/pull/16483))
 
 - Regression: Fix uikit modal closing on click ([#16475](https://github.com/RocketChat/Rocket.Chat/pull/16475))
@@ -828,6 +943,8 @@
 
 - Regression: UIKit missing select states: error/disabled ([#16540](https://github.com/RocketChat/Rocket.Chat/pull/16540))
 
+- Release 2.4.9 ([#16544](https://github.com/RocketChat/Rocket.Chat/pull/16544))
+
 - Regression: fix read unread messages ([#16562](https://github.com/RocketChat/Rocket.Chat/pull/16562))
 
 - Regression: UIKit update modal actions ([#16570](https://github.com/RocketChat/Rocket.Chat/pull/16570))
@@ -1099,7 +1216,7 @@
 - [@tassoevan](https://github.com/tassoevan)
 
 # 2.4.1
-`2020-01-10  ·  2 🐛  ·  1 🔍  ·  4 👩‍💻👨‍💻`
+`2020-01-10  ·  3 🐛  ·  1 🔍  ·  4 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.17.0`
@@ -1111,6 +1228,8 @@
 
 - Enable apps change properties of the sender on the message as before ([#16189](https://github.com/RocketChat/Rocket.Chat/pull/16189))
 
+- Add missing password field back to administration area ([#16171](https://github.com/RocketChat/Rocket.Chat/pull/16171))
+
 - JS errors on Administration page ([#16139](https://github.com/RocketChat/Rocket.Chat/pull/16139))
 
 <details>
@@ -1129,7 +1248,7 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 2.4.0
-`2019-12-27  ·  4 🎉  ·  28 🚀  ·  21 🐛  ·  19 🔍  ·  21 👩‍💻👨‍💻`
+`2019-12-27  ·  4 🎉  ·  28 🚀  ·  29 🐛  ·  19 🔍  ·  22 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.17.0`
@@ -1241,12 +1360,28 @@
 
 - Incorrect translation key on Livechat Appearance template ([#15975](https://github.com/RocketChat/Rocket.Chat/pull/15975) by [@ritwizsinha](https://github.com/ritwizsinha))
 
+- Livechat Widget version 1.3.0 ([#15966](https://github.com/RocketChat/Rocket.Chat/pull/15966))
+
+- Invalid Redirect URI on Custom OAuth ([#15957](https://github.com/RocketChat/Rocket.Chat/pull/15957))
+
 - Livechat build without NodeJS installed ([#15903](https://github.com/RocketChat/Rocket.Chat/pull/15903) by [@localguru](https://github.com/localguru))
 
+- Admin menu not showing after renamed integration permissions ([#15937](https://github.com/RocketChat/Rocket.Chat/pull/15937) by [@n-se](https://github.com/n-se))
+
+- Administration UI issues ([#15934](https://github.com/RocketChat/Rocket.Chat/pull/15934))
+
 - Server crash on sync with no response ([#15919](https://github.com/RocketChat/Rocket.Chat/pull/15919))
 
+- Livechat permissions being overwrite on server restart ([#15915](https://github.com/RocketChat/Rocket.Chat/pull/15915))
+
+- Livechat triggers not firing ([#15897](https://github.com/RocketChat/Rocket.Chat/pull/15897))
+
+- Auto load image user preference ([#15895](https://github.com/RocketChat/Rocket.Chat/pull/15895))
+
 - Don't throw an error when a message is prevented from apps engine ([#15850](https://github.com/RocketChat/Rocket.Chat/pull/15850) by [@wreiske](https://github.com/wreiske))
 
+- Default value of the Livechat WebhookUrl setting ([#15898](https://github.com/RocketChat/Rocket.Chat/pull/15898))
+
 - Thread Replies in Search ([#15841](https://github.com/RocketChat/Rocket.Chat/pull/15841))
 
 - Registration form was hidden when login form was disabled ([#16062](https://github.com/RocketChat/Rocket.Chat/pull/16062))
@@ -1302,6 +1437,7 @@
 - [@breaking-let](https://github.com/breaking-let)
 - [@iannuzzelli](https://github.com/iannuzzelli)
 - [@localguru](https://github.com/localguru)
+- [@n-se](https://github.com/n-se)
 - [@ritwizsinha](https://github.com/ritwizsinha)
 - [@wreiske](https://github.com/wreiske)
 - [@zdumitru](https://github.com/zdumitru)
@@ -1394,7 +1530,7 @@
 - [@tassoevan](https://github.com/tassoevan)
 
 # 2.3.0
-`2019-11-27  ·  13 🎉  ·  17 🚀  ·  26 🐛  ·  19 🔍  ·  25 👩‍💻👨‍💻`
+`2019-11-27  ·  13 🎉  ·  17 🚀  ·  26 🐛  ·  17 🔍  ·  17 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.15.1`
@@ -1526,8 +1662,6 @@
 <summary>🔍 Minor changes</summary>
 
 
-- Release 2.2.0 ([#15681](https://github.com/RocketChat/Rocket.Chat/pull/15681) by [@Montel](https://github.com/Montel) & [@antkaz](https://github.com/antkaz) & [@hmagarotto](https://github.com/hmagarotto) & [@nstseek](https://github.com/nstseek) & [@oguhpereira](https://github.com/oguhpereira) & [@rodrigokamada](https://github.com/rodrigokamada) & [@yusukeh0710](https://github.com/yusukeh0710))
-
 - LingoHub based on develop ([#15822](https://github.com/RocketChat/Rocket.Chat/pull/15822))
 
 - [REGRESSION] Add livechat room type to the room's file list ([#15795](https://github.com/RocketChat/Rocket.Chat/pull/15795))
@@ -1554,8 +1688,6 @@
 
 - Merge master into develop & Set version to 2.3.0-develop ([#15683](https://github.com/RocketChat/Rocket.Chat/pull/15683))
 
-- Release 2.2.0 ([#15681](https://github.com/RocketChat/Rocket.Chat/pull/15681) by [@Montel](https://github.com/Montel) & [@antkaz](https://github.com/antkaz) & [@hmagarotto](https://github.com/hmagarotto) & [@nstseek](https://github.com/nstseek) & [@oguhpereira](https://github.com/oguhpereira) & [@rodrigokamada](https://github.com/rodrigokamada) & [@yusukeh0710](https://github.com/yusukeh0710))
-
 - Fix Livechat duplicated templates error ([#15869](https://github.com/RocketChat/Rocket.Chat/pull/15869))
 
 - Improvements to random password field on user edit/creation ([#15870](https://github.com/RocketChat/Rocket.Chat/pull/15870))
@@ -1569,27 +1701,19 @@
 ### 👩‍💻👨‍💻 Contributors 😍
 
 - [@Exordian](https://github.com/Exordian)
-- [@Montel](https://github.com/Montel)
-- [@antkaz](https://github.com/antkaz)
-- [@hmagarotto](https://github.com/hmagarotto)
 - [@mpdbl](https://github.com/mpdbl)
 - [@nstseek](https://github.com/nstseek)
-- [@oguhpereira](https://github.com/oguhpereira)
 - [@rajvaibhavdubey](https://github.com/rajvaibhavdubey)
-- [@rodrigokamada](https://github.com/rodrigokamada)
 - [@tatosjb](https://github.com/tatosjb)
-- [@yusukeh0710](https://github.com/yusukeh0710)
 
 ### 👩‍💻👨‍💻 Core Team 🤓
 
 - [@MarcosSpessatto](https://github.com/MarcosSpessatto)
 - [@MartinSchoeler](https://github.com/MartinSchoeler)
 - [@d-gubert](https://github.com/d-gubert)
-- [@engelgabriel](https://github.com/engelgabriel)
 - [@gabriellsh](https://github.com/gabriellsh)
 - [@geekgonecrazy](https://github.com/geekgonecrazy)
 - [@ggazzo](https://github.com/ggazzo)
-- [@mar-v](https://github.com/mar-v)
 - [@mariaeduardacunha](https://github.com/mariaeduardacunha)
 - [@pierre-lehnen-rc](https://github.com/pierre-lehnen-rc)
 - [@renatobecker](https://github.com/renatobecker)
@@ -1598,15 +1722,27 @@
 - [@tassoevan](https://github.com/tassoevan)
 
 # 2.2.1
-`2019-11-19`
+`2019-11-19  ·  2 🐛  ·  2 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.15.1`
 - NPM: `6.9.0`
 - MongoDB: `3.4, 3.6, 4.0`
 
+### 🐛 Bug fixes
+
+
+- Markdown link parser ([#15794](https://github.com/RocketChat/Rocket.Chat/pull/15794))
+
+- Updating an app via "Update" button errors out with "App already exists" ([#15814](https://github.com/RocketChat/Rocket.Chat/pull/15814))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@d-gubert](https://github.com/d-gubert)
+- [@ggazzo](https://github.com/ggazzo)
+
 # 2.2.0
-`2019-10-27  ·  14 🎉  ·  16 🚀  ·  22 🐛  ·  27 🔍  ·  27 👩‍💻👨‍💻`
+`2019-10-27  ·  14 🎉  ·  16 🚀  ·  24 🐛  ·  28 🔍  ·  27 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.15.1`
@@ -1690,6 +1826,10 @@
 
 - adjustments for tooltips to show room name instead of id ([#14084](https://github.com/RocketChat/Rocket.Chat/pull/14084) by [@mohamedar97](https://github.com/mohamedar97))
 
+- Read Recepts was not working ([#15603](https://github.com/RocketChat/Rocket.Chat/pull/15603))
+
+- Dynamic import of JS files were not working correctly ([#15598](https://github.com/RocketChat/Rocket.Chat/pull/15598))
+
 - Deny editing visitor's phone number in SMS conversations ([#15602](https://github.com/RocketChat/Rocket.Chat/pull/15602))
 
 - Incorrect display of the button "Invite users" ([#15594](https://github.com/RocketChat/Rocket.Chat/pull/15594))
@@ -1784,6 +1924,8 @@
 
 - Merge master into develop ([#15680](https://github.com/RocketChat/Rocket.Chat/pull/15680) by [@knrt10](https://github.com/knrt10))
 
+- Release 2.1.2 ([#15667](https://github.com/RocketChat/Rocket.Chat/pull/15667) by [@knrt10](https://github.com/knrt10))
+
 </details>
 
 ### 👩‍💻👨‍💻 Contributors 😍
@@ -1820,13 +1962,25 @@
 - [@tassoevan](https://github.com/tassoevan)
 
 # 2.1.3
-`2019-11-19`
+`2019-11-19  ·  2 🐛  ·  2 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.15.1`
 - NPM: `6.9.0`
 - MongoDB: `3.4, 3.6, 4.0`
 
+### 🐛 Bug fixes
+
+
+- Markdown link parser ([#15794](https://github.com/RocketChat/Rocket.Chat/pull/15794))
+
+- Updating an app via "Update" button errors out with "App already exists" ([#15814](https://github.com/RocketChat/Rocket.Chat/pull/15814))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@d-gubert](https://github.com/d-gubert)
+- [@ggazzo](https://github.com/ggazzo)
+
 # 2.1.2
 `2019-10-25  ·  3 🐛  ·  1 🔍  ·  4 👩‍💻👨‍💻`
 
@@ -2075,15 +2229,27 @@
 - [@tassoevan](https://github.com/tassoevan)
 
 # 2.0.1
-`2019-11-19`
+`2019-11-19  ·  2 🐛  ·  2 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.4`
 - NPM: `6.4.1`
 - MongoDB: `3.4, 3.6, 4.0`
 
+### 🐛 Bug fixes
+
+
+- Markdown link parser ([#15794](https://github.com/RocketChat/Rocket.Chat/pull/15794))
+
+- Updating an app via "Update" button errors out with "App already exists" ([#15814](https://github.com/RocketChat/Rocket.Chat/pull/15814))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@d-gubert](https://github.com/d-gubert)
+- [@ggazzo](https://github.com/ggazzo)
+
 # 2.0.0
-`2019-09-12  ·  7 ️️️⚠️  ·  14 🎉  ·  6 🚀  ·  16 🐛  ·  36 🔍  ·  26 👩‍💻👨‍💻`
+`2019-09-12  ·  7 ️️️⚠️  ·  14 🎉  ·  6 🚀  ·  19 🐛  ·  39 🔍  ·  26 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.4`
@@ -2176,6 +2342,12 @@
 
 - TabBar not loading template titles ([#15177](https://github.com/RocketChat/Rocket.Chat/pull/15177) by [@Hudell](https://github.com/Hudell))
 
+- Attachment download button behavior ([#15172](https://github.com/RocketChat/Rocket.Chat/pull/15172))
+
+- Messages search scroll ([#15175](https://github.com/RocketChat/Rocket.Chat/pull/15175))
+
+- IE11 -  callback createTreeWalker doesnt accept acceptNode ([#15157](https://github.com/RocketChat/Rocket.Chat/pull/15157))
+
 - Threads contextual bar button visible even with threads disabled ([#14956](https://github.com/RocketChat/Rocket.Chat/pull/14956) by [@cesarmal](https://github.com/cesarmal))
 
 - Prevent to create discussion with empty name ([#14507](https://github.com/RocketChat/Rocket.Chat/pull/14507))
@@ -2192,6 +2364,8 @@
 <summary>🔍 Minor changes</summary>
 
 
+- Release 1.3.2 ([#15176](https://github.com/RocketChat/Rocket.Chat/pull/15176))
+
 - LingoHub based on develop ([#15218](https://github.com/RocketChat/Rocket.Chat/pull/15218))
 
 - Regression: fix typo permisson to permission ([#15217](https://github.com/RocketChat/Rocket.Chat/pull/15217))
@@ -2206,6 +2380,10 @@
 
 - Update presence package ([#15178](https://github.com/RocketChat/Rocket.Chat/pull/15178))
 
+- Update latest Livechat widget version to 1.1.4 ([#15173](https://github.com/RocketChat/Rocket.Chat/pull/15173))
+
+- Update latest Livechat widget version(1.1.3) ([#15154](https://github.com/RocketChat/Rocket.Chat/pull/15154))
+
 - LingoHub based on develop ([#15166](https://github.com/RocketChat/Rocket.Chat/pull/15166))
 
 - Switch outdated roadmap to point to milestones ([#15156](https://github.com/RocketChat/Rocket.Chat/pull/15156))
@@ -2355,7 +2533,7 @@
 - [@tassoevan](https://github.com/tassoevan)
 
 # 1.3.1
-`2019-08-08  ·  2 🐛  ·  1 🔍  ·  3 👩‍💻👨‍💻`
+`2019-08-08  ·  2 🐛  ·  2 🔍  ·  3 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.4`
@@ -2375,6 +2553,8 @@
 
 - Release 1.3.1 ([#15148](https://github.com/RocketChat/Rocket.Chat/pull/15148))
 
+- Fix custom auth ([#15141](https://github.com/RocketChat/Rocket.Chat/pull/15141))
+
 </details>
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -2384,7 +2564,7 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 1.3.0
-`2019-08-02  ·  9 🎉  ·  6 🚀  ·  31 🐛  ·  31 🔍  ·  29 👩‍💻👨‍💻`
+`2019-08-02  ·  9 🎉  ·  6 🚀  ·  32 🐛  ·  32 🔍  ·  29 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.4`
@@ -2492,10 +2672,14 @@
 
 - setupWizard calling multiple getSetupWizardParameters ([#15060](https://github.com/RocketChat/Rocket.Chat/pull/15060))
 
+- Not sanitized message types ([#15054](https://github.com/RocketChat/Rocket.Chat/pull/15054))
+
 <details>
 <summary>🔍 Minor changes</summary>
 
 
+- Release 1.2.1 ([#14898](https://github.com/RocketChat/Rocket.Chat/pull/14898))
+
 - Wrong text when reporting a message ([#14515](https://github.com/RocketChat/Rocket.Chat/pull/14515) by [@zdumitru](https://github.com/zdumitru))
 
 - Add missing French translation ([#15013](https://github.com/RocketChat/Rocket.Chat/pull/15013) by [@commiaI](https://github.com/commiaI))
@@ -2596,21 +2780,42 @@
 - [@tassoevan](https://github.com/tassoevan)
 
 # 1.2.4
-`2019-08-08`
+`2019-08-08  ·  1 🔍  ·  1 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.4`
 - NPM: `6.4.1`
 - MongoDB: `3.2, 3.4, 3.6, 4.0`
 
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Fix custom auth ([#15141](https://github.com/RocketChat/Rocket.Chat/pull/15141))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+
 # 1.2.2
-`2019-07-29`
+`2019-07-29  ·  1 🐛  ·  1 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.4`
 - NPM: `6.4.1`
 - MongoDB: `3.2, 3.4, 3.6, 4.0`
 
+### 🐛 Bug fixes
+
+
+- Not sanitized message types ([#15054](https://github.com/RocketChat/Rocket.Chat/pull/15054))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@ggazzo](https://github.com/ggazzo)
+
 # 1.2.1
 `2019-06-28  ·  1 🐛  ·  1 🔍  ·  2 👩‍💻👨‍💻`
 
@@ -2638,7 +2843,7 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 1.2.0
-`2019-06-27  ·  8 🎉  ·  4 🚀  ·  12 🐛  ·  8 🔍  ·  21 👩‍💻👨‍💻`
+`2019-06-27  ·  8 🎉  ·  4 🚀  ·  13 🐛  ·  9 🔍  ·  21 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.4`
@@ -2682,6 +2887,8 @@
 
 - Removes E2E action button, icon and banner when E2E is disabled. ([#14810](https://github.com/RocketChat/Rocket.Chat/pull/14810))
 
+- Gap of messages when loading history when using threads ([#14837](https://github.com/RocketChat/Rocket.Chat/pull/14837))
+
 - Assume microphone is available ([#14710](https://github.com/RocketChat/Rocket.Chat/pull/14710))
 
 - Move the set Avatar call on user creation to make sure the user has username ([#14665](https://github.com/RocketChat/Rocket.Chat/pull/14665))
@@ -2706,6 +2913,8 @@
 <summary>🔍 Minor changes</summary>
 
 
+- Regression: thread loading parent msg if is not loaded ([#14839](https://github.com/RocketChat/Rocket.Chat/pull/14839))
+
 - Fix not fully extracted pieces ([#14805](https://github.com/RocketChat/Rocket.Chat/pull/14805))
 
 - Regression: Fix file upload ([#14804](https://github.com/RocketChat/Rocket.Chat/pull/14804))
@@ -2752,21 +2961,42 @@
 - [@tassoevan](https://github.com/tassoevan)
 
 # 1.1.5
-`2019-08-08`
+`2019-08-08  ·  1 🔍  ·  1 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.4`
 - NPM: `6.4.1`
 - MongoDB: `3.2, 3.4, 3.6, 4.0`
 
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Fix custom auth ([#15141](https://github.com/RocketChat/Rocket.Chat/pull/15141))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+
 # 1.1.4
-`2019-07-29`
+`2019-07-29  ·  1 🐛  ·  1 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.4`
 - NPM: `6.4.1`
 - MongoDB: `3.2, 3.4, 3.6, 4.0`
 
+### 🐛 Bug fixes
+
+
+- Not sanitized message types ([#15054](https://github.com/RocketChat/Rocket.Chat/pull/15054))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@ggazzo](https://github.com/ggazzo)
+
 # 1.1.3
 `2019-06-21  ·  1 🐛  ·  2 🔍  ·  2 👩‍💻👨‍💻`
 
@@ -2863,7 +3093,7 @@
 - [@ggazzo](https://github.com/ggazzo)
 
 # 1.1.0
-`2019-05-27  ·  5 🎉  ·  10 🚀  ·  52 🐛  ·  35 🔍  ·  27 👩‍💻👨‍💻`
+`2019-05-27  ·  5 🎉  ·  10 🚀  ·  59 🐛  ·  35 🔍  ·  28 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.4`
@@ -2999,6 +3229,20 @@
 
 - New day separator overlapping above system message ([#14362](https://github.com/RocketChat/Rocket.Chat/pull/14362))
 
+- Popup cloud console in new window ([#14296](https://github.com/RocketChat/Rocket.Chat/pull/14296))
+
+- Switch oplog required doc link to more accurate link ([#14288](https://github.com/RocketChat/Rocket.Chat/pull/14288))
+
+- Optional exit on Unhandled Promise Rejection ([#14291](https://github.com/RocketChat/Rocket.Chat/pull/14291))
+
+- Error when accessing avatar with no token ([#14293](https://github.com/RocketChat/Rocket.Chat/pull/14293))
+
+- Startup error in registration check ([#14286](https://github.com/RocketChat/Rocket.Chat/pull/14286))
+
+- Wrong header at Apps admin section ([#14290](https://github.com/RocketChat/Rocket.Chat/pull/14290))
+
+- Error when accessing an invalid file upload url ([#14282](https://github.com/RocketChat/Rocket.Chat/pull/14282) by [@wreiske](https://github.com/wreiske))
+
 - E2E messages not decrypting in message threads ([#14580](https://github.com/RocketChat/Rocket.Chat/pull/14580))
 
 - Send replyTo for livechat offline messages ([#14568](https://github.com/RocketChat/Rocket.Chat/pull/14568))
@@ -3114,6 +3358,7 @@
 
 - [@MarcosSpessatto](https://github.com/MarcosSpessatto)
 - [@alansikora](https://github.com/alansikora)
+- [@d-gubert](https://github.com/d-gubert)
 - [@engelgabriel](https://github.com/engelgabriel)
 - [@geekgonecrazy](https://github.com/geekgonecrazy)
 - [@ggazzo](https://github.com/ggazzo)
@@ -3293,7 +3538,7 @@
 - [@rodrigok](https://github.com/rodrigok)
 
 # 1.0.0
-`2019-04-28  ·  4 ️️️⚠️  ·  30 🎉  ·  32 🚀  ·  97 🐛  ·  173 🔍  ·  60 👩‍💻👨‍💻`
+`2019-04-28  ·  4 ️️️⚠️  ·  34 🎉  ·  33 🚀  ·  107 🐛  ·  174 🔍  ·  60 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.4`
@@ -3346,6 +3591,14 @@
 
 - User avatars from external source ([#7929](https://github.com/RocketChat/Rocket.Chat/pull/7929) by [@mjovanovic0](https://github.com/mjovanovic0))
 
+- Limit all DDP/Websocket requests (configurable via admin panel) ([#13311](https://github.com/RocketChat/Rocket.Chat/pull/13311))
+
+- REST endpoint to forward livechat rooms ([#13308](https://github.com/RocketChat/Rocket.Chat/pull/13308))
+
+- Collect data for Monthly/Daily Active Users for a future dashboard ([#11525](https://github.com/RocketChat/Rocket.Chat/pull/11525))
+
+- Add parseUrls field to the apps message converter ([#13248](https://github.com/RocketChat/Rocket.Chat/pull/13248))
+
 - Add an option to delete file in files list ([#13815](https://github.com/RocketChat/Rocket.Chat/pull/13815))
 
 - Threads V 1.0 ([#13996](https://github.com/RocketChat/Rocket.Chat/pull/13996))
@@ -3415,6 +3668,8 @@
 
 - Update deleteUser errors to be more semantic ([#12380](https://github.com/RocketChat/Rocket.Chat/pull/12380) by [@timkinnane](https://github.com/timkinnane))
 
+- Send `uniqueID` to all clients so Jitsi rooms can be created correctly ([#13342](https://github.com/RocketChat/Rocket.Chat/pull/13342))
+
 - Line height on static content pages ([#11673](https://github.com/RocketChat/Rocket.Chat/pull/11673) by [@timkinnane](https://github.com/timkinnane))
 
 - new icons ([#13289](https://github.com/RocketChat/Rocket.Chat/pull/13289))
@@ -3568,6 +3823,26 @@
 
 - Fixed text for "bulk-register-user" ([#11558](https://github.com/RocketChat/Rocket.Chat/pull/11558) by [@the4ndy](https://github.com/the4ndy))
 
+- Pass token for cloud register ([#13350](https://github.com/RocketChat/Rocket.Chat/pull/13350))
+
+- Setup wizard calling 'saveSetting' for each field/setting ([#13349](https://github.com/RocketChat/Rocket.Chat/pull/13349))
+
+- Rate Limiter was limiting communication between instances ([#13326](https://github.com/RocketChat/Rocket.Chat/pull/13326))
+
+- Mobile view and re-enable E2E tests ([#13322](https://github.com/RocketChat/Rocket.Chat/pull/13322))
+
+- Hipchat Enterprise Importer not generating subscriptions ([#13293](https://github.com/RocketChat/Rocket.Chat/pull/13293) by [@Hudell](https://github.com/Hudell))
+
+- Message updating by Apps ([#13294](https://github.com/RocketChat/Rocket.Chat/pull/13294))
+
+- REST endpoint for creating custom emojis ([#13306](https://github.com/RocketChat/Rocket.Chat/pull/13306))
+
+- Preview of image uploads were not working when apps framework is enable ([#13303](https://github.com/RocketChat/Rocket.Chat/pull/13303))
+
+- HipChat Enterprise importer fails when importing a large amount of messages (millions) ([#13221](https://github.com/RocketChat/Rocket.Chat/pull/13221) by [@Hudell](https://github.com/Hudell))
+
+- Fix bug when user try recreate channel or group with same name and remove room from cache when user leaves room ([#12341](https://github.com/RocketChat/Rocket.Chat/pull/12341))
+
 - Closing sidebar when room menu is clicked. ([#13842](https://github.com/RocketChat/Rocket.Chat/pull/13842) by [@Kailash0311](https://github.com/Kailash0311))
 
 - Check settings for name requirement before validating ([#14021](https://github.com/RocketChat/Rocket.Chat/pull/14021))
@@ -3840,6 +4115,8 @@
 
 - Removed old templates ([#13406](https://github.com/RocketChat/Rocket.Chat/pull/13406))
 
+- Fix: Missing export in cloud package ([#13282](https://github.com/RocketChat/Rocket.Chat/pull/13282))
+
 - Add pagination to getUsersOfRoom ([#12834](https://github.com/RocketChat/Rocket.Chat/pull/12834) by [@Hudell](https://github.com/Hudell))
 
 - OpenShift custom OAuth support ([#13925](https://github.com/RocketChat/Rocket.Chat/pull/13925) by [@bsharrow](https://github.com/bsharrow))
@@ -4213,7 +4490,7 @@
 - [@tassoevan](https://github.com/tassoevan)
 
 # 0.74.0
-`2019-01-28  ·  10 🎉  ·  11 🚀  ·  17 🐛  ·  38 🔍  ·  24 👩‍💻👨‍💻`
+`2019-01-28  ·  11 🎉  ·  11 🚀  ·  15 🐛  ·  36 🔍  ·  22 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.4`
@@ -4243,6 +4520,8 @@
 
 - Add Allow Methods directive to CORS ([#13073](https://github.com/RocketChat/Rocket.Chat/pull/13073))
 
+- Cloud Integration ([#13013](https://github.com/RocketChat/Rocket.Chat/pull/13013))
+
 ### 🚀 Improvements
 
 
@@ -4271,10 +4550,6 @@
 ### 🐛 Bug fixes
 
 
-- Few polish translating ([#13112](https://github.com/RocketChat/Rocket.Chat/pull/13112) by [@theundefined](https://github.com/theundefined))
-
-- Few polish translating ([#13112](https://github.com/RocketChat/Rocket.Chat/pull/13112) by [@theundefined](https://github.com/theundefined))
-
 - Update Message: Does not show edited when message was not edited. ([#13053](https://github.com/RocketChat/Rocket.Chat/pull/13053) by [@Kailash0311](https://github.com/Kailash0311))
 
 - Notifications for mentions not working on large rooms and don't emit desktop notifications for offline users ([#13067](https://github.com/RocketChat/Rocket.Chat/pull/13067))
@@ -4311,8 +4586,6 @@
 
 - Release 0.74.0 ([#13270](https://github.com/RocketChat/Rocket.Chat/pull/13270) by [@Xuhao](https://github.com/Xuhao) & [@supra08](https://github.com/supra08))
 
-- Regression: Fix message pinning ([#13213](https://github.com/RocketChat/Rocket.Chat/pull/13213) by [@TkTech](https://github.com/TkTech))
-
 - LingoHub based on develop ([#13201](https://github.com/RocketChat/Rocket.Chat/pull/13201))
 
 - Language: Edit typo "Обновлить" ([#13177](https://github.com/RocketChat/Rocket.Chat/pull/13177) by [@zpavlig](https://github.com/zpavlig))
@@ -4379,8 +4652,6 @@
 
 - Regression: Fix audio message upload ([#13224](https://github.com/RocketChat/Rocket.Chat/pull/13224))
 
-- Regression: Fix message pinning ([#13213](https://github.com/RocketChat/Rocket.Chat/pull/13213) by [@TkTech](https://github.com/TkTech))
-
 - Regression: Fix emoji search ([#13207](https://github.com/RocketChat/Rocket.Chat/pull/13207))
 
 - Change apps engine persistence bridge method to updateByAssociations ([#13239](https://github.com/RocketChat/Rocket.Chat/pull/13239))
@@ -4392,7 +4663,6 @@
 - [@Hudell](https://github.com/Hudell)
 - [@Jeroeny](https://github.com/Jeroeny)
 - [@Kailash0311](https://github.com/Kailash0311)
-- [@TkTech](https://github.com/TkTech)
 - [@Xuhao](https://github.com/Xuhao)
 - [@alexbartsch](https://github.com/alexbartsch)
 - [@behnejad](https://github.com/behnejad)
@@ -4400,7 +4670,6 @@
 - [@ohmonster](https://github.com/ohmonster)
 - [@piotrkochan](https://github.com/piotrkochan)
 - [@supra08](https://github.com/supra08)
-- [@theundefined](https://github.com/theundefined)
 - [@zpavlig](https://github.com/zpavlig)
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -4475,12 +4744,17 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 0.73.0
-`2018-12-28  ·  10 🎉  ·  9 🚀  ·  34 🐛  ·  84 🔍  ·  26 👩‍💻👨‍💻`
+`2018-12-28  ·  1 ️️️⚠️  ·  16 🎉  ·  25 🚀  ·  60 🐛  ·  165 🔍  ·  39 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.4`
 - NPM: `6.4.1`
 
+### ⚠️ BREAKING CHANGES
+
+
+- Update to Meteor to 1.8 ([#12468](https://github.com/RocketChat/Rocket.Chat/pull/12468))
+
 ### 🎉 New features
 
 
@@ -4504,6 +4778,18 @@
 
 - Include message type & id in push notification payload ([#12771](https://github.com/RocketChat/Rocket.Chat/pull/12771) by [@cardoso](https://github.com/cardoso))
 
+- Add permission to enable personal access token to specific roles ([#12309](https://github.com/RocketChat/Rocket.Chat/pull/12309))
+
+- Option to reset e2e key ([#12483](https://github.com/RocketChat/Rocket.Chat/pull/12483) by [@Hudell](https://github.com/Hudell))
+
+- /api/v1/spotlight: return joinCodeRequired field for rooms ([#12651](https://github.com/RocketChat/Rocket.Chat/pull/12651) by [@cardoso](https://github.com/cardoso))
+
+- New API Endpoints for the new version of JS SDK ([#12623](https://github.com/RocketChat/Rocket.Chat/pull/12623))
+
+- Setting to configure robots.txt content ([#12547](https://github.com/RocketChat/Rocket.Chat/pull/12547) by [@Hudell](https://github.com/Hudell))
+
+- Make Livechat's widget draggable ([#12378](https://github.com/RocketChat/Rocket.Chat/pull/12378))
+
 ### 🚀 Improvements
 
 
@@ -4525,6 +4811,38 @@
 
 - Username suggestion logic ([#12779](https://github.com/RocketChat/Rocket.Chat/pull/12779))
 
+- Allow apps to update persistence by association ([#12714](https://github.com/RocketChat/Rocket.Chat/pull/12714))
+
+- Add more methods to deal with rooms via Rocket.Chat.Apps ([#12680](https://github.com/RocketChat/Rocket.Chat/pull/12680))
+
+- Better query for finding subscriptions that need a new E2E Key ([#12692](https://github.com/RocketChat/Rocket.Chat/pull/12692) by [@Hudell](https://github.com/Hudell))
+
+- Improve unreads and unreadsFrom response, prevent it to be equal null ([#12563](https://github.com/RocketChat/Rocket.Chat/pull/12563))
+
+- Add rooms property in user object, if the user has the permission, with rooms roles ([#12105](https://github.com/RocketChat/Rocket.Chat/pull/12105))
+
+- border-radius to use --border-radius ([#12675](https://github.com/RocketChat/Rocket.Chat/pull/12675))
+
+- Update the 'keyboard shortcuts' documentation ([#12564](https://github.com/RocketChat/Rocket.Chat/pull/12564) by [@nicolasbock](https://github.com/nicolasbock))
+
+- Add new acceptable header for Livechat REST requests ([#12561](https://github.com/RocketChat/Rocket.Chat/pull/12561))
+
+- Atlassian Crowd settings and option to sync user data ([#12616](https://github.com/RocketChat/Rocket.Chat/pull/12616))
+
+- CircleCI to use MongoDB 4.0 for testing ([#12618](https://github.com/RocketChat/Rocket.Chat/pull/12618))
+
+- Japanese translations ([#12382](https://github.com/RocketChat/Rocket.Chat/pull/12382) by [@ura14h](https://github.com/ura14h))
+
+- Add CTRL modifier for keyboard shortcut ([#12525](https://github.com/RocketChat/Rocket.Chat/pull/12525) by [@nicolasbock](https://github.com/nicolasbock))
+
+- Ignore non-existent Livechat custom fields on Livechat API ([#12522](https://github.com/RocketChat/Rocket.Chat/pull/12522))
+
+- Emoji search on messageBox behaving like emojiPicker's search (#9607) ([#12452](https://github.com/RocketChat/Rocket.Chat/pull/12452) by [@vinade](https://github.com/vinade))
+
+- German translations ([#12471](https://github.com/RocketChat/Rocket.Chat/pull/12471) by [@mrsimpson](https://github.com/mrsimpson))
+
+- Limit the number of typing users shown (#8722) ([#12400](https://github.com/RocketChat/Rocket.Chat/pull/12400) by [@vinade](https://github.com/vinade))
+
 ### 🐛 Bug fixes
 
 
@@ -4586,6 +4904,12 @@
 
 - Version check update notification ([#12905](https://github.com/RocketChat/Rocket.Chat/pull/12905))
 
+- line-height for unread bar buttons (jump to first and mark as read) ([#12900](https://github.com/RocketChat/Rocket.Chat/pull/12900))
+
+- PDF view loading indicator ([#12882](https://github.com/RocketChat/Rocket.Chat/pull/12882))
+
+- Reset password email ([#12898](https://github.com/RocketChat/Rocket.Chat/pull/12898))
+
 - Data Import not working ([#12866](https://github.com/RocketChat/Rocket.Chat/pull/12866) by [@Hudell](https://github.com/Hudell))
 
 - Incorrect parameter name in Livechat stream ([#12851](https://github.com/RocketChat/Rocket.Chat/pull/12851))
@@ -4594,12 +4918,62 @@
 
 - Google Cloud Storage storage provider ([#12843](https://github.com/RocketChat/Rocket.Chat/pull/12843))
 
+- Update caret position on insert a new line in message box ([#12713](https://github.com/RocketChat/Rocket.Chat/pull/12713))
+
+- DE translation for idle-time-limit ([#12637](https://github.com/RocketChat/Rocket.Chat/pull/12637) by [@pfuender](https://github.com/pfuender))
+
+- Fixed Anonymous Registration ([#12633](https://github.com/RocketChat/Rocket.Chat/pull/12633) by [@wreiske](https://github.com/wreiske))
+
+- high cpu usage ~ svg icon ([#12677](https://github.com/RocketChat/Rocket.Chat/pull/12677) by [@ph1p](https://github.com/ph1p))
+
+- Fix favico error ([#12643](https://github.com/RocketChat/Rocket.Chat/pull/12643))
+
+- Condition to not render PDF preview ([#12632](https://github.com/RocketChat/Rocket.Chat/pull/12632))
+
+- Admin styles ([#12614](https://github.com/RocketChat/Rocket.Chat/pull/12614))
+
+- Admin styles ([#12602](https://github.com/RocketChat/Rocket.Chat/pull/12602))
+
+- Change registration message when user need to confirm email ([#9336](https://github.com/RocketChat/Rocket.Chat/pull/9336) by [@karlprieb](https://github.com/karlprieb))
+
+- Import missed file in rocketchat-authorization ([#12570](https://github.com/RocketChat/Rocket.Chat/pull/12570))
+
+- Prevent subscriptions and calls to rooms events that the user is not participating ([#12558](https://github.com/RocketChat/Rocket.Chat/pull/12558))
+
+- Wrong test case for `users.setAvatar` endpoint ([#12539](https://github.com/RocketChat/Rocket.Chat/pull/12539))
+
+- Spotlight method being called multiple times ([#12536](https://github.com/RocketChat/Rocket.Chat/pull/12536))
+
+- German translation for for API_EmbedIgnoredHosts label ([#12518](https://github.com/RocketChat/Rocket.Chat/pull/12518) by [@mbrodala](https://github.com/mbrodala))
+
+- Handle all events for enter key in message box ([#12507](https://github.com/RocketChat/Rocket.Chat/pull/12507))
+
+- Fix wrong parameter in chat.delete endpoint and add some test cases ([#12408](https://github.com/RocketChat/Rocket.Chat/pull/12408))
+
+- Email sending with GDPR user data ([#12487](https://github.com/RocketChat/Rocket.Chat/pull/12487))
+
+- Manage own integrations permissions check ([#12397](https://github.com/RocketChat/Rocket.Chat/pull/12397))
+
+- stream room-changed ([#12411](https://github.com/RocketChat/Rocket.Chat/pull/12411))
+
+- Emoji picker is not in viewport on small screens ([#12457](https://github.com/RocketChat/Rocket.Chat/pull/12457) by [@ramrami](https://github.com/ramrami))
+
+- `Disabled` word translation to Spanish ([#12406](https://github.com/RocketChat/Rocket.Chat/pull/12406) by [@Ismaw34](https://github.com/Ismaw34))
+
+- `Disabled` word translation to Chinese ([#12260](https://github.com/RocketChat/Rocket.Chat/pull/12260) by [@AndreamApp](https://github.com/AndreamApp))
+
+- Correct roomName value in Mail Messages (#12363) ([#12453](https://github.com/RocketChat/Rocket.Chat/pull/12453) by [@vinade](https://github.com/vinade))
+
 - Download files without extension wasn't possible ([#13033](https://github.com/RocketChat/Rocket.Chat/pull/13033))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
 
+- Release 0.72.3 ([#12932](https://github.com/RocketChat/Rocket.Chat/pull/12932) by [@Hudell](https://github.com/Hudell) & [@piotrkochan](https://github.com/piotrkochan))
+
+- Release 0.72.2 ([#12901](https://github.com/RocketChat/Rocket.Chat/pull/12901))
+
 - LingoHub based on develop ([#13014](https://github.com/RocketChat/Rocket.Chat/pull/13014))
 
 - Move isFirefox and isChrome functions to rocketchat-utils ([#13011](https://github.com/RocketChat/Rocket.Chat/pull/13011))
@@ -4762,102 +5136,275 @@
 
 - Merge master into develop & Set version to 0.73.0-develop ([#12776](https://github.com/RocketChat/Rocket.Chat/pull/12776))
 
-- Change `chat.getDeletedMessages` to get messages after informed date and return only message's _id ([#13021](https://github.com/RocketChat/Rocket.Chat/pull/13021))
+- Update Apps Engine to 1.3.1 ([#12741](https://github.com/RocketChat/Rocket.Chat/pull/12741))
 
-- Improve Importer code quality ([#13020](https://github.com/RocketChat/Rocket.Chat/pull/13020) by [@Hudell](https://github.com/Hudell))
+- Regression: Expand Administration sections by toggling section title ([#12736](https://github.com/RocketChat/Rocket.Chat/pull/12736))
 
-- Regression: List of custom emojis wasn't working ([#13031](https://github.com/RocketChat/Rocket.Chat/pull/13031))
+- Regression: Fix Safari detection in PDF previewing ([#12737](https://github.com/RocketChat/Rocket.Chat/pull/12737))
 
-</details>
+- Regression: Account pages layout ([#12735](https://github.com/RocketChat/Rocket.Chat/pull/12735))
 
-### 👩‍💻👨‍💻 Contributors 😍
+- Regression: Inherit font-family for message box ([#12729](https://github.com/RocketChat/Rocket.Chat/pull/12729))
 
-- [@Hudell](https://github.com/Hudell)
-- [@alexbartsch](https://github.com/alexbartsch)
-- [@cardoso](https://github.com/cardoso)
-- [@cyberb](https://github.com/cyberb)
-- [@hypery2k](https://github.com/hypery2k)
-- [@karakayasemi](https://github.com/karakayasemi)
-- [@karlprieb](https://github.com/karlprieb)
-- [@localguru](https://github.com/localguru)
-- [@lvyue](https://github.com/lvyue)
-- [@mathysie](https://github.com/mathysie)
-- [@piotrkochan](https://github.com/piotrkochan)
-- [@rssilva](https://github.com/rssilva)
-- [@sanketsingh24](https://github.com/sanketsingh24)
-- [@tsukiRep](https://github.com/tsukiRep)
-- [@ura14h](https://github.com/ura14h)
+- Fix some Ukrainian translations ([#12712](https://github.com/RocketChat/Rocket.Chat/pull/12712) by [@zdumitru](https://github.com/zdumitru))
 
-### 👩‍💻👨‍💻 Core Team 🤓
+- Improve: Add missing translation keys. ([#12708](https://github.com/RocketChat/Rocket.Chat/pull/12708) by [@ura14h](https://github.com/ura14h))
 
-- [@LuluGO](https://github.com/LuluGO)
-- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
-- [@d-gubert](https://github.com/d-gubert)
-- [@engelgabriel](https://github.com/engelgabriel)
-- [@geekgonecrazy](https://github.com/geekgonecrazy)
-- [@ggazzo](https://github.com/ggazzo)
-- [@marceloschmidt](https://github.com/marceloschmidt)
-- [@renatobecker](https://github.com/renatobecker)
-- [@rodrigok](https://github.com/rodrigok)
-- [@sampaiodiego](https://github.com/sampaiodiego)
-- [@tassoevan](https://github.com/tassoevan)
+- Bump Apps Engine to 1.3.0 ([#12705](https://github.com/RocketChat/Rocket.Chat/pull/12705))
 
-# 0.72.3
-`2018-12-12  ·  1 🔍  ·  5 👩‍💻👨‍💻`
+- Fix: Exception when registering a user with gravatar ([#12699](https://github.com/RocketChat/Rocket.Chat/pull/12699))
 
-<details>
-<summary>🔍 Minor changes</summary>
+- Fix: Fix tests by increasing window size ([#12707](https://github.com/RocketChat/Rocket.Chat/pull/12707))
 
+- LingoHub based on develop ([#12684](https://github.com/RocketChat/Rocket.Chat/pull/12684))
 
-- Release 0.72.3 ([#12932](https://github.com/RocketChat/Rocket.Chat/pull/12932) by [@Hudell](https://github.com/Hudell) & [@piotrkochan](https://github.com/piotrkochan))
+- Convert rocketchat-mail-messages to main module structure ([#12682](https://github.com/RocketChat/Rocket.Chat/pull/12682))
 
-</details>
+-  Convert rocketchat-livestream to main module structure ([#12679](https://github.com/RocketChat/Rocket.Chat/pull/12679))
 
-### 👩‍💻👨‍💻 Contributors 😍
+- Added "npm install" to quick start for developers ([#12374](https://github.com/RocketChat/Rocket.Chat/pull/12374) by [@wreiske](https://github.com/wreiske))
 
-- [@Hudell](https://github.com/Hudell)
-- [@piotrkochan](https://github.com/piotrkochan)
+- Convert rocketchat-ldap to main module structure ([#12678](https://github.com/RocketChat/Rocket.Chat/pull/12678))
 
-### 👩‍💻👨‍💻 Core Team 🤓
+- Convert rocketchat-issuelinks to main module structure ([#12674](https://github.com/RocketChat/Rocket.Chat/pull/12674))
 
-- [@ggazzo](https://github.com/ggazzo)
-- [@rodrigok](https://github.com/rodrigok)
-- [@tassoevan](https://github.com/tassoevan)
+- Convert rocketchat-integrations to main module structure ([#12670](https://github.com/RocketChat/Rocket.Chat/pull/12670))
 
-# 0.72.2
-`2018-12-10  ·  2 🐛  ·  1 🔍  ·  2 👩‍💻👨‍💻`
+- Convert rocketchat-irc to main module structure ([#12672](https://github.com/RocketChat/Rocket.Chat/pull/12672))
 
-### 🐛 Bug fixes
+- Convert rocketchat-internal-hubot to main module structure ([#12671](https://github.com/RocketChat/Rocket.Chat/pull/12671))
 
+- Convert rocketchat-importer-hipchat-enterprise to main module structure ([#12665](https://github.com/RocketChat/Rocket.Chat/pull/12665))
 
-- line-height for unread bar buttons (jump to first and mark as read) ([#12900](https://github.com/RocketChat/Rocket.Chat/pull/12900))
+- Convert rocketchat-importer-slack-users to main module structure ([#12669](https://github.com/RocketChat/Rocket.Chat/pull/12669))
 
-- PDF view loading indicator ([#12882](https://github.com/RocketChat/Rocket.Chat/pull/12882))
+-  Convert rocketchat-importer-slack to main module structure ([#12666](https://github.com/RocketChat/Rocket.Chat/pull/12666))
 
-<details>
-<summary>🔍 Minor changes</summary>
+- Convert rocketchat-iframe-login to main module structure ([#12661](https://github.com/RocketChat/Rocket.Chat/pull/12661))
 
+- Convert rocketchat-importer to main module structure ([#12662](https://github.com/RocketChat/Rocket.Chat/pull/12662))
 
-- Release 0.72.2 ([#12901](https://github.com/RocketChat/Rocket.Chat/pull/12901))
+- Convert rocketchat-importer-csv to main module structure ([#12663](https://github.com/RocketChat/Rocket.Chat/pull/12663))
 
-</details>
+- Convert rocketchat-importer-hipchat to main module structure ([#12664](https://github.com/RocketChat/Rocket.Chat/pull/12664))
 
-### 👩‍💻👨‍💻 Core Team 🤓
+- Convert rocketchat-highlight-words to main module structure ([#12659](https://github.com/RocketChat/Rocket.Chat/pull/12659))
 
-- [@sampaiodiego](https://github.com/sampaiodiego)
-- [@tassoevan](https://github.com/tassoevan)
+- Convert rocketchat-grant to main module structure ([#12657](https://github.com/RocketChat/Rocket.Chat/pull/12657))
 
-# 0.72.1
-`2018-12-05  ·  4 🐛  ·  3 🔍  ·  8 👩‍💻👨‍💻`
+- Convert rocketchat-graphql to main module structure ([#12658](https://github.com/RocketChat/Rocket.Chat/pull/12658))
 
-### 🐛 Bug fixes
+- Convert rocketchat-google-vision to main module structure ([#12649](https://github.com/RocketChat/Rocket.Chat/pull/12649))
 
+- Removed RocketChatFile from globals ([#12650](https://github.com/RocketChat/Rocket.Chat/pull/12650))
 
-- Change spread operator to Array.from for Edge browser ([#12818](https://github.com/RocketChat/Rocket.Chat/pull/12818) by [@ohmonster](https://github.com/ohmonster))
+- Added imports for global variables in rocketchat-google-natural-language package ([#12647](https://github.com/RocketChat/Rocket.Chat/pull/12647))
 
-- API users.info returns caller rooms and not requested user ones ([#12727](https://github.com/RocketChat/Rocket.Chat/pull/12727) by [@piotrkochan](https://github.com/piotrkochan))
+- Convert rocketchat-gitlab to main module structure ([#12646](https://github.com/RocketChat/Rocket.Chat/pull/12646))
 
-- Missing HipChat Enterprise Importer ([#12847](https://github.com/RocketChat/Rocket.Chat/pull/12847) by [@Hudell](https://github.com/Hudell))
+- Convert rocketchat-file to main module structure ([#12644](https://github.com/RocketChat/Rocket.Chat/pull/12644))
+
+- Convert rocketchat-github-enterprise to main module structure ([#12642](https://github.com/RocketChat/Rocket.Chat/pull/12642))
+
+- Fix: Add email dependency in package.js ([#12645](https://github.com/RocketChat/Rocket.Chat/pull/12645))
+
+- Convert rocketchat-custom-sounds to main module structure ([#12599](https://github.com/RocketChat/Rocket.Chat/pull/12599))
+
+- Fix crowd error with import of SyncedCron ([#12641](https://github.com/RocketChat/Rocket.Chat/pull/12641))
+
+- Convert emoji-emojione to main module structure ([#12605](https://github.com/RocketChat/Rocket.Chat/pull/12605))
+
+- Convert rocketchat-favico to main module structure ([#12607](https://github.com/RocketChat/Rocket.Chat/pull/12607))
+
+-  Convert rocketchat-emoji-custom to main module structure ([#12604](https://github.com/RocketChat/Rocket.Chat/pull/12604))
+
+- Convert rocketchat-error-handler to main module structure ([#12606](https://github.com/RocketChat/Rocket.Chat/pull/12606))
+
+- Convert rocketchat-drupal to main module structure ([#12601](https://github.com/RocketChat/Rocket.Chat/pull/12601))
+
+- Convert rocketchat-crowd to main module structure ([#12596](https://github.com/RocketChat/Rocket.Chat/pull/12596))
+
+- Convert rocketchat-emoji to main module structure ([#12603](https://github.com/RocketChat/Rocket.Chat/pull/12603))
+
+- Fix users.setAvatar endpoint tests and logic ([#12625](https://github.com/RocketChat/Rocket.Chat/pull/12625))
+
+- [DOCS] Remove Cordova links, include F-Droid download button and few other adjustments ([#12583](https://github.com/RocketChat/Rocket.Chat/pull/12583) by [@rafaelks](https://github.com/rafaelks))
+
+- Convert rocketchat-dolphin to main module structure ([#12600](https://github.com/RocketChat/Rocket.Chat/pull/12600))
+
+-  Convert rocketchat-channel-settings to main module structure ([#12594](https://github.com/RocketChat/Rocket.Chat/pull/12594))
+
+- Convert rocketchat-cors to main module structure ([#12595](https://github.com/RocketChat/Rocket.Chat/pull/12595))
+
+- Convert rocketchat-autotranslate to main module structure ([#12530](https://github.com/RocketChat/Rocket.Chat/pull/12530))
+
+- Convert rocketchat-channel-settings-mail-messages to main module structure ([#12537](https://github.com/RocketChat/Rocket.Chat/pull/12537))
+
+- Convert rocketchat-colors to main module structure ([#12538](https://github.com/RocketChat/Rocket.Chat/pull/12538))
+
+- Convert rocketchat-cas to main module structure ([#12532](https://github.com/RocketChat/Rocket.Chat/pull/12532))
+
+- Convert rocketchat-bot-helpers to main module structure ([#12531](https://github.com/RocketChat/Rocket.Chat/pull/12531))
+
+- Convert rocketchat-autolinker to main module structure ([#12529](https://github.com/RocketChat/Rocket.Chat/pull/12529))
+
+- Convert rocketchat-authorization to main module structure ([#12523](https://github.com/RocketChat/Rocket.Chat/pull/12523))
+
+- Fix CSS import order ([#12524](https://github.com/RocketChat/Rocket.Chat/pull/12524))
+
+- Remove template for feature requests as issues ([#12426](https://github.com/RocketChat/Rocket.Chat/pull/12426))
+
+- Fix punctuation, spelling, and grammar ([#12451](https://github.com/RocketChat/Rocket.Chat/pull/12451) by [@imronras](https://github.com/imronras))
+
+- Convert rocketchat-assets to main module structure ([#12521](https://github.com/RocketChat/Rocket.Chat/pull/12521))
+
+- Convert rocketchat-api to main module structure ([#12510](https://github.com/RocketChat/Rocket.Chat/pull/12510))
+
+- Convert rocketchat-analytics to main module structure ([#12506](https://github.com/RocketChat/Rocket.Chat/pull/12506))
+
+- Convert rocketchat-action-links to main module structure ([#12503](https://github.com/RocketChat/Rocket.Chat/pull/12503))
+
+- Convert rocketchat-2fa to main module structure ([#12501](https://github.com/RocketChat/Rocket.Chat/pull/12501))
+
+- Convert meteor-timesync to main module structure ([#12495](https://github.com/RocketChat/Rocket.Chat/pull/12495))
+
+- Convert meteor-autocomplete package to main module structure ([#12491](https://github.com/RocketChat/Rocket.Chat/pull/12491))
+
+- Convert meteor-accounts-saml to main module structure ([#12486](https://github.com/RocketChat/Rocket.Chat/pull/12486))
+
+- Convert chatpal search package to modular structure ([#12485](https://github.com/RocketChat/Rocket.Chat/pull/12485))
+
+- Removal of TAPi18n and TAPi18next global variables ([#12467](https://github.com/RocketChat/Rocket.Chat/pull/12467))
+
+- Removal of Template, Blaze, BlazeLayout, FlowRouter, DDPRateLimiter, Session, UAParser, Promise, Reload and CryptoJS global variables ([#12433](https://github.com/RocketChat/Rocket.Chat/pull/12433))
+
+- Removal of Match, check, moment, Tracker and Mongo global variables ([#12410](https://github.com/RocketChat/Rocket.Chat/pull/12410))
+
+- Removal of EJSON, Accounts, Email, HTTP, Random, ReactiveDict, ReactiveVar, SHA256 and WebApp global variables ([#12377](https://github.com/RocketChat/Rocket.Chat/pull/12377))
+
+- Removal of Meteor global variable ([#12371](https://github.com/RocketChat/Rocket.Chat/pull/12371))
+
+- Fix ES translation ([#12509](https://github.com/RocketChat/Rocket.Chat/pull/12509))
+
+- LingoHub based on develop ([#12470](https://github.com/RocketChat/Rocket.Chat/pull/12470))
+
+- Update npm dependencies ([#12465](https://github.com/RocketChat/Rocket.Chat/pull/12465))
+
+- Fix: Developers not being able to debug root files in VSCode ([#12440](https://github.com/RocketChat/Rocket.Chat/pull/12440) by [@mrsimpson](https://github.com/mrsimpson))
+
+- Merge master into develop & Set version to 0.72.0-develop ([#12460](https://github.com/RocketChat/Rocket.Chat/pull/12460) by [@Hudell](https://github.com/Hudell))
+
+- Change `chat.getDeletedMessages` to get messages after informed date and return only message's _id ([#13021](https://github.com/RocketChat/Rocket.Chat/pull/13021))
+
+- Improve Importer code quality ([#13020](https://github.com/RocketChat/Rocket.Chat/pull/13020) by [@Hudell](https://github.com/Hudell))
+
+- Regression: List of custom emojis wasn't working ([#13031](https://github.com/RocketChat/Rocket.Chat/pull/13031))
+
+</details>
+
+### 👩‍💻👨‍💻 Contributors 😍
+
+- [@AndreamApp](https://github.com/AndreamApp)
+- [@Hudell](https://github.com/Hudell)
+- [@Ismaw34](https://github.com/Ismaw34)
+- [@alexbartsch](https://github.com/alexbartsch)
+- [@cardoso](https://github.com/cardoso)
+- [@cyberb](https://github.com/cyberb)
+- [@hypery2k](https://github.com/hypery2k)
+- [@imronras](https://github.com/imronras)
+- [@karakayasemi](https://github.com/karakayasemi)
+- [@karlprieb](https://github.com/karlprieb)
+- [@localguru](https://github.com/localguru)
+- [@lvyue](https://github.com/lvyue)
+- [@mathysie](https://github.com/mathysie)
+- [@mbrodala](https://github.com/mbrodala)
+- [@mrsimpson](https://github.com/mrsimpson)
+- [@nicolasbock](https://github.com/nicolasbock)
+- [@pfuender](https://github.com/pfuender)
+- [@ph1p](https://github.com/ph1p)
+- [@piotrkochan](https://github.com/piotrkochan)
+- [@rafaelks](https://github.com/rafaelks)
+- [@ramrami](https://github.com/ramrami)
+- [@rssilva](https://github.com/rssilva)
+- [@sanketsingh24](https://github.com/sanketsingh24)
+- [@tsukiRep](https://github.com/tsukiRep)
+- [@ura14h](https://github.com/ura14h)
+- [@vinade](https://github.com/vinade)
+- [@wreiske](https://github.com/wreiske)
+- [@zdumitru](https://github.com/zdumitru)
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@LuluGO](https://github.com/LuluGO)
+- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+- [@d-gubert](https://github.com/d-gubert)
+- [@engelgabriel](https://github.com/engelgabriel)
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@ggazzo](https://github.com/ggazzo)
+- [@marceloschmidt](https://github.com/marceloschmidt)
+- [@renatobecker](https://github.com/renatobecker)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+- [@tassoevan](https://github.com/tassoevan)
+
+# 0.72.3
+`2018-12-12  ·  1 🔍  ·  5 👩‍💻👨‍💻`
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Release 0.72.3 ([#12932](https://github.com/RocketChat/Rocket.Chat/pull/12932) by [@Hudell](https://github.com/Hudell) & [@piotrkochan](https://github.com/piotrkochan))
+
+</details>
+
+### 👩‍💻👨‍💻 Contributors 😍
+
+- [@Hudell](https://github.com/Hudell)
+- [@piotrkochan](https://github.com/piotrkochan)
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@ggazzo](https://github.com/ggazzo)
+- [@rodrigok](https://github.com/rodrigok)
+- [@tassoevan](https://github.com/tassoevan)
+
+# 0.72.2
+`2018-12-10  ·  3 🐛  ·  1 🔍  ·  2 👩‍💻👨‍💻`
+
+### 🐛 Bug fixes
+
+
+- line-height for unread bar buttons (jump to first and mark as read) ([#12900](https://github.com/RocketChat/Rocket.Chat/pull/12900))
+
+- Reset password email ([#12898](https://github.com/RocketChat/Rocket.Chat/pull/12898))
+
+- PDF view loading indicator ([#12882](https://github.com/RocketChat/Rocket.Chat/pull/12882))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Release 0.72.2 ([#12901](https://github.com/RocketChat/Rocket.Chat/pull/12901))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@sampaiodiego](https://github.com/sampaiodiego)
+- [@tassoevan](https://github.com/tassoevan)
+
+# 0.72.1
+`2018-12-05  ·  4 🐛  ·  3 🔍  ·  8 👩‍💻👨‍💻`
+
+### 🐛 Bug fixes
+
+
+- Change spread operator to Array.from for Edge browser ([#12818](https://github.com/RocketChat/Rocket.Chat/pull/12818) by [@ohmonster](https://github.com/ohmonster))
+
+- API users.info returns caller rooms and not requested user ones ([#12727](https://github.com/RocketChat/Rocket.Chat/pull/12727) by [@piotrkochan](https://github.com/piotrkochan))
+
+- Missing HipChat Enterprise Importer ([#12847](https://github.com/RocketChat/Rocket.Chat/pull/12847) by [@Hudell](https://github.com/Hudell))
 
 - Emoji as avatar ([#12805](https://github.com/RocketChat/Rocket.Chat/pull/12805))
 
@@ -5190,12 +5737,21 @@
 - [@tassoevan](https://github.com/tassoevan)
 
 # 0.71.2
-`2018-12-10`
+`2018-12-10  ·  1 🐛  ·  1 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.3`
 - NPM: `5.6.0`
 
+### 🐛 Bug fixes
+
+
+- Reset password email ([#12898](https://github.com/RocketChat/Rocket.Chat/pull/12898))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.71.1
 `2018-10-31  ·  1 🐛  ·  1 🔍  ·  1 👩‍💻👨‍💻`
 
@@ -5221,7 +5777,7 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 0.71.0
-`2018-10-27  ·  2 ️️️⚠️  ·  5 🎉  ·  5 🚀  ·  21 🐛  ·  8 🔍  ·  20 👩‍💻👨‍💻`
+`2018-10-27  ·  2 ️️️⚠️  ·  5 🎉  ·  5 🚀  ·  23 🐛  ·  9 🔍  ·  20 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.3`
@@ -5295,6 +5851,10 @@
 
 - Invalid destructuring on Livechat API endpoint ([#12354](https://github.com/RocketChat/Rocket.Chat/pull/12354))
 
+- Modal confirm on enter ([#12283](https://github.com/RocketChat/Rocket.Chat/pull/12283))
+
+- E2E alert shows up when encryption is disabled ([#12272](https://github.com/RocketChat/Rocket.Chat/pull/12272) by [@Hudell](https://github.com/Hudell))
+
 - E2E: Decrypting UTF-8 encoded messages ([#12398](https://github.com/RocketChat/Rocket.Chat/pull/12398) by [@pmmaga](https://github.com/pmmaga))
 
 - Ignore errors when creating image preview for uploads ([#12424](https://github.com/RocketChat/Rocket.Chat/pull/12424))
@@ -5317,6 +5877,8 @@
 
 - Fix: update check on err.details ([#12346](https://github.com/RocketChat/Rocket.Chat/pull/12346) by [@teresy](https://github.com/teresy))
 
+- Fix: Add wizard opt-in fields ([#12298](https://github.com/RocketChat/Rocket.Chat/pull/12298))
+
 - Update Apps Framework to version 1.2.1 ([#12442](https://github.com/RocketChat/Rocket.Chat/pull/12442))
 
 - Regression: Change `starred` message property from object to array ([#12405](https://github.com/RocketChat/Rocket.Chat/pull/12405))
@@ -5485,7 +6047,7 @@
 - [@theorenck](https://github.com/theorenck)
 
 # 0.70.0
-`2018-09-28  ·  2 ️️️⚠️  ·  18 🎉  ·  3 🚀  ·  31 🐛  ·  21 🔍  ·  33 👩‍💻👨‍💻`
+`2018-09-28  ·  2 ️️️⚠️  ·  18 🎉  ·  3 🚀  ·  35 🐛  ·  19 🔍  ·  32 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.3`
@@ -5587,6 +6149,14 @@
 
 - Typo in a configuration key for SlackBridge excluded bot names ([#11872](https://github.com/RocketChat/Rocket.Chat/pull/11872) by [@TobiasKappe](https://github.com/TobiasKappe))
 
+- Duplicated message buttons ([#11853](https://github.com/RocketChat/Rocket.Chat/pull/11853) by [@ubarsaiyan](https://github.com/ubarsaiyan))
+
+- App updates were not being shown correctly ([#11893](https://github.com/RocketChat/Rocket.Chat/pull/11893))
+
+- Hipchat importer was not importing users without emails and uploaded files ([#11910](https://github.com/RocketChat/Rocket.Chat/pull/11910))
+
+- Hipchat import was failing when importing messages from a non existent user ([#11892](https://github.com/RocketChat/Rocket.Chat/pull/11892))
+
 - Real Name on Direct Messages  ([#12154](https://github.com/RocketChat/Rocket.Chat/pull/12154))
 
 - Position of popover component on mobile ([#12038](https://github.com/RocketChat/Rocket.Chat/pull/12038))
@@ -5615,8 +6185,6 @@
 <summary>🔍 Minor changes</summary>
 
 
-- Release 0.69.2 ([#12026](https://github.com/RocketChat/Rocket.Chat/pull/12026) by [@cardoso](https://github.com/cardoso) & [@kaiiiiiiiii](https://github.com/kaiiiiiiiii) & [@timkinnane](https://github.com/timkinnane))
-
 - LingoHub based on develop ([#11936](https://github.com/RocketChat/Rocket.Chat/pull/11936))
 
 - Better organize package.json ([#12115](https://github.com/RocketChat/Rocket.Chat/pull/12115))
@@ -5627,8 +6195,6 @@
 
 - Merge master into develop & Set version to 0.70.0-develop ([#11921](https://github.com/RocketChat/Rocket.Chat/pull/11921) by [@Hudell](https://github.com/Hudell) & [@c0dzilla](https://github.com/c0dzilla) & [@rndmh3ro](https://github.com/rndmh3ro) & [@ubarsaiyan](https://github.com/ubarsaiyan) & [@vynmera](https://github.com/vynmera))
 
-- Release 0.69.2 ([#12026](https://github.com/RocketChat/Rocket.Chat/pull/12026) by [@cardoso](https://github.com/cardoso) & [@kaiiiiiiiii](https://github.com/kaiiiiiiiii) & [@timkinnane](https://github.com/timkinnane))
-
 - Regression: fix message box autogrow ([#12138](https://github.com/RocketChat/Rocket.Chat/pull/12138))
 
 - Regression: Modal height ([#12122](https://github.com/RocketChat/Rocket.Chat/pull/12122))
@@ -5671,7 +6237,6 @@
 - [@crazy-max](https://github.com/crazy-max)
 - [@edzluhan](https://github.com/edzluhan)
 - [@flaviogrossi](https://github.com/flaviogrossi)
-- [@kaiiiiiiiii](https://github.com/kaiiiiiiiii)
 - [@karakayasemi](https://github.com/karakayasemi)
 - [@mrinaldhar](https://github.com/mrinaldhar)
 - [@mrsimpson](https://github.com/mrsimpson)
@@ -5760,7 +6325,7 @@
 - [@rodrigok](https://github.com/rodrigok)
 
 # 0.69.0
-`2018-08-28  ·  10 🎉  ·  8 🚀  ·  35 🐛  ·  13 🔍  ·  25 👩‍💻👨‍💻`
+`2018-08-28  ·  10 🎉  ·  8 🚀  ·  45 🐛  ·  12 🔍  ·  27 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.3`
@@ -5837,6 +6402,8 @@
 
 - Fix links in `onTableItemClick` of the directroy page ([#11543](https://github.com/RocketChat/Rocket.Chat/pull/11543) by [@ura14h](https://github.com/ura14h))
 
+- Livechat open room method ([#11830](https://github.com/RocketChat/Rocket.Chat/pull/11830))
+
 - App's i18nAlert is only being displayed as "i18nAlert" ([#11802](https://github.com/RocketChat/Rocket.Chat/pull/11802))
 
 - Removed hardcoded values. ([#11627](https://github.com/RocketChat/Rocket.Chat/pull/11627) by [@Hudell](https://github.com/Hudell))
@@ -5873,22 +6440,36 @@
 
 - Message attachments was not respecting sort and lost spacing ([#11740](https://github.com/RocketChat/Rocket.Chat/pull/11740))
 
+- Default server language not being applied ([#11719](https://github.com/RocketChat/Rocket.Chat/pull/11719))
+
 - Closed connections being storing on db ([#11709](https://github.com/RocketChat/Rocket.Chat/pull/11709))
 
+- Broken logo on setup wizard ([#11708](https://github.com/RocketChat/Rocket.Chat/pull/11708))
+
+- Regression in prune by user, and update lastMessage ([#11646](https://github.com/RocketChat/Rocket.Chat/pull/11646) by [@vynmera](https://github.com/vynmera))
+
 - Login logo now centered on small screens ([#11626](https://github.com/RocketChat/Rocket.Chat/pull/11626) by [@wreiske](https://github.com/wreiske))
 
 - Push notifications stuck after db failure ([#11667](https://github.com/RocketChat/Rocket.Chat/pull/11667))
 
+- SAML login not working when user has multiple emails ([#11642](https://github.com/RocketChat/Rocket.Chat/pull/11642) by [@Hudell](https://github.com/Hudell))
+
+- Prune translation on room info panel ([#11635](https://github.com/RocketChat/Rocket.Chat/pull/11635))
+
+- Prune translations in German ([#11631](https://github.com/RocketChat/Rocket.Chat/pull/11631) by [@rndmh3ro](https://github.com/rndmh3ro))
+
+- User info APIs not returning customFields correctly ([#11625](https://github.com/RocketChat/Rocket.Chat/pull/11625))
+
+- Missing chat history for users without permission `preview-c-room` ([#11639](https://github.com/RocketChat/Rocket.Chat/pull/11639) by [@Hudell](https://github.com/Hudell))
+
+- Incorrect migration version in v130.js ([#11544](https://github.com/RocketChat/Rocket.Chat/pull/11544) by [@c0dzilla](https://github.com/c0dzilla))
+
 - Translations were not unique per app allowing conflicts among apps ([#11878](https://github.com/RocketChat/Rocket.Chat/pull/11878))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
 
-- Release 0.68.5 ([#11852](https://github.com/RocketChat/Rocket.Chat/pull/11852))
-
-- Release 0.68.5 ([#11852](https://github.com/RocketChat/Rocket.Chat/pull/11852))
-
 - Fixed deutsch message pruning translations ([#11691](https://github.com/RocketChat/Rocket.Chat/pull/11691) by [@TheReal1604](https://github.com/TheReal1604))
 
 - Fixed the Finnish translation and removed some profanities ([#11794](https://github.com/RocketChat/Rocket.Chat/pull/11794) by [@jukper](https://github.com/jukper))
@@ -5907,6 +6488,8 @@
 
 - Merge master into develop & Set version to 0.69.0-develop ([#11606](https://github.com/RocketChat/Rocket.Chat/pull/11606))
 
+- Regression: Fix purge message's translations ([#11590](https://github.com/RocketChat/Rocket.Chat/pull/11590))
+
 - App engine merge ([#11835](https://github.com/RocketChat/Rocket.Chat/pull/11835))
 
 - Regression: role tag background, unread item font and message box autogrow ([#11861](https://github.com/RocketChat/Rocket.Chat/pull/11861))
@@ -5919,12 +6502,14 @@
 - [@Hudell](https://github.com/Hudell)
 - [@TheReal1604](https://github.com/TheReal1604)
 - [@ausminternet](https://github.com/ausminternet)
+- [@c0dzilla](https://github.com/c0dzilla)
 - [@crazy-max](https://github.com/crazy-max)
 - [@gdelavald](https://github.com/gdelavald)
 - [@glstewart17](https://github.com/glstewart17)
 - [@gsperezb](https://github.com/gsperezb)
 - [@jukper](https://github.com/jukper)
 - [@kable-wilmoth](https://github.com/kable-wilmoth)
+- [@rndmh3ro](https://github.com/rndmh3ro)
 - [@rssilva](https://github.com/rssilva)
 - [@timkinnane](https://github.com/timkinnane)
 - [@ubarsaiyan](https://github.com/ubarsaiyan)
@@ -6235,7 +6820,7 @@
 - [@tassoevan](https://github.com/tassoevan)
 
 # 0.67.0
-`2018-07-20  ·  1 ️️️⚠️  ·  1 🎉  ·  1 🚀  ·  6 🐛  ·  5 🔍  ·  11 👩‍💻👨‍💻`
+`2018-07-20  ·  1 ️️️⚠️  ·  1 🎉  ·  2 🚀  ·  15 🐛  ·  7 🔍  ·  11 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.3`
@@ -6256,13 +6841,23 @@
 
 - Stop sort callbacks on run ([#11330](https://github.com/RocketChat/Rocket.Chat/pull/11330))
 
+- Setup Wizard username validation, step progress and optin/optout ([#11254](https://github.com/RocketChat/Rocket.Chat/pull/11254))
+
 ### 🐛 Bug fixes
 
 
+- Livechat taking inquiry leading to 404 page ([#11406](https://github.com/RocketChat/Rocket.Chat/pull/11406))
+
+- All messages notifications via email were sent as mention alert ([#11398](https://github.com/RocketChat/Rocket.Chat/pull/11398))
+
 - sort fname sidenav ([#11358](https://github.com/RocketChat/Rocket.Chat/pull/11358))
 
+- Livechat not sending desktop notifications ([#11266](https://github.com/RocketChat/Rocket.Chat/pull/11266))
+
 - SVG icons code ([#11319](https://github.com/RocketChat/Rocket.Chat/pull/11319))
 
+- Remove file snap store doesn't like ([#11365](https://github.com/RocketChat/Rocket.Chat/pull/11365))
+
 - Message popup responsiveness in slash commands ([#11313](https://github.com/RocketChat/Rocket.Chat/pull/11313))
 
 - web app manifest errors as reported by Chrome DevTools ([#9991](https://github.com/RocketChat/Rocket.Chat/pull/9991) by [@justinribeiro](https://github.com/justinribeiro))
@@ -6271,6 +6866,16 @@
 
 - Parse inline code without space before initial backtick ([#9754](https://github.com/RocketChat/Rocket.Chat/pull/9754) by [@c0dzilla](https://github.com/c0dzilla) & [@gdelavald](https://github.com/gdelavald))
 
+- Some updates were returning errors when based on queries with position operators ([#11335](https://github.com/RocketChat/Rocket.Chat/pull/11335))
+
+- SAML attributes with periods are not properly read. ([#11315](https://github.com/RocketChat/Rocket.Chat/pull/11315) by [@Hudell](https://github.com/Hudell))
+
+- Outgoing integrations were stopping the oplog tailing sometimes ([#11333](https://github.com/RocketChat/Rocket.Chat/pull/11333))
+
+- Livestream muted when audio only option was enabled ([#11267](https://github.com/RocketChat/Rocket.Chat/pull/11267) by [@gdelavald](https://github.com/gdelavald))
+
+- Notification preferences being lost when switching view mode ([#11295](https://github.com/RocketChat/Rocket.Chat/pull/11295))
+
 <details>
 <summary>🔍 Minor changes</summary>
 
@@ -6281,6 +6886,10 @@
 
 - Merge master into develop & Set version to 0.67.0-develop ([#11399](https://github.com/RocketChat/Rocket.Chat/pull/11399))
 
+- Regression: Fix migration 125 checking for settings field ([#11364](https://github.com/RocketChat/Rocket.Chat/pull/11364))
+
+- Send setting Allow_Marketing_Emails to statistics collector ([#11359](https://github.com/RocketChat/Rocket.Chat/pull/11359))
+
 - Merge master into develop & Set version to 0.67.0-develop ([#11348](https://github.com/RocketChat/Rocket.Chat/pull/11348) by [@Hudell](https://github.com/Hudell) & [@gdelavald](https://github.com/gdelavald))
 
 - Merge master into develop & Set version to 0.67.0-develop ([#11290](https://github.com/RocketChat/Rocket.Chat/pull/11290))
@@ -6392,7 +7001,7 @@
 - [@tassoevan](https://github.com/tassoevan)
 
 # 0.66.0
-`2018-06-27  ·  1 ️️️⚠️  ·  23 🎉  ·  3 🚀  ·  55 🐛  ·  47 🔍  ·  45 👩‍💻👨‍💻`
+`2018-06-27  ·  1 ️️️⚠️  ·  23 🎉  ·  3 🚀  ·  59 🐛  ·  47 🔍  ·  45 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.3`
@@ -6554,6 +7163,14 @@
 
 - Icons svg xml structure ([#10771](https://github.com/RocketChat/Rocket.Chat/pull/10771) by [@timkinnane](https://github.com/timkinnane))
 
+- Leave room wasn't working as expected ([#10851](https://github.com/RocketChat/Rocket.Chat/pull/10851))
+
+- Application crashing on startup when trying to log errors to `exceptions` channel ([#10934](https://github.com/RocketChat/Rocket.Chat/pull/10934))
+
+- Image lazy load was breaking attachments ([#10904](https://github.com/RocketChat/Rocket.Chat/pull/10904))
+
+- Incomplete email notification link ([#10928](https://github.com/RocketChat/Rocket.Chat/pull/10928))
+
 - Remove outdated 2FA warning for mobile clients ([#10916](https://github.com/RocketChat/Rocket.Chat/pull/10916) by [@cardoso](https://github.com/cardoso))
 
 - Update Sandstorm build config ([#10867](https://github.com/RocketChat/Rocket.Chat/pull/10867) by [@ocdtrekkie](https://github.com/ocdtrekkie))
@@ -6782,7 +7399,7 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 0.65.0
-`2018-05-28  ·  13 🎉  ·  16 🐛  ·  15 🔍  ·  25 👩‍💻👨‍💻`
+`2018-05-28  ·  17 🎉  ·  24 🐛  ·  30 🔍  ·  25 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.1`
@@ -6815,6 +7432,14 @@
 
 - Add REST API endpoints `channels.setCustomFields` and `groups.setCustomFields` ([#9733](https://github.com/RocketChat/Rocket.Chat/pull/9733) by [@xbolshe](https://github.com/xbolshe))
 
+- Add REST endpoints `channels.roles` & `groups.roles` ([#10607](https://github.com/RocketChat/Rocket.Chat/pull/10607) by [@cardoso](https://github.com/cardoso) & [@rafaelks](https://github.com/rafaelks))
+
+- Add more options for Wordpress OAuth configuration ([#10724](https://github.com/RocketChat/Rocket.Chat/pull/10724) by [@Hudell](https://github.com/Hudell))
+
+- Setup Wizard ([#10523](https://github.com/RocketChat/Rocket.Chat/pull/10523) by [@karlprieb](https://github.com/karlprieb))
+
+- Improvements to notifications logic ([#10686](https://github.com/RocketChat/Rocket.Chat/pull/10686))
+
 - Add permission `view-broadcast-member-list` ([#10753](https://github.com/RocketChat/Rocket.Chat/pull/10753) by [@cardoso](https://github.com/cardoso))
 
 ### 🐛 Bug fixes
@@ -6834,6 +7459,22 @@
 
 - Private settings were not being cleared from client cache in some cases ([#10625](https://github.com/RocketChat/Rocket.Chat/pull/10625) by [@Hudell](https://github.com/Hudell))
 
+- Not escaping special chars on mentions ([#10793](https://github.com/RocketChat/Rocket.Chat/pull/10793) by [@erhan-](https://github.com/erhan-))
+
+- Send a message when muted returns inconsistent result in chat.sendMessage ([#10720](https://github.com/RocketChat/Rocket.Chat/pull/10720))
+
+- Regression: Empty content on announcement modal ([#10733](https://github.com/RocketChat/Rocket.Chat/pull/10733) by [@gdelavald](https://github.com/gdelavald))
+
+- Missing attachment description when Rocket.Chat Apps were enabled ([#10705](https://github.com/RocketChat/Rocket.Chat/pull/10705) by [@Hudell](https://github.com/Hudell))
+
+- Improve desktop notification formatting ([#10445](https://github.com/RocketChat/Rocket.Chat/pull/10445) by [@Sameesunkaria](https://github.com/Sameesunkaria))
+
+- Message box emoji icon was flickering when typing a text ([#10678](https://github.com/RocketChat/Rocket.Chat/pull/10678) by [@gdelavald](https://github.com/gdelavald))
+
+- Channel owner was being set as muted when creating a read-only channel ([#10665](https://github.com/RocketChat/Rocket.Chat/pull/10665))
+
+- SAML wasn't working correctly when running multiple instances ([#10681](https://github.com/RocketChat/Rocket.Chat/pull/10681) by [@Hudell](https://github.com/Hudell))
+
 - Internal Error when requesting user data download ([#10837](https://github.com/RocketChat/Rocket.Chat/pull/10837) by [@Hudell](https://github.com/Hudell))
 
 - Broadcast channels were showing reply button for deleted messages and generating wrong reply links some times ([#10835](https://github.com/RocketChat/Rocket.Chat/pull/10835))
@@ -6866,6 +7507,36 @@
 
 - Prevent setup wizard redirects ([#10811](https://github.com/RocketChat/Rocket.Chat/pull/10811))
 
+- Prometheus: Add metric to track hooks time ([#10798](https://github.com/RocketChat/Rocket.Chat/pull/10798))
+
+- Regression: Autorun of wizard was not destroyed after completion ([#10802](https://github.com/RocketChat/Rocket.Chat/pull/10802))
+
+- Prometheus: Fix notification metric ([#10803](https://github.com/RocketChat/Rocket.Chat/pull/10803))
+
+- Regression: Fix wrong wizard field name ([#10804](https://github.com/RocketChat/Rocket.Chat/pull/10804))
+
+- Prometheus: Improve metric names ([#10789](https://github.com/RocketChat/Rocket.Chat/pull/10789))
+
+- Improvement to push notifications on direct messages ([#10788](https://github.com/RocketChat/Rocket.Chat/pull/10788))
+
+- Better metric for notifications ([#10786](https://github.com/RocketChat/Rocket.Chat/pull/10786))
+
+- Add badge back to push notifications ([#10779](https://github.com/RocketChat/Rocket.Chat/pull/10779))
+
+- Wizard improvements ([#10776](https://github.com/RocketChat/Rocket.Chat/pull/10776))
+
+- Add setting and expose prometheus on port 9100 ([#10766](https://github.com/RocketChat/Rocket.Chat/pull/10766))
+
+- Regression: Fix notifications for direct messages ([#10760](https://github.com/RocketChat/Rocket.Chat/pull/10760))
+
+- More improvements on send notifications logic ([#10736](https://github.com/RocketChat/Rocket.Chat/pull/10736))
+
+- LingoHub based on develop ([#10691](https://github.com/RocketChat/Rocket.Chat/pull/10691))
+
+- Add `npm run postinstall` into example build script ([#10524](https://github.com/RocketChat/Rocket.Chat/pull/10524) by [@peccu](https://github.com/peccu))
+
+- Correct links in README file ([#10674](https://github.com/RocketChat/Rocket.Chat/pull/10674) by [@winterstefan](https://github.com/winterstefan))
+
 - Fix: Regression in REST API endpoint `/me`  ([#10833](https://github.com/RocketChat/Rocket.Chat/pull/10833))
 
 - Regression: Fix email notification preference not showing correct selected value ([#10847](https://github.com/RocketChat/Rocket.Chat/pull/10847))
@@ -6920,132 +7591,18 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 0.64.2
-`2018-05-18  ·  8 🎉  ·  16 🐛  ·  31 🔍  ·  13 👩‍💻👨‍💻`
+`2018-05-18  ·  1 🔍  ·  12 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.1`
 - NPM: `5.6.0`
 
-### 🎉 New features
-
-
-- Add REST endpoints `channels.roles` & `groups.roles` ([#10607](https://github.com/RocketChat/Rocket.Chat/pull/10607) by [@cardoso](https://github.com/cardoso) & [@rafaelks](https://github.com/rafaelks))
-
-- Add more options for Wordpress OAuth configuration ([#10724](https://github.com/RocketChat/Rocket.Chat/pull/10724) by [@Hudell](https://github.com/Hudell))
-
-- Setup Wizard ([#10523](https://github.com/RocketChat/Rocket.Chat/pull/10523) by [@karlprieb](https://github.com/karlprieb))
-
-- Improvements to notifications logic ([#10686](https://github.com/RocketChat/Rocket.Chat/pull/10686))
-
-- Add REST endpoints `channels.roles` & `groups.roles` ([#10607](https://github.com/RocketChat/Rocket.Chat/pull/10607) by [@cardoso](https://github.com/cardoso) & [@rafaelks](https://github.com/rafaelks))
-
-- Add more options for Wordpress OAuth configuration ([#10724](https://github.com/RocketChat/Rocket.Chat/pull/10724) by [@Hudell](https://github.com/Hudell))
-
-- Setup Wizard ([#10523](https://github.com/RocketChat/Rocket.Chat/pull/10523) by [@karlprieb](https://github.com/karlprieb))
-
-- Improvements to notifications logic ([#10686](https://github.com/RocketChat/Rocket.Chat/pull/10686))
-
-### 🐛 Bug fixes
-
-
-- Not escaping special chars on mentions ([#10793](https://github.com/RocketChat/Rocket.Chat/pull/10793) by [@erhan-](https://github.com/erhan-))
-
-- Send a message when muted returns inconsistent result in chat.sendMessage ([#10720](https://github.com/RocketChat/Rocket.Chat/pull/10720))
-
-- Regression: Empty content on announcement modal ([#10733](https://github.com/RocketChat/Rocket.Chat/pull/10733) by [@gdelavald](https://github.com/gdelavald))
-
-- Missing attachment description when Rocket.Chat Apps were enabled ([#10705](https://github.com/RocketChat/Rocket.Chat/pull/10705) by [@Hudell](https://github.com/Hudell))
-
-- Improve desktop notification formatting ([#10445](https://github.com/RocketChat/Rocket.Chat/pull/10445) by [@Sameesunkaria](https://github.com/Sameesunkaria))
-
-- Message box emoji icon was flickering when typing a text ([#10678](https://github.com/RocketChat/Rocket.Chat/pull/10678) by [@gdelavald](https://github.com/gdelavald))
-
-- Channel owner was being set as muted when creating a read-only channel ([#10665](https://github.com/RocketChat/Rocket.Chat/pull/10665))
-
-- SAML wasn't working correctly when running multiple instances ([#10681](https://github.com/RocketChat/Rocket.Chat/pull/10681) by [@Hudell](https://github.com/Hudell))
-
-- Send a message when muted returns inconsistent result in chat.sendMessage ([#10720](https://github.com/RocketChat/Rocket.Chat/pull/10720))
-
-- Regression: Empty content on announcement modal ([#10733](https://github.com/RocketChat/Rocket.Chat/pull/10733) by [@gdelavald](https://github.com/gdelavald))
-
-- Missing attachment description when Rocket.Chat Apps were enabled ([#10705](https://github.com/RocketChat/Rocket.Chat/pull/10705) by [@Hudell](https://github.com/Hudell))
-
-- Improve desktop notification formatting ([#10445](https://github.com/RocketChat/Rocket.Chat/pull/10445) by [@Sameesunkaria](https://github.com/Sameesunkaria))
-
-- Message box emoji icon was flickering when typing a text ([#10678](https://github.com/RocketChat/Rocket.Chat/pull/10678) by [@gdelavald](https://github.com/gdelavald))
-
-- Channel owner was being set as muted when creating a read-only channel ([#10665](https://github.com/RocketChat/Rocket.Chat/pull/10665))
-
-- SAML wasn't working correctly when running multiple instances ([#10681](https://github.com/RocketChat/Rocket.Chat/pull/10681) by [@Hudell](https://github.com/Hudell))
-
-- Not escaping special chars on mentions ([#10793](https://github.com/RocketChat/Rocket.Chat/pull/10793) by [@erhan-](https://github.com/erhan-))
-
 <details>
 <summary>🔍 Minor changes</summary>
 
 
 - Release 0.64.2 ([#10812](https://github.com/RocketChat/Rocket.Chat/pull/10812) by [@Hudell](https://github.com/Hudell) & [@Sameesunkaria](https://github.com/Sameesunkaria) & [@cardoso](https://github.com/cardoso) & [@erhan-](https://github.com/erhan-) & [@gdelavald](https://github.com/gdelavald) & [@karlprieb](https://github.com/karlprieb) & [@peccu](https://github.com/peccu) & [@winterstefan](https://github.com/winterstefan))
 
-- Prometheus: Add metric to track hooks time ([#10798](https://github.com/RocketChat/Rocket.Chat/pull/10798))
-
-- Regression: Autorun of wizard was not destroyed after completion ([#10802](https://github.com/RocketChat/Rocket.Chat/pull/10802))
-
-- Prometheus: Fix notification metric ([#10803](https://github.com/RocketChat/Rocket.Chat/pull/10803))
-
-- Regression: Fix wrong wizard field name ([#10804](https://github.com/RocketChat/Rocket.Chat/pull/10804))
-
-- Prometheus: Improve metric names ([#10789](https://github.com/RocketChat/Rocket.Chat/pull/10789))
-
-- Improvement to push notifications on direct messages ([#10788](https://github.com/RocketChat/Rocket.Chat/pull/10788))
-
-- Better metric for notifications ([#10786](https://github.com/RocketChat/Rocket.Chat/pull/10786))
-
-- Add badge back to push notifications ([#10779](https://github.com/RocketChat/Rocket.Chat/pull/10779))
-
-- Wizard improvements ([#10776](https://github.com/RocketChat/Rocket.Chat/pull/10776))
-
-- Add setting and expose prometheus on port 9100 ([#10766](https://github.com/RocketChat/Rocket.Chat/pull/10766))
-
-- Regression: Fix notifications for direct messages ([#10760](https://github.com/RocketChat/Rocket.Chat/pull/10760))
-
-- More improvements on send notifications logic ([#10736](https://github.com/RocketChat/Rocket.Chat/pull/10736))
-
-- LingoHub based on develop ([#10691](https://github.com/RocketChat/Rocket.Chat/pull/10691))
-
-- Add `npm run postinstall` into example build script ([#10524](https://github.com/RocketChat/Rocket.Chat/pull/10524) by [@peccu](https://github.com/peccu))
-
-- Correct links in README file ([#10674](https://github.com/RocketChat/Rocket.Chat/pull/10674) by [@winterstefan](https://github.com/winterstefan))
-
-- More improvements on send notifications logic ([#10736](https://github.com/RocketChat/Rocket.Chat/pull/10736))
-
-- LingoHub based on develop ([#10691](https://github.com/RocketChat/Rocket.Chat/pull/10691))
-
-- Add `npm run postinstall` into example build script ([#10524](https://github.com/RocketChat/Rocket.Chat/pull/10524) by [@peccu](https://github.com/peccu))
-
-- Correct links in README file ([#10674](https://github.com/RocketChat/Rocket.Chat/pull/10674) by [@winterstefan](https://github.com/winterstefan))
-
-- Prometheus: Improve metric names ([#10789](https://github.com/RocketChat/Rocket.Chat/pull/10789))
-
-- Improvement to push notifications on direct messages ([#10788](https://github.com/RocketChat/Rocket.Chat/pull/10788))
-
-- Better metric for notifications ([#10786](https://github.com/RocketChat/Rocket.Chat/pull/10786))
-
-- Add badge back to push notifications ([#10779](https://github.com/RocketChat/Rocket.Chat/pull/10779))
-
-- Wizard improvements ([#10776](https://github.com/RocketChat/Rocket.Chat/pull/10776))
-
-- Add setting and expose prometheus on port 9100 ([#10766](https://github.com/RocketChat/Rocket.Chat/pull/10766))
-
-- Regression: Fix notifications for direct messages ([#10760](https://github.com/RocketChat/Rocket.Chat/pull/10760))
-
-- Prometheus: Add metric to track hooks time ([#10798](https://github.com/RocketChat/Rocket.Chat/pull/10798))
-
-- Regression: Autorun of wizard was not destroyed after completion ([#10802](https://github.com/RocketChat/Rocket.Chat/pull/10802))
-
-- Prometheus: Fix notification metric ([#10803](https://github.com/RocketChat/Rocket.Chat/pull/10803))
-
-- Regression: Fix wrong wizard field name ([#10804](https://github.com/RocketChat/Rocket.Chat/pull/10804))
-
 </details>
 
 ### 👩‍💻👨‍💻 Contributors 😍
@@ -7057,7 +7614,6 @@
 - [@gdelavald](https://github.com/gdelavald)
 - [@karlprieb](https://github.com/karlprieb)
 - [@peccu](https://github.com/peccu)
-- [@rafaelks](https://github.com/rafaelks)
 - [@winterstefan](https://github.com/winterstefan)
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -7433,7 +7989,7 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 0.63.0
-`2018-04-04  ·  1 ️️️⚠️  ·  18 🎉  ·  30 🐛  ·  20 🔍  ·  24 👩‍💻👨‍💻`
+`2018-04-04  ·  1 ️️️⚠️  ·  18 🎉  ·  36 🐛  ·  20 🔍  ·  25 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.1`
@@ -7522,6 +8078,18 @@
 
 - Able to react with invalid emoji ([#8667](https://github.com/RocketChat/Rocket.Chat/pull/8667) by [@mutdmour](https://github.com/mutdmour))
 
+- Slack Import reports `invalid import file type` due to a call to BSON.native() which is now doesn't exist ([#10071](https://github.com/RocketChat/Rocket.Chat/pull/10071) by [@trongthanh](https://github.com/trongthanh))
+
+- Verified property of user is always set to false if not supplied ([#9719](https://github.com/RocketChat/Rocket.Chat/pull/9719))
+
+- Update preferences of users with settings: null was crashing the server ([#10076](https://github.com/RocketChat/Rocket.Chat/pull/10076))
+
+- REST API: Can't list all public channels when user has permission `view-joined-room` ([#10009](https://github.com/RocketChat/Rocket.Chat/pull/10009))
+
+- Message editing is crashing the server when read receipts are enabled ([#10061](https://github.com/RocketChat/Rocket.Chat/pull/10061))
+
+- Download links was duplicating Sub Paths ([#10029](https://github.com/RocketChat/Rocket.Chat/pull/10029))
+
 - User preferences can't be saved when roles are hidden in admin settings ([#10051](https://github.com/RocketChat/Rocket.Chat/pull/10051) by [@Hudell](https://github.com/Hudell))
 
 - Browser was auto-filling values when editing another user profile ([#9932](https://github.com/RocketChat/Rocket.Chat/pull/9932) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
@@ -7609,6 +8177,7 @@
 - [@mutdmour](https://github.com/mutdmour)
 - [@pierreozoux](https://github.com/pierreozoux)
 - [@ramrami](https://github.com/ramrami)
+- [@trongthanh](https://github.com/trongthanh)
 - [@ubarsaiyan](https://github.com/ubarsaiyan)
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -7699,7 +8268,7 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 0.62.0
-`2018-02-27  ·  1 ️️️⚠️  ·  24 🎉  ·  29 🐛  ·  26 🔍  ·  39 👩‍💻👨‍💻`
+`2018-02-27  ·  1 ️️️⚠️  ·  24 🎉  ·  32 🐛  ·  26 🔍  ·  39 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.9.4`
@@ -7770,6 +8339,10 @@
 
 - Close button on file upload bar was not working ([#9662](https://github.com/RocketChat/Rocket.Chat/pull/9662) by [@karlprieb](https://github.com/karlprieb))
 
+- Livechat conversation not receiving messages when start without form ([#9772](https://github.com/RocketChat/Rocket.Chat/pull/9772))
+
+- Emoji rendering on last message ([#9776](https://github.com/RocketChat/Rocket.Chat/pull/9776))
+
 - Chrome 64 breaks jitsi-meet iframe ([#9560](https://github.com/RocketChat/Rocket.Chat/pull/9560) by [@speedy01](https://github.com/speedy01))
 
 - Harmonize channel-related actions ([#9697](https://github.com/RocketChat/Rocket.Chat/pull/9697) by [@mrsimpson](https://github.com/mrsimpson))
@@ -7780,6 +8353,8 @@
 
 - 'Query' support for channels.list.joined, groups.list, groups.listAll, im.list ([#9424](https://github.com/RocketChat/Rocket.Chat/pull/9424) by [@xbolshe](https://github.com/xbolshe))
 
+- Livechat issues on external queue and lead capture ([#9750](https://github.com/RocketChat/Rocket.Chat/pull/9750))
+
 - DeprecationWarning: prom-client ... when starting Rocket Chat server ([#9747](https://github.com/RocketChat/Rocket.Chat/pull/9747) by [@jgtoriginal](https://github.com/jgtoriginal))
 
 - API to retrive rooms was returning empty objects ([#9737](https://github.com/RocketChat/Rocket.Chat/pull/9737))
@@ -7975,7 +8550,7 @@
 - [@rodrigok](https://github.com/rodrigok)
 
 # 0.61.0
-`2018-01-27  ·  1 ️️️⚠️  ·  11 🎉  ·  13 🐛  ·  8 🔍  ·  15 👩‍💻👨‍💻`
+`2018-01-27  ·  1 ️️️⚠️  ·  12 🎉  ·  44 🐛  ·  39 🔍  ·  23 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.9.3`
@@ -8009,6 +8584,8 @@
 
 - Add support to external livechat queue service provider ([#9053](https://github.com/RocketChat/Rocket.Chat/pull/9053))
 
+- Make Custom oauth accept nested usernameField ([#9066](https://github.com/RocketChat/Rocket.Chat/pull/9066) by [@pierreozoux](https://github.com/pierreozoux))
+
 - Contextual bar mail messages ([#9510](https://github.com/RocketChat/Rocket.Chat/pull/9510) by [@karlprieb](https://github.com/karlprieb))
 
 ### 🐛 Bug fixes
@@ -8030,48 +8607,179 @@
 
 - Highlight setting not working correctly ([#9364](https://github.com/RocketChat/Rocket.Chat/pull/9364) by [@cyclops24](https://github.com/cyclops24))
 
-- File access not working when passing credentials via querystring ([#9264](https://github.com/RocketChat/Rocket.Chat/pull/9264))
+- announcement hyperlink color ([#9330](https://github.com/RocketChat/Rocket.Chat/pull/9330) by [@karlprieb](https://github.com/karlprieb))
 
-- Contextual bar redesign ([#9481](https://github.com/RocketChat/Rocket.Chat/pull/9481) by [@gdelavald](https://github.com/gdelavald) & [@karlprieb](https://github.com/karlprieb))
+- popover on safari for iOS ([#9328](https://github.com/RocketChat/Rocket.Chat/pull/9328) by [@karlprieb](https://github.com/karlprieb))
 
-- mention-here is missing i18n text #9455 ([#9456](https://github.com/RocketChat/Rocket.Chat/pull/9456) by [@ryjones](https://github.com/ryjones))
+- last message cutting on bottom ([#9345](https://github.com/RocketChat/Rocket.Chat/pull/9345) by [@karlprieb](https://github.com/karlprieb))
 
-- Fix livechat visitor edit ([#9506](https://github.com/RocketChat/Rocket.Chat/pull/9506))
+- Deleting message with store last message not removing ([#9335](https://github.com/RocketChat/Rocket.Chat/pull/9335))
 
-- large names on userinfo, and admin user bug on users with no usernames ([#9493](https://github.com/RocketChat/Rocket.Chat/pull/9493) by [@gdelavald](https://github.com/gdelavald))
+- custom emoji size on sidebar item ([#9314](https://github.com/RocketChat/Rocket.Chat/pull/9314) by [@karlprieb](https://github.com/karlprieb))
 
-<details>
-<summary>🔍 Minor changes</summary>
+- svg render on firefox ([#9311](https://github.com/RocketChat/Rocket.Chat/pull/9311) by [@karlprieb](https://github.com/karlprieb))
 
+- sidebar footer padding ([#9249](https://github.com/RocketChat/Rocket.Chat/pull/9249) by [@karlprieb](https://github.com/karlprieb))
 
-- Release 0.61.0 ([#9533](https://github.com/RocketChat/Rocket.Chat/pull/9533) by [@karlprieb](https://github.com/karlprieb) & [@ryjones](https://github.com/ryjones))
+- LDAP/AD is not importing all users ([#9309](https://github.com/RocketChat/Rocket.Chat/pull/9309))
 
-- Add community bot ([#9439](https://github.com/RocketChat/Rocket.Chat/pull/9439))
+- Wrong position of notifications alert in accounts preference page ([#9289](https://github.com/RocketChat/Rocket.Chat/pull/9289) by [@HammyHavoc](https://github.com/HammyHavoc))
 
-- Use correct version of Mailparser module ([#9356](https://github.com/RocketChat/Rocket.Chat/pull/9356))
+- English Typos ([#9285](https://github.com/RocketChat/Rocket.Chat/pull/9285) by [@HammyHavoc](https://github.com/HammyHavoc))
 
-- Develop sync - Bump version to 0.61.0-develop ([#9260](https://github.com/RocketChat/Rocket.Chat/pull/9260) by [@cpitman](https://github.com/cpitman) & [@karlprieb](https://github.com/karlprieb))
+- File access not working when passing credentials via querystring ([#9264](https://github.com/RocketChat/Rocket.Chat/pull/9264))
 
-- [Fix] oauth not working because of email array ([#9173](https://github.com/RocketChat/Rocket.Chat/pull/9173))
+- Move emojipicker css to theme package ([#9243](https://github.com/RocketChat/Rocket.Chat/pull/9243) by [@karlprieb](https://github.com/karlprieb))
 
-- [DOCS] Update the links of our Mobile Apps in Features topic ([#9469](https://github.com/RocketChat/Rocket.Chat/pull/9469) by [@rafaelks](https://github.com/rafaelks))
+- Show modal with announcement ([#9241](https://github.com/RocketChat/Rocket.Chat/pull/9241) by [@karlprieb](https://github.com/karlprieb))
 
-- Update license ([#9490](https://github.com/RocketChat/Rocket.Chat/pull/9490))
+- "Enter usernames" placeholder is cutting in "create channel" view ([#9194](https://github.com/RocketChat/Rocket.Chat/pull/9194) by [@TheReal1604](https://github.com/TheReal1604))
 
-- Prevent NPM package-lock inside livechat ([#9504](https://github.com/RocketChat/Rocket.Chat/pull/9504))
+- File upload not working on IE and weird on Chrome ([#9206](https://github.com/RocketChat/Rocket.Chat/pull/9206) by [@karlprieb](https://github.com/karlprieb))
 
-</details>
+- make the cross icon on user selection at channel creation page work ([#9176](https://github.com/RocketChat/Rocket.Chat/pull/9176) by [@karlprieb](https://github.com/karlprieb) & [@vitor-nagao](https://github.com/vitor-nagao))
 
-### 👩‍💻👨‍💻 Contributors 😍
+- Made welcome emails more readable ([#9193](https://github.com/RocketChat/Rocket.Chat/pull/9193) by [@HammyHavoc](https://github.com/HammyHavoc))
 
-- [@cpitman](https://github.com/cpitman)
-- [@cyclops24](https://github.com/cyclops24)
+- Cursor position when reply on safari ([#9185](https://github.com/RocketChat/Rocket.Chat/pull/9185) by [@karlprieb](https://github.com/karlprieb))
+
+- Emoji size on last message preview ([#9186](https://github.com/RocketChat/Rocket.Chat/pull/9186) by [@karlprieb](https://github.com/karlprieb))
+
+- Unread bar position when room have announcement ([#9188](https://github.com/RocketChat/Rocket.Chat/pull/9188) by [@karlprieb](https://github.com/karlprieb))
+
+- Error when user roles is missing or is invalid ([#9040](https://github.com/RocketChat/Rocket.Chat/pull/9040) by [@paulovitin](https://github.com/paulovitin))
+
+- Make mentions and menu icons color darker ([#8922](https://github.com/RocketChat/Rocket.Chat/pull/8922) by [@karlprieb](https://github.com/karlprieb))
+
+- "Use Emoji" preference not working ([#9182](https://github.com/RocketChat/Rocket.Chat/pull/9182) by [@karlprieb](https://github.com/karlprieb))
+
+- channel create scroll on small screens ([#9168](https://github.com/RocketChat/Rocket.Chat/pull/9168) by [@karlprieb](https://github.com/karlprieb))
+
+- go to replied message ([#9172](https://github.com/RocketChat/Rocket.Chat/pull/9172) by [@karlprieb](https://github.com/karlprieb))
+
+- modal data on enter and modal style for file preview ([#9171](https://github.com/RocketChat/Rocket.Chat/pull/9171) by [@karlprieb](https://github.com/karlprieb))
+
+- show oauth logins when adblock is used ([#9170](https://github.com/RocketChat/Rocket.Chat/pull/9170) by [@karlprieb](https://github.com/karlprieb))
+
+- Last sent message reoccurs in textbox ([#9169](https://github.com/RocketChat/Rocket.Chat/pull/9169))
+
+- Update Rocket.Chat for sandstorm ([#9062](https://github.com/RocketChat/Rocket.Chat/pull/9062) by [@peterlee0127](https://github.com/peterlee0127))
+
+- Importers not recovering when an error occurs ([#9134](https://github.com/RocketChat/Rocket.Chat/pull/9134))
+
+- Do not block room while loading history ([#9121](https://github.com/RocketChat/Rocket.Chat/pull/9121))
+
+- Channel page error ([#9091](https://github.com/RocketChat/Rocket.Chat/pull/9091) by [@ggrish](https://github.com/ggrish))
+
+- Contextual bar redesign ([#9481](https://github.com/RocketChat/Rocket.Chat/pull/9481) by [@gdelavald](https://github.com/gdelavald) & [@karlprieb](https://github.com/karlprieb))
+
+- mention-here is missing i18n text #9455 ([#9456](https://github.com/RocketChat/Rocket.Chat/pull/9456) by [@ryjones](https://github.com/ryjones))
+
+- Fix livechat visitor edit ([#9506](https://github.com/RocketChat/Rocket.Chat/pull/9506))
+
+- large names on userinfo, and admin user bug on users with no usernames ([#9493](https://github.com/RocketChat/Rocket.Chat/pull/9493) by [@gdelavald](https://github.com/gdelavald))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Release 0.61.0 ([#9533](https://github.com/RocketChat/Rocket.Chat/pull/9533) by [@karlprieb](https://github.com/karlprieb) & [@ryjones](https://github.com/ryjones))
+
+- Add community bot ([#9439](https://github.com/RocketChat/Rocket.Chat/pull/9439))
+
+- Use correct version of Mailparser module ([#9356](https://github.com/RocketChat/Rocket.Chat/pull/9356))
+
+- Update Marked dependecy to 0.3.9 ([#9346](https://github.com/RocketChat/Rocket.Chat/pull/9346))
+
+- Fix: English language improvements ([#9299](https://github.com/RocketChat/Rocket.Chat/pull/9299) by [@HammyHavoc](https://github.com/HammyHavoc))
+
+- Fix: Change 'Wordpress' to 'WordPress ([#9291](https://github.com/RocketChat/Rocket.Chat/pull/9291) by [@HammyHavoc](https://github.com/HammyHavoc))
+
+- Fix: Improved README.md ([#9290](https://github.com/RocketChat/Rocket.Chat/pull/9290) by [@HammyHavoc](https://github.com/HammyHavoc))
+
+- Fix: README typo ([#9286](https://github.com/RocketChat/Rocket.Chat/pull/9286) by [@HammyHavoc](https://github.com/HammyHavoc))
+
+- Develop sync - Bump version to 0.61.0-develop ([#9260](https://github.com/RocketChat/Rocket.Chat/pull/9260) by [@cpitman](https://github.com/cpitman) & [@karlprieb](https://github.com/karlprieb))
+
+- Do not change room icon color when room is unread ([#9257](https://github.com/RocketChat/Rocket.Chat/pull/9257))
+
+- LingoHub based on develop ([#9256](https://github.com/RocketChat/Rocket.Chat/pull/9256))
+
+- Fix: Sidebar item on rtl and small devices ([#9247](https://github.com/RocketChat/Rocket.Chat/pull/9247) by [@karlprieb](https://github.com/karlprieb))
+
+- Add curl, its missing on worker nodes so has to be explicitly added ([#9248](https://github.com/RocketChat/Rocket.Chat/pull/9248))
+
+- Fix: Unneeded warning in payload of REST API calls ([#9240](https://github.com/RocketChat/Rocket.Chat/pull/9240))
+
+- Fix: Missing option to set user's avatar from a url ([#9229](https://github.com/RocketChat/Rocket.Chat/pull/9229))
+
+- Fix: Upload access control too distributed ([#9215](https://github.com/RocketChat/Rocket.Chat/pull/9215))
+
+- Fix: Username find is matching partially ([#9217](https://github.com/RocketChat/Rocket.Chat/pull/9217))
+
+- Fix: updating last message on message edit or delete ([#9227](https://github.com/RocketChat/Rocket.Chat/pull/9227))
+
+- Fix: Rooms and users are using different avatar style ([#9196](https://github.com/RocketChat/Rocket.Chat/pull/9196))
+
+- Replace postcss-nesting with postcss-nested ([#9200](https://github.com/RocketChat/Rocket.Chat/pull/9200))
+
+- Dependencies Update ([#9197](https://github.com/RocketChat/Rocket.Chat/pull/9197))
+
+- Typo: German language file ([#9190](https://github.com/RocketChat/Rocket.Chat/pull/9190) by [@TheReal1604](https://github.com/TheReal1604))
+
+- Fix: Snippet name to not showing in snippet list ([#9184](https://github.com/RocketChat/Rocket.Chat/pull/9184) by [@karlprieb](https://github.com/karlprieb))
+
+- Fix/api me only return verified ([#9183](https://github.com/RocketChat/Rocket.Chat/pull/9183))
+
+- Fix: UI: Descenders of glyphs are cut off ([#9181](https://github.com/RocketChat/Rocket.Chat/pull/9181))
+
+- [Fix] oauth not working because of email array ([#9173](https://github.com/RocketChat/Rocket.Chat/pull/9173))
+
+- Fix: Click on channel name - hover area bigger than link area ([#9165](https://github.com/RocketChat/Rocket.Chat/pull/9165))
+
+- Fix: UI: Descenders of glyphs are cut off ([#9166](https://github.com/RocketChat/Rocket.Chat/pull/9166))
+
+- Fix: Can’t login using LDAP via REST ([#9162](https://github.com/RocketChat/Rocket.Chat/pull/9162))
+
+- Fix: Unread line ([#9149](https://github.com/RocketChat/Rocket.Chat/pull/9149))
+
+- Fix test without oplog by waiting a successful login on changing users ([#9146](https://github.com/RocketChat/Rocket.Chat/pull/9146))
+
+- Fix: Messages being displayed in reverse order ([#9144](https://github.com/RocketChat/Rocket.Chat/pull/9144))
+
+- Fix: Clear all unreads modal not closing after confirming ([#9137](https://github.com/RocketChat/Rocket.Chat/pull/9137))
+
+- Fix: Message action quick buttons drops if "new message" divider is being shown ([#9138](https://github.com/RocketChat/Rocket.Chat/pull/9138))
+
+- Fix: Confirmation modals showing `Send` button ([#9136](https://github.com/RocketChat/Rocket.Chat/pull/9136))
+
+- Fix: Multiple unread indicators ([#9120](https://github.com/RocketChat/Rocket.Chat/pull/9120))
+
+- [DOCS] Update the links of our Mobile Apps in Features topic ([#9469](https://github.com/RocketChat/Rocket.Chat/pull/9469) by [@rafaelks](https://github.com/rafaelks))
+
+- Update license ([#9490](https://github.com/RocketChat/Rocket.Chat/pull/9490))
+
+- Prevent NPM package-lock inside livechat ([#9504](https://github.com/RocketChat/Rocket.Chat/pull/9504))
+
+</details>
+
+### 👩‍💻👨‍💻 Contributors 😍
+
+- [@HammyHavoc](https://github.com/HammyHavoc)
+- [@TheReal1604](https://github.com/TheReal1604)
+- [@cpitman](https://github.com/cpitman)
+- [@cyclops24](https://github.com/cyclops24)
 - [@gdelavald](https://github.com/gdelavald)
+- [@ggrish](https://github.com/ggrish)
 - [@karlprieb](https://github.com/karlprieb)
+- [@paulovitin](https://github.com/paulovitin)
+- [@peterlee0127](https://github.com/peterlee0127)
+- [@pierreozoux](https://github.com/pierreozoux)
 - [@rafaelks](https://github.com/rafaelks)
 - [@ramrami](https://github.com/ramrami)
 - [@rndmh3ro](https://github.com/rndmh3ro)
 - [@ryjones](https://github.com/ryjones)
+- [@vitor-nagao](https://github.com/vitor-nagao)
 
 ### 👩‍💻👨‍💻 Core Team 🤓
 
@@ -8080,6 +8788,7 @@
 - [@frdmn](https://github.com/frdmn)
 - [@geekgonecrazy](https://github.com/geekgonecrazy)
 - [@ggazzo](https://github.com/ggazzo)
+- [@graywolf336](https://github.com/graywolf336)
 - [@rodrigok](https://github.com/rodrigok)
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
@@ -8215,7 +8924,7 @@
 - [@rodrigok](https://github.com/rodrigok)
 
 # 0.60.0
-`2017-12-27  ·  27 🎉  ·  74 🐛  ·  72 🔍  ·  59 👩‍💻👨‍💻`
+`2017-12-27  ·  33 🎉  ·  171 🐛  ·  99 🔍  ·  71 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.9.3`
@@ -8266,118 +8975,324 @@
 
 - Upgrade Meteor to 1.6 ([#8715](https://github.com/RocketChat/Rocket.Chat/pull/8715) by [@karlprieb](https://github.com/karlprieb))
 
+- Setting to disable MarkDown and enable AutoLinker ([#8459](https://github.com/RocketChat/Rocket.Chat/pull/8459))
+
 - Add settings for allow user direct messages to yourself ([#8066](https://github.com/RocketChat/Rocket.Chat/pull/8066) by [@lindoelio](https://github.com/lindoelio))
 
 - Add sweet alert to video call tab ([#8108](https://github.com/RocketChat/Rocket.Chat/pull/8108))
 
 - Displays QR code for manually entering when enabling 2fa ([#8143](https://github.com/RocketChat/Rocket.Chat/pull/8143))
 
-- Add yunohost.org installation method to Readme.md ([#8037](https://github.com/RocketChat/Rocket.Chat/pull/8037) by [@selamanse](https://github.com/selamanse))
+- Unify unread and mentions badge ([#8361](https://github.com/RocketChat/Rocket.Chat/pull/8361) by [@karlprieb](https://github.com/karlprieb))
+
+- make sidebar item width 100% ([#8362](https://github.com/RocketChat/Rocket.Chat/pull/8362) by [@karlprieb](https://github.com/karlprieb))
+
+- Smaller accountBox ([#8360](https://github.com/RocketChat/Rocket.Chat/pull/8360) by [@karlprieb](https://github.com/karlprieb))
+
+- Add RD Station integration to livechat ([#8304](https://github.com/RocketChat/Rocket.Chat/pull/8304))
+
+- Upgrade to meteor 1.5.2 ([#8073](https://github.com/RocketChat/Rocket.Chat/pull/8073))
+
+- Add yunohost.org installation method to Readme.md ([#8037](https://github.com/RocketChat/Rocket.Chat/pull/8037) by [@selamanse](https://github.com/selamanse))
+
+- Modal ([#9092](https://github.com/RocketChat/Rocket.Chat/pull/9092) by [@karlprieb](https://github.com/karlprieb))
+
+- Make Custom oauth accept nested usernameField ([#9066](https://github.com/RocketChat/Rocket.Chat/pull/9066) by [@pierreozoux](https://github.com/pierreozoux))
+
+### 🐛 Bug fixes
+
+
+- Can't react on Read Only rooms even when enabled ([#8925](https://github.com/RocketChat/Rocket.Chat/pull/8925) by [@karlprieb](https://github.com/karlprieb))
+
+- CAS does not share secrets when operating multiple server instances ([#8654](https://github.com/RocketChat/Rocket.Chat/pull/8654) by [@AmShaegar13](https://github.com/AmShaegar13))
+
+- Snippetted messages not working ([#8937](https://github.com/RocketChat/Rocket.Chat/pull/8937) by [@karlprieb](https://github.com/karlprieb))
+
+- Added afterUserCreated trigger after first CAS login ([#9022](https://github.com/RocketChat/Rocket.Chat/pull/9022) by [@AmShaegar13](https://github.com/AmShaegar13))
+
+- Notification is not sent when a video conference start ([#8828](https://github.com/RocketChat/Rocket.Chat/pull/8828) by [@deepseainside75](https://github.com/deepseainside75) & [@stefanoverducci](https://github.com/stefanoverducci))
+
+- long filename overlaps cancel button in progress bar ([#8868](https://github.com/RocketChat/Rocket.Chat/pull/8868) by [@joesitton](https://github.com/joesitton))
+
+- Changed oembedUrlWidget to prefer og:image and twitter:image over msapplication-TileImage ([#9012](https://github.com/RocketChat/Rocket.Chat/pull/9012) by [@wferris722](https://github.com/wferris722))
+
+- Update insecure moment.js dependency ([#9046](https://github.com/RocketChat/Rocket.Chat/pull/9046) by [@robbyoconnor](https://github.com/robbyoconnor))
+
+- Custom OAuth: Not able to set different token place for routes ([#9034](https://github.com/RocketChat/Rocket.Chat/pull/9034))
+
+- Can't use OAuth login against a Rocket.Chat OAuth server ([#9044](https://github.com/RocketChat/Rocket.Chat/pull/9044))
+
+- Notification sound is not disabling when busy ([#9042](https://github.com/RocketChat/Rocket.Chat/pull/9042))
+
+- Use encodeURI in AmazonS3 contentDisposition file.name to prevent fail ([#9024](https://github.com/RocketChat/Rocket.Chat/pull/9024) by [@paulovitin](https://github.com/paulovitin))
+
+- snap install by setting grpc package used by google/vision to 1.6.6 ([#9029](https://github.com/RocketChat/Rocket.Chat/pull/9029))
+
+- Enable CORS for Restivus ([#8671](https://github.com/RocketChat/Rocket.Chat/pull/8671) by [@mrsimpson](https://github.com/mrsimpson))
+
+- Importers failing when usernames exists but cases don't match and improve the importer framework's performance ([#8966](https://github.com/RocketChat/Rocket.Chat/pull/8966))
+
+- Error when saving integration with symbol as only trigger ([#9023](https://github.com/RocketChat/Rocket.Chat/pull/9023))
+
+- Sync of non existent field throws exception ([#8006](https://github.com/RocketChat/Rocket.Chat/pull/8006) by [@goiaba](https://github.com/goiaba))
+
+- Autoupdate of CSS does not work when using a prefix ([#8107](https://github.com/RocketChat/Rocket.Chat/pull/8107) by [@Darkneon](https://github.com/Darkneon))
+
+- Contextual errors for this and RegExp declarations in IRC module ([#8656](https://github.com/RocketChat/Rocket.Chat/pull/8656) by [@Pharserror](https://github.com/Pharserror))
+
+- Wrong room counter name ([#9013](https://github.com/RocketChat/Rocket.Chat/pull/9013) by [@karlprieb](https://github.com/karlprieb))
+
+- Message-box autogrow flick ([#8932](https://github.com/RocketChat/Rocket.Chat/pull/8932) by [@karlprieb](https://github.com/karlprieb))
+
+- Don't strip trailing slash on autolinker urls ([#8812](https://github.com/RocketChat/Rocket.Chat/pull/8812) by [@jwilkins](https://github.com/jwilkins))
+
+- Change the unread messages style ([#8883](https://github.com/RocketChat/Rocket.Chat/pull/8883) by [@karlprieb](https://github.com/karlprieb))
+
+- Missing sidebar footer padding ([#8884](https://github.com/RocketChat/Rocket.Chat/pull/8884) by [@karlprieb](https://github.com/karlprieb))
+
+- Long room announcement cut off ([#8907](https://github.com/RocketChat/Rocket.Chat/pull/8907) by [@karlprieb](https://github.com/karlprieb))
+
+- DM email notifications always being sent regardless of account setting ([#8917](https://github.com/RocketChat/Rocket.Chat/pull/8917) by [@ashward](https://github.com/ashward))
+
+- Typo Fix ([#8938](https://github.com/RocketChat/Rocket.Chat/pull/8938) by [@seangeleno](https://github.com/seangeleno))
+
+- Katex markdown link changed ([#8948](https://github.com/RocketChat/Rocket.Chat/pull/8948) by [@mritunjaygoutam12](https://github.com/mritunjaygoutam12))
+
+- if ogImage exists use it over image in oembedUrlWidget ([#9000](https://github.com/RocketChat/Rocket.Chat/pull/9000) by [@satyapramodh](https://github.com/satyapramodh))
+
+- Cannot edit or delete custom sounds ([#8889](https://github.com/RocketChat/Rocket.Chat/pull/8889) by [@ccfang](https://github.com/ccfang))
+
+- Change old 'rocketbot' username to 'InternalHubot_Username' setting ([#8928](https://github.com/RocketChat/Rocket.Chat/pull/8928) by [@ramrami](https://github.com/ramrami))
+
+- Link for channels are not rendering correctly ([#8985](https://github.com/RocketChat/Rocket.Chat/pull/8985) by [@karlprieb](https://github.com/karlprieb))
+
+- Xenforo [BD]API for 'user.user_id; instead of 'id' ([#8968](https://github.com/RocketChat/Rocket.Chat/pull/8968) by [@wesnspace](https://github.com/wesnspace))
+
+- flextab height on smaller screens ([#8994](https://github.com/RocketChat/Rocket.Chat/pull/8994) by [@karlprieb](https://github.com/karlprieb))
+
+- Check for mention-all permission in room scope ([#8931](https://github.com/RocketChat/Rocket.Chat/pull/8931))
+
+- fix emoji package path so they show up correctly in browser ([#8822](https://github.com/RocketChat/Rocket.Chat/pull/8822) by [@ryoshimizu](https://github.com/ryoshimizu))
+
+- Set correct Twitter link ([#8830](https://github.com/RocketChat/Rocket.Chat/pull/8830) by [@jotafeldmann](https://github.com/jotafeldmann))
+
+- User email settings on DM ([#8810](https://github.com/RocketChat/Rocket.Chat/pull/8810) by [@karlprieb](https://github.com/karlprieb))
+
+- i18n'd Resend_verification_mail, username_initials, upload avatar ([#8721](https://github.com/RocketChat/Rocket.Chat/pull/8721) by [@arungalva](https://github.com/arungalva))
+
+- Username clipping on firefox ([#8716](https://github.com/RocketChat/Rocket.Chat/pull/8716) by [@karlprieb](https://github.com/karlprieb))
+
+- Improved grammar and made it clearer to the user ([#8795](https://github.com/RocketChat/Rocket.Chat/pull/8795) by [@HammyHavoc](https://github.com/HammyHavoc))
+
+- Show real name of current user at top of side nav if setting enabled ([#8718](https://github.com/RocketChat/Rocket.Chat/pull/8718) by [@alexbrazier](https://github.com/alexbrazier))
+
+- Range Slider Value label has bug in RTL ([#8441](https://github.com/RocketChat/Rocket.Chat/pull/8441) by [@cyclops24](https://github.com/cyclops24))
+
+- Add historic chats icon in Livechat ([#8708](https://github.com/RocketChat/Rocket.Chat/pull/8708) by [@mrsimpson](https://github.com/mrsimpson))
+
+- Sort direct messages by full name if show real names setting enabled ([#8717](https://github.com/RocketChat/Rocket.Chat/pull/8717) by [@alexbrazier](https://github.com/alexbrazier))
+
+- Improving consistency of UX ([#8796](https://github.com/RocketChat/Rocket.Chat/pull/8796) by [@HammyHavoc](https://github.com/HammyHavoc))
+
+- fixed some typos ([#8787](https://github.com/RocketChat/Rocket.Chat/pull/8787) by [@TheReal1604](https://github.com/TheReal1604))
+
+- Fix e-mail message forward ([#8645](https://github.com/RocketChat/Rocket.Chat/pull/8645))
+
+- Audio message icon ([#8648](https://github.com/RocketChat/Rocket.Chat/pull/8648) by [@karlprieb](https://github.com/karlprieb))
+
+- Highlighted color height issue ([#8431](https://github.com/RocketChat/Rocket.Chat/pull/8431) by [@cyclops24](https://github.com/cyclops24))
+
+- AmazonS3: Quote file.name for ContentDisposition for files with commas ([#8593](https://github.com/RocketChat/Rocket.Chat/pull/8593) by [@xenithorb](https://github.com/xenithorb))
+
+- Update pt-BR translation ([#8655](https://github.com/RocketChat/Rocket.Chat/pull/8655) by [@rodorgas](https://github.com/rodorgas))
+
+- Fix typos ([#8679](https://github.com/RocketChat/Rocket.Chat/pull/8679))
+
+- LDAP not respecting UTF8 characters & Sync Interval not working ([#8691](https://github.com/RocketChat/Rocket.Chat/pull/8691))
+
+- Missing scroll at create channel page ([#8637](https://github.com/RocketChat/Rocket.Chat/pull/8637) by [@karlprieb](https://github.com/karlprieb))
+
+- Message popup menu on mobile/cordova ([#8634](https://github.com/RocketChat/Rocket.Chat/pull/8634) by [@karlprieb](https://github.com/karlprieb))
+
+- API channel/group.members not sorting ([#8635](https://github.com/RocketChat/Rocket.Chat/pull/8635))
+
+- LDAP not merging existent users && Wrong id link generation ([#8613](https://github.com/RocketChat/Rocket.Chat/pull/8613))
+
+- encode filename in url to prevent links breaking ([#8551](https://github.com/RocketChat/Rocket.Chat/pull/8551) by [@joesitton](https://github.com/joesitton))
+
+- Fix guest pool inquiry taking ([#8577](https://github.com/RocketChat/Rocket.Chat/pull/8577))
+
+- Changed all rocket.chat/docs/ to docs.rocket.chat/ ([#8588](https://github.com/RocketChat/Rocket.Chat/pull/8588) by [@RekkyRek](https://github.com/RekkyRek))
+
+- Color reset when default value editor is different ([#8543](https://github.com/RocketChat/Rocket.Chat/pull/8543))
+
+- Wrong colors after migration 103 ([#8547](https://github.com/RocketChat/Rocket.Chat/pull/8547))
+
+- LDAP login error regression at 0.59.0 ([#8541](https://github.com/RocketChat/Rocket.Chat/pull/8541))
+
+- Migration 103 wrong converting primrary colors ([#8544](https://github.com/RocketChat/Rocket.Chat/pull/8544))
+
+- Do not send joinCode field to clients ([#8527](https://github.com/RocketChat/Rocket.Chat/pull/8527))
+
+- Uncessary route reload break some routes ([#8514](https://github.com/RocketChat/Rocket.Chat/pull/8514))
+
+- Invalid Code message for password protected channel ([#8491](https://github.com/RocketChat/Rocket.Chat/pull/8491))
+
+- Wrong message when reseting password and 2FA is enabled ([#8489](https://github.com/RocketChat/Rocket.Chat/pull/8489))
+
+- LDAP memory issues when pagination is not available ([#8457](https://github.com/RocketChat/Rocket.Chat/pull/8457))
+
+- Add needed dependency for snaps ([#8389](https://github.com/RocketChat/Rocket.Chat/pull/8389))
+
+- Slack import failing and not being able to be restarted ([#8390](https://github.com/RocketChat/Rocket.Chat/pull/8390))
+
+- Sidebar item menu position in RTL ([#8397](https://github.com/RocketChat/Rocket.Chat/pull/8397) by [@cyclops24](https://github.com/cyclops24))
+
+- disabled katex tooltip on messageBox ([#8386](https://github.com/RocketChat/Rocket.Chat/pull/8386))
+
+- Duplicate code in rest api letting in a few bugs with the rest api ([#8408](https://github.com/RocketChat/Rocket.Chat/pull/8408))
+
+- Various LDAP issues & Missing pagination ([#8372](https://github.com/RocketChat/Rocket.Chat/pull/8372))
+
+- remove accountBox from admin menu ([#8358](https://github.com/RocketChat/Rocket.Chat/pull/8358) by [@karlprieb](https://github.com/karlprieb))
+
+- Missing i18n translations ([#8357](https://github.com/RocketChat/Rocket.Chat/pull/8357))
+
+- After deleting the room, cache is not synchronizing ([#8314](https://github.com/RocketChat/Rocket.Chat/pull/8314) by [@szluohua](https://github.com/szluohua))
+
+- Remove sidebar header on admin embedded version ([#8334](https://github.com/RocketChat/Rocket.Chat/pull/8334) by [@karlprieb](https://github.com/karlprieb))
+
+- Email Subjects not being sent ([#8317](https://github.com/RocketChat/Rocket.Chat/pull/8317))
+
+- Put delete action on another popover group ([#8315](https://github.com/RocketChat/Rocket.Chat/pull/8315) by [@karlprieb](https://github.com/karlprieb))
+
+- Mention unread indicator was removed ([#8316](https://github.com/RocketChat/Rocket.Chat/pull/8316))
+
+- Execute meteor reset on TRAVIS_TAG builds ([#8310](https://github.com/RocketChat/Rocket.Chat/pull/8310))
+
+- Wrong file name when upload to AWS S3 ([#8296](https://github.com/RocketChat/Rocket.Chat/pull/8296))
+
+- TypeError: Cannot read property 't' of undefined ([#8298](https://github.com/RocketChat/Rocket.Chat/pull/8298))
+
+- Check attachments is defined before accessing first element ([#8295](https://github.com/RocketChat/Rocket.Chat/pull/8295) by [@Darkneon](https://github.com/Darkneon))
+
+- Amin menu not showing all items & File list breaking line ([#8299](https://github.com/RocketChat/Rocket.Chat/pull/8299) by [@karlprieb](https://github.com/karlprieb))
+
+- Call buttons with wrong margin on RTL ([#8307](https://github.com/RocketChat/Rocket.Chat/pull/8307) by [@karlprieb](https://github.com/karlprieb))
+
+- Emoji Picker hidden for reactions in RTL ([#8300](https://github.com/RocketChat/Rocket.Chat/pull/8300) by [@karlprieb](https://github.com/karlprieb))
+
+- fix color on unread messages ([#8282](https://github.com/RocketChat/Rocket.Chat/pull/8282))
+
+- Missing placeholder translations ([#8286](https://github.com/RocketChat/Rocket.Chat/pull/8286))
+
+- "Cancel button" on modal in RTL in Firefox 55 ([#8278](https://github.com/RocketChat/Rocket.Chat/pull/8278) by [@cyclops24](https://github.com/cyclops24))
 
-- Modal ([#9092](https://github.com/RocketChat/Rocket.Chat/pull/9092) by [@karlprieb](https://github.com/karlprieb))
+- Attachment icons alignment in LTR and RTL ([#8271](https://github.com/RocketChat/Rocket.Chat/pull/8271) by [@cyclops24](https://github.com/cyclops24))
 
-- Make Custom oauth accept nested usernameField ([#9066](https://github.com/RocketChat/Rocket.Chat/pull/9066) by [@pierreozoux](https://github.com/pierreozoux))
+- [i18n] My Profile & README.md links ([#8270](https://github.com/RocketChat/Rocket.Chat/pull/8270) by [@Rzeszow](https://github.com/Rzeszow))
 
-### 🐛 Bug fixes
+- Incorrect URL for login terms when using prefix ([#8211](https://github.com/RocketChat/Rocket.Chat/pull/8211) by [@Darkneon](https://github.com/Darkneon))
 
+- Scrollbar not using new style ([#8190](https://github.com/RocketChat/Rocket.Chat/pull/8190))
 
-- Can't react on Read Only rooms even when enabled ([#8925](https://github.com/RocketChat/Rocket.Chat/pull/8925) by [@karlprieb](https://github.com/karlprieb))
+- User avatar in DM list. ([#8210](https://github.com/RocketChat/Rocket.Chat/pull/8210))
 
-- CAS does not share secrets when operating multiple server instances ([#8654](https://github.com/RocketChat/Rocket.Chat/pull/8654) by [@AmShaegar13](https://github.com/AmShaegar13))
+- Fix iframe login API response (issue #8145) ([#8146](https://github.com/RocketChat/Rocket.Chat/pull/8146) by [@astax-t](https://github.com/astax-t))
 
-- Snippetted messages not working ([#8937](https://github.com/RocketChat/Rocket.Chat/pull/8937) by [@karlprieb](https://github.com/karlprieb))
+- Issue #8166 where empty analytics setting breaks to load Piwik script ([#8167](https://github.com/RocketChat/Rocket.Chat/pull/8167) by [@ruKurz](https://github.com/ruKurz))
 
-- Added afterUserCreated trigger after first CAS login ([#9022](https://github.com/RocketChat/Rocket.Chat/pull/9022) by [@AmShaegar13](https://github.com/AmShaegar13))
+- Sidebar and RTL alignments ([#8154](https://github.com/RocketChat/Rocket.Chat/pull/8154) by [@karlprieb](https://github.com/karlprieb))
 
-- Notification is not sent when a video conference start ([#8828](https://github.com/RocketChat/Rocket.Chat/pull/8828) by [@deepseainside75](https://github.com/deepseainside75) & [@stefanoverducci](https://github.com/stefanoverducci))
+- "*.members" rest api being useless and only returning usernames ([#8147](https://github.com/RocketChat/Rocket.Chat/pull/8147))
 
-- long filename overlaps cancel button in progress bar ([#8868](https://github.com/RocketChat/Rocket.Chat/pull/8868) by [@joesitton](https://github.com/joesitton))
+- Text area lost text when page reloads ([#8159](https://github.com/RocketChat/Rocket.Chat/pull/8159))
 
-- Changed oembedUrlWidget to prefer og:image and twitter:image over msapplication-TileImage ([#9012](https://github.com/RocketChat/Rocket.Chat/pull/9012) by [@wferris722](https://github.com/wferris722))
+- Add admin audio preferences translations ([#8094](https://github.com/RocketChat/Rocket.Chat/pull/8094))
 
-- Update insecure moment.js dependency ([#9046](https://github.com/RocketChat/Rocket.Chat/pull/9046) by [@robbyoconnor](https://github.com/robbyoconnor))
+- RTL ([#8112](https://github.com/RocketChat/Rocket.Chat/pull/8112))
 
-- Custom OAuth: Not able to set different token place for routes ([#9034](https://github.com/RocketChat/Rocket.Chat/pull/9034))
+- Settings description not showing ([#8122](https://github.com/RocketChat/Rocket.Chat/pull/8122))
 
-- Can't use OAuth login against a Rocket.Chat OAuth server ([#9044](https://github.com/RocketChat/Rocket.Chat/pull/9044))
+- Not sending email to mentioned users with unchanged preference ([#8059](https://github.com/RocketChat/Rocket.Chat/pull/8059))
 
-- Notification sound is not disabling when busy ([#9042](https://github.com/RocketChat/Rocket.Chat/pull/9042))
+- Dynamic popover ([#8101](https://github.com/RocketChat/Rocket.Chat/pull/8101) by [@karlprieb](https://github.com/karlprieb))
 
-- Use encodeURI in AmazonS3 contentDisposition file.name to prevent fail ([#9024](https://github.com/RocketChat/Rocket.Chat/pull/9024) by [@paulovitin](https://github.com/paulovitin))
+- Fix setting user avatar on LDAP login ([#8099](https://github.com/RocketChat/Rocket.Chat/pull/8099))
 
-- snap install by setting grpc package used by google/vision to 1.6.6 ([#9029](https://github.com/RocketChat/Rocket.Chat/pull/9029))
+- Scroll on messagebox ([#8047](https://github.com/RocketChat/Rocket.Chat/pull/8047))
 
-- Enable CORS for Restivus ([#8671](https://github.com/RocketChat/Rocket.Chat/pull/8671) by [@mrsimpson](https://github.com/mrsimpson))
+- Invisible leader bar on hover ([#8048](https://github.com/RocketChat/Rocket.Chat/pull/8048))
 
-- Importers failing when usernames exists but cases don't match and improve the importer framework's performance ([#8966](https://github.com/RocketChat/Rocket.Chat/pull/8966))
+- Fix email on mention ([#7754](https://github.com/RocketChat/Rocket.Chat/pull/7754))
 
-- Error when saving integration with symbol as only trigger ([#9023](https://github.com/RocketChat/Rocket.Chat/pull/9023))
+- Prevent autotranslate tokens race condition ([#8046](https://github.com/RocketChat/Rocket.Chat/pull/8046))
 
-- Sync of non existent field throws exception ([#8006](https://github.com/RocketChat/Rocket.Chat/pull/8006) by [@goiaba](https://github.com/goiaba))
+- Vertical menu on flex-tab ([#7988](https://github.com/RocketChat/Rocket.Chat/pull/7988) by [@karlprieb](https://github.com/karlprieb))
 
-- Autoupdate of CSS does not work when using a prefix ([#8107](https://github.com/RocketChat/Rocket.Chat/pull/8107) by [@Darkneon](https://github.com/Darkneon))
+- message-box autogrow ([#8019](https://github.com/RocketChat/Rocket.Chat/pull/8019) by [@karlprieb](https://github.com/karlprieb))
 
-- Contextual errors for this and RegExp declarations in IRC module ([#8656](https://github.com/RocketChat/Rocket.Chat/pull/8656) by [@Pharserror](https://github.com/Pharserror))
+- copy to clipboard and update clipboard.js library ([#8039](https://github.com/RocketChat/Rocket.Chat/pull/8039) by [@karlprieb](https://github.com/karlprieb))
 
-- Wrong room counter name ([#9013](https://github.com/RocketChat/Rocket.Chat/pull/9013) by [@karlprieb](https://github.com/karlprieb))
+- Recent emojis not updated when adding via text ([#7998](https://github.com/RocketChat/Rocket.Chat/pull/7998))
 
-- Message-box autogrow flick ([#8932](https://github.com/RocketChat/Rocket.Chat/pull/8932) by [@karlprieb](https://github.com/karlprieb))
+- [PL] Polish translation ([#7989](https://github.com/RocketChat/Rocket.Chat/pull/7989) by [@Rzeszow](https://github.com/Rzeszow))
 
-- Don't strip trailing slash on autolinker urls ([#8812](https://github.com/RocketChat/Rocket.Chat/pull/8812) by [@jwilkins](https://github.com/jwilkins))
+- Chat box no longer auto-focuses when typing ([#7984](https://github.com/RocketChat/Rocket.Chat/pull/7984))
 
-- Change the unread messages style ([#8883](https://github.com/RocketChat/Rocket.Chat/pull/8883) by [@karlprieb](https://github.com/karlprieb))
+- Fix the status on the members list ([#7963](https://github.com/RocketChat/Rocket.Chat/pull/7963))
 
-- Missing sidebar footer padding ([#8884](https://github.com/RocketChat/Rocket.Chat/pull/8884) by [@karlprieb](https://github.com/karlprieb))
+- Markdown being rendered in code tags ([#7965](https://github.com/RocketChat/Rocket.Chat/pull/7965))
 
-- Long room announcement cut off ([#8907](https://github.com/RocketChat/Rocket.Chat/pull/8907) by [@karlprieb](https://github.com/karlprieb))
+- Email verification indicator added ([#7923](https://github.com/RocketChat/Rocket.Chat/pull/7923) by [@aditya19496](https://github.com/aditya19496))
 
-- DM email notifications always being sent regardless of account setting ([#8917](https://github.com/RocketChat/Rocket.Chat/pull/8917) by [@ashward](https://github.com/ashward))
+- Show leader on first load ([#7712](https://github.com/RocketChat/Rocket.Chat/pull/7712) by [@danischreiber](https://github.com/danischreiber))
 
-- Typo Fix ([#8938](https://github.com/RocketChat/Rocket.Chat/pull/8938) by [@seangeleno](https://github.com/seangeleno))
+- Add padding on messages to allow space to the action buttons ([#7971](https://github.com/RocketChat/Rocket.Chat/pull/7971))
 
-- Katex markdown link changed ([#8948](https://github.com/RocketChat/Rocket.Chat/pull/8948) by [@mritunjaygoutam12](https://github.com/mritunjaygoutam12))
+- Small alignment fixes ([#7970](https://github.com/RocketChat/Rocket.Chat/pull/7970))
 
-- if ogImage exists use it over image in oembedUrlWidget ([#9000](https://github.com/RocketChat/Rocket.Chat/pull/9000) by [@satyapramodh](https://github.com/satyapramodh))
+- username ellipsis on firefox ([#7953](https://github.com/RocketChat/Rocket.Chat/pull/7953) by [@karlprieb](https://github.com/karlprieb))
 
-- Cannot edit or delete custom sounds ([#8889](https://github.com/RocketChat/Rocket.Chat/pull/8889) by [@ccfang](https://github.com/ccfang))
+- Document README.md. Drupal repo out of date ([#7948](https://github.com/RocketChat/Rocket.Chat/pull/7948) by [@Lawri-van-Buel](https://github.com/Lawri-van-Buel))
 
-- Change old 'rocketbot' username to 'InternalHubot_Username' setting ([#8928](https://github.com/RocketChat/Rocket.Chat/pull/8928) by [@ramrami](https://github.com/ramrami))
+- Double scroll on 'keyboard shortcuts' menu in sidepanel ([#7927](https://github.com/RocketChat/Rocket.Chat/pull/7927) by [@aditya19496](https://github.com/aditya19496))
 
-- Link for channels are not rendering correctly ([#8985](https://github.com/RocketChat/Rocket.Chat/pull/8985) by [@karlprieb](https://github.com/karlprieb))
+- Broken emoji picker on firefox ([#7943](https://github.com/RocketChat/Rocket.Chat/pull/7943) by [@karlprieb](https://github.com/karlprieb))
 
-- Xenforo [BD]API for 'user.user_id; instead of 'id' ([#8968](https://github.com/RocketChat/Rocket.Chat/pull/8968) by [@wesnspace](https://github.com/wesnspace))
+- Broken embedded view layout ([#7944](https://github.com/RocketChat/Rocket.Chat/pull/7944) by [@karlprieb](https://github.com/karlprieb))
 
-- flextab height on smaller screens ([#8994](https://github.com/RocketChat/Rocket.Chat/pull/8994) by [@karlprieb](https://github.com/karlprieb))
+- Fix placeholders in account profile ([#7945](https://github.com/RocketChat/Rocket.Chat/pull/7945) by [@josiasds](https://github.com/josiasds))
 
-- Check for mention-all permission in room scope ([#8931](https://github.com/RocketChat/Rocket.Chat/pull/8931))
+- OTR buttons padding ([#7954](https://github.com/RocketChat/Rocket.Chat/pull/7954) by [@karlprieb](https://github.com/karlprieb))
 
-- fix emoji package path so they show up correctly in browser ([#8822](https://github.com/RocketChat/Rocket.Chat/pull/8822) by [@ryoshimizu](https://github.com/ryoshimizu))
+- status and active room colors on sidebar ([#7960](https://github.com/RocketChat/Rocket.Chat/pull/7960) by [@karlprieb](https://github.com/karlprieb))
 
-- Set correct Twitter link ([#8830](https://github.com/RocketChat/Rocket.Chat/pull/8830) by [@jotafeldmann](https://github.com/jotafeldmann))
+- Fix google play logo on repo README ([#7912](https://github.com/RocketChat/Rocket.Chat/pull/7912) by [@luizbills](https://github.com/luizbills))
 
-- User email settings on DM ([#8810](https://github.com/RocketChat/Rocket.Chat/pull/8810) by [@karlprieb](https://github.com/karlprieb))
+- Fix livechat toggle UI issue ([#7904](https://github.com/RocketChat/Rocket.Chat/pull/7904))
 
-- i18n'd Resend_verification_mail, username_initials, upload avatar ([#8721](https://github.com/RocketChat/Rocket.Chat/pull/8721) by [@arungalva](https://github.com/arungalva))
+- Remove break change in Realtime API ([#7895](https://github.com/RocketChat/Rocket.Chat/pull/7895))
 
-- Username clipping on firefox ([#8716](https://github.com/RocketChat/Rocket.Chat/pull/8716) by [@karlprieb](https://github.com/karlprieb))
+- Window exception when parsing Markdown on server ([#7893](https://github.com/RocketChat/Rocket.Chat/pull/7893))
 
-- Improved grammar and made it clearer to the user ([#8795](https://github.com/RocketChat/Rocket.Chat/pull/8795) by [@HammyHavoc](https://github.com/HammyHavoc))
+- sidebar buttons and badge paddings ([#7888](https://github.com/RocketChat/Rocket.Chat/pull/7888) by [@karlprieb](https://github.com/karlprieb))
 
-- Show real name of current user at top of side nav if setting enabled ([#8718](https://github.com/RocketChat/Rocket.Chat/pull/8718) by [@alexbrazier](https://github.com/alexbrazier))
+- hyperlink style on sidebar footer ([#7882](https://github.com/RocketChat/Rocket.Chat/pull/7882) by [@karlprieb](https://github.com/karlprieb))
 
-- Range Slider Value label has bug in RTL ([#8441](https://github.com/RocketChat/Rocket.Chat/pull/8441) by [@cyclops24](https://github.com/cyclops24))
+- livechat icon ([#7886](https://github.com/RocketChat/Rocket.Chat/pull/7886) by [@karlprieb](https://github.com/karlprieb))
 
-- Add historic chats icon in Livechat ([#8708](https://github.com/RocketChat/Rocket.Chat/pull/8708) by [@mrsimpson](https://github.com/mrsimpson))
+- Makes text action menu width based on content size ([#7887](https://github.com/RocketChat/Rocket.Chat/pull/7887) by [@gdelavald](https://github.com/gdelavald))
 
-- Sort direct messages by full name if show real names setting enabled ([#8717](https://github.com/RocketChat/Rocket.Chat/pull/8717) by [@alexbrazier](https://github.com/alexbrazier))
+- message actions over unread bar ([#7885](https://github.com/RocketChat/Rocket.Chat/pull/7885) by [@karlprieb](https://github.com/karlprieb))
 
-- Improving consistency of UX ([#8796](https://github.com/RocketChat/Rocket.Chat/pull/8796) by [@HammyHavoc](https://github.com/HammyHavoc))
+- popover position on mobile ([#7883](https://github.com/RocketChat/Rocket.Chat/pull/7883) by [@karlprieb](https://github.com/karlprieb))
 
-- fixed some typos ([#8787](https://github.com/RocketChat/Rocket.Chat/pull/8787) by [@TheReal1604](https://github.com/TheReal1604))
+- search results position on sidebar ([#7881](https://github.com/RocketChat/Rocket.Chat/pull/7881) by [@karlprieb](https://github.com/karlprieb))
 
-- Changed all rocket.chat/docs/ to docs.rocket.chat/ ([#8588](https://github.com/RocketChat/Rocket.Chat/pull/8588) by [@RekkyRek](https://github.com/RekkyRek))
+- sidebar paddings ([#7880](https://github.com/RocketChat/Rocket.Chat/pull/7880) by [@karlprieb](https://github.com/karlprieb))
 
-- Email verification indicator added ([#7923](https://github.com/RocketChat/Rocket.Chat/pull/7923) by [@aditya19496](https://github.com/aditya19496))
+- Adds default search text padding for emoji search ([#7878](https://github.com/RocketChat/Rocket.Chat/pull/7878) by [@gdelavald](https://github.com/gdelavald))
 
 - REST API file upload not respecting size limit ([#9108](https://github.com/RocketChat/Rocket.Chat/pull/9108))
 
@@ -8483,8 +9398,26 @@
 
 - Updated comments. ([#8719](https://github.com/RocketChat/Rocket.Chat/pull/8719) by [@jasonjyu](https://github.com/jasonjyu))
 
+- removing a duplicate line ([#8434](https://github.com/RocketChat/Rocket.Chat/pull/8434) by [@vikaskedia](https://github.com/vikaskedia))
+
+- install grpc package manually to fix snap armhf build ([#8653](https://github.com/RocketChat/Rocket.Chat/pull/8653))
+
 - Fix community links in readme ([#8589](https://github.com/RocketChat/Rocket.Chat/pull/8589))
 
+- Improve room sync speed ([#8529](https://github.com/RocketChat/Rocket.Chat/pull/8529))
+
+- Fix high CPU load when sending messages on large rooms (regression) ([#8520](https://github.com/RocketChat/Rocket.Chat/pull/8520))
+
+- Change artifact path ([#8515](https://github.com/RocketChat/Rocket.Chat/pull/8515))
+
+- Color variables migration ([#8463](https://github.com/RocketChat/Rocket.Chat/pull/8463) by [@karlprieb](https://github.com/karlprieb))
+
+- Fix: Change password not working in new UI ([#8516](https://github.com/RocketChat/Rocket.Chat/pull/8516))
+
+- Enable AutoLinker back ([#8490](https://github.com/RocketChat/Rocket.Chat/pull/8490))
+
+- Improve markdown parser code ([#8451](https://github.com/RocketChat/Rocket.Chat/pull/8451))
+
 - [MOVE] Move favico to client folder ([#8077](https://github.com/RocketChat/Rocket.Chat/pull/8077) by [@vcapretz](https://github.com/vcapretz))
 
 - [MOVE] Move files from emojione to client/server folders ([#8078](https://github.com/RocketChat/Rocket.Chat/pull/8078) by [@vcapretz](https://github.com/vcapretz))
@@ -8511,12 +9444,48 @@
 
 - [MOVE] Move timesync files to client/server folders ([#8152](https://github.com/RocketChat/Rocket.Chat/pull/8152) by [@vcapretz](https://github.com/vcapretz))
 
+- Fix: Account menu position on RTL ([#8416](https://github.com/RocketChat/Rocket.Chat/pull/8416) by [@karlprieb](https://github.com/karlprieb))
+
+- Fix: Missing LDAP option to show internal logs ([#8417](https://github.com/RocketChat/Rocket.Chat/pull/8417))
+
+- Fix: Missing LDAP reconnect setting ([#8414](https://github.com/RocketChat/Rocket.Chat/pull/8414))
+
+- Add i18n Title to snippet messages ([#8394](https://github.com/RocketChat/Rocket.Chat/pull/8394))
+
+- Fix: Missing settings to configure LDAP size and page limits ([#8398](https://github.com/RocketChat/Rocket.Chat/pull/8398))
+
+- LingoHub based on develop ([#8375](https://github.com/RocketChat/Rocket.Chat/pull/8375))
+
+- Update Meteor to 1.5.2.2 ([#8364](https://github.com/RocketChat/Rocket.Chat/pull/8364))
+
+- Sync translations from LingoHub ([#8363](https://github.com/RocketChat/Rocket.Chat/pull/8363))
+
+- Remove field `lastActivity` from subscription data ([#8345](https://github.com/RocketChat/Rocket.Chat/pull/8345))
+
+- Update meteor to 1.5.2.2-rc.0 ([#8355](https://github.com/RocketChat/Rocket.Chat/pull/8355))
+
+- [FIX-RC] Mobile file upload not working ([#8331](https://github.com/RocketChat/Rocket.Chat/pull/8331) by [@karlprieb](https://github.com/karlprieb))
+
+- Deps update ([#8273](https://github.com/RocketChat/Rocket.Chat/pull/8273))
+
+- Fix more rtl issues ([#8194](https://github.com/RocketChat/Rocket.Chat/pull/8194) by [@karlprieb](https://github.com/karlprieb))
+
+- npm deps update ([#8197](https://github.com/RocketChat/Rocket.Chat/pull/8197))
+
+- Remove unnecessary returns in cors common ([#8054](https://github.com/RocketChat/Rocket.Chat/pull/8054) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - Adding: How to Install in WeDeploy ([#8036](https://github.com/RocketChat/Rocket.Chat/pull/8036) by [@thompsonemerson](https://github.com/thompsonemerson))
 
 - Revert "npm deps update" ([#7983](https://github.com/RocketChat/Rocket.Chat/pull/7983))
 
+- [DOCS] Add native mobile app links into README and update button images ([#7909](https://github.com/RocketChat/Rocket.Chat/pull/7909) by [@rafaelks](https://github.com/rafaelks))
+
 - npm deps update ([#7969](https://github.com/RocketChat/Rocket.Chat/pull/7969))
 
+- Update BlackDuck URL ([#7941](https://github.com/RocketChat/Rocket.Chat/pull/7941))
+
+- Hide flex-tab close button ([#7894](https://github.com/RocketChat/Rocket.Chat/pull/7894) by [@karlprieb](https://github.com/karlprieb))
+
 - Added RocketChatLauncher (SaaS) ([#6606](https://github.com/RocketChat/Rocket.Chat/pull/6606) by [@designgurudotorg](https://github.com/designgurudotorg))
 
 - Develop sync ([#7866](https://github.com/RocketChat/Rocket.Chat/pull/7866))
@@ -8584,14 +9553,18 @@
 - [@AmShaegar13](https://github.com/AmShaegar13)
 - [@Darkneon](https://github.com/Darkneon)
 - [@HammyHavoc](https://github.com/HammyHavoc)
+- [@Kiran-Rao](https://github.com/Kiran-Rao)
+- [@Lawri-van-Buel](https://github.com/Lawri-van-Buel)
 - [@Pharserror](https://github.com/Pharserror)
 - [@RekkyRek](https://github.com/RekkyRek)
+- [@Rzeszow](https://github.com/Rzeszow)
 - [@TheReal1604](https://github.com/TheReal1604)
 - [@aditya19496](https://github.com/aditya19496)
 - [@alexbrazier](https://github.com/alexbrazier)
 - [@armand1m](https://github.com/armand1m)
 - [@arungalva](https://github.com/arungalva)
 - [@ashward](https://github.com/ashward)
+- [@astax-t](https://github.com/astax-t)
 - [@ccfang](https://github.com/ccfang)
 - [@cpitman](https://github.com/cpitman)
 - [@cyclops24](https://github.com/cyclops24)
@@ -8605,10 +9578,12 @@
 - [@icosamuel](https://github.com/icosamuel)
 - [@jasonjyu](https://github.com/jasonjyu)
 - [@joesitton](https://github.com/joesitton)
+- [@josiasds](https://github.com/josiasds)
 - [@jotafeldmann](https://github.com/jotafeldmann)
 - [@jwilkins](https://github.com/jwilkins)
 - [@karlprieb](https://github.com/karlprieb)
 - [@lindoelio](https://github.com/lindoelio)
+- [@luizbills](https://github.com/luizbills)
 - [@mastappl](https://github.com/mastappl)
 - [@mritunjaygoutam12](https://github.com/mritunjaygoutam12)
 - [@mrsimpson](https://github.com/mrsimpson)
@@ -8616,9 +9591,12 @@
 - [@peterlee0127](https://github.com/peterlee0127)
 - [@pierreozoux](https://github.com/pierreozoux)
 - [@pkgodara](https://github.com/pkgodara)
+- [@rafaelks](https://github.com/rafaelks)
 - [@ramrami](https://github.com/ramrami)
 - [@rmetzler](https://github.com/rmetzler)
 - [@robbyoconnor](https://github.com/robbyoconnor)
+- [@rodorgas](https://github.com/rodorgas)
+- [@ruKurz](https://github.com/ruKurz)
 - [@ryoshimizu](https://github.com/ryoshimizu)
 - [@sarbasamuel](https://github.com/sarbasamuel)
 - [@satyapramodh](https://github.com/satyapramodh)
@@ -8626,12 +9604,15 @@
 - [@selamanse](https://github.com/selamanse)
 - [@stalley](https://github.com/stalley)
 - [@stefanoverducci](https://github.com/stefanoverducci)
+- [@szluohua](https://github.com/szluohua)
 - [@thompsonemerson](https://github.com/thompsonemerson)
 - [@torgeirl](https://github.com/torgeirl)
 - [@vcapretz](https://github.com/vcapretz)
+- [@vikaskedia](https://github.com/vikaskedia)
 - [@vitor-nagao](https://github.com/vitor-nagao)
 - [@wesnspace](https://github.com/wesnspace)
 - [@wferris722](https://github.com/wferris722)
+- [@xenithorb](https://github.com/xenithorb)
 
 ### 👩‍💻👨‍💻 Core Team 🤓
 
@@ -8819,7 +9800,7 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 0.59.0
-`2017-10-18  ·  24 🎉  ·  116 🐛  ·  50 🔍  ·  44 👩‍💻👨‍💻`
+`2017-10-18  ·  25 🎉  ·  122 🐛  ·  51 🔍  ·  46 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `4.8.4`
@@ -8862,6 +9843,8 @@
 
 - Rocket.Chat UI Redesign ([#7643](https://github.com/RocketChat/Rocket.Chat/pull/7643))
 
+- Add unread options for direct messages ([#7658](https://github.com/RocketChat/Rocket.Chat/pull/7658))
+
 - Upgrade to meteor 1.5.2 ([#8073](https://github.com/RocketChat/Rocket.Chat/pull/8073))
 
 - Enable read only channel creation ([#8260](https://github.com/RocketChat/Rocket.Chat/pull/8260) by [@karlprieb](https://github.com/karlprieb))
@@ -8909,6 +9892,8 @@
 
 - Fixed function closure syntax allowing validation emails to be sent. ([#7758](https://github.com/RocketChat/Rocket.Chat/pull/7758) by [@snoozan](https://github.com/snoozan))
 
+- Csv importer: work with more problematic data ([#7456](https://github.com/RocketChat/Rocket.Chat/pull/7456) by [@reist](https://github.com/reist))
+
 - Fix avatar upload fail on Cordova app ([#7656](https://github.com/RocketChat/Rocket.Chat/pull/7656) by [@ccfang](https://github.com/ccfang))
 
 - Make link inside YouTube preview open in new tab ([#7679](https://github.com/RocketChat/Rocket.Chat/pull/7679) by [@1lann](https://github.com/1lann))
@@ -8917,6 +9902,16 @@
 
 - Example usage of unsubscribe.js ([#7673](https://github.com/RocketChat/Rocket.Chat/pull/7673) by [@Kiran-Rao](https://github.com/Kiran-Rao))
 
+- Wrong email subject when "All Messages" setting enabled ([#7639](https://github.com/RocketChat/Rocket.Chat/pull/7639))
+
+- Markdown noopener/noreferrer: use correct HTML attribute ([#7644](https://github.com/RocketChat/Rocket.Chat/pull/7644) by [@jangmarker](https://github.com/jangmarker))
+
+- Fix room load on first hit ([#7687](https://github.com/RocketChat/Rocket.Chat/pull/7687))
+
+- Wrong render of snippet’s name ([#7630](https://github.com/RocketChat/Rocket.Chat/pull/7630))
+
+- Fix messagebox growth ([#7629](https://github.com/RocketChat/Rocket.Chat/pull/7629))
+
 - sidebar paddings ([#7880](https://github.com/RocketChat/Rocket.Chat/pull/7880) by [@karlprieb](https://github.com/karlprieb))
 
 - Adds default search text padding for emoji search ([#7878](https://github.com/RocketChat/Rocket.Chat/pull/7878) by [@gdelavald](https://github.com/gdelavald))
@@ -9151,6 +10146,8 @@
 
 - [MOVE] Client folder rocketchat-emoji ([#7671](https://github.com/RocketChat/Rocket.Chat/pull/7671) by [@Kiran-Rao](https://github.com/Kiran-Rao))
 
+- Only use "File Uploaded" prefix on files ([#7652](https://github.com/RocketChat/Rocket.Chat/pull/7652))
+
 - Fix typo in generated URI ([#7661](https://github.com/RocketChat/Rocket.Chat/pull/7661) by [@Rohlik](https://github.com/Rohlik))
 
 - Bump version to 0.59.0-develop ([#7625](https://github.com/RocketChat/Rocket.Chat/pull/7625))
@@ -9240,6 +10237,7 @@
 - [@danischreiber](https://github.com/danischreiber)
 - [@gdelavald](https://github.com/gdelavald)
 - [@goiaba](https://github.com/goiaba)
+- [@jangmarker](https://github.com/jangmarker)
 - [@josiasds](https://github.com/josiasds)
 - [@karlprieb](https://github.com/karlprieb)
 - [@luizbills](https://github.com/luizbills)
@@ -9250,6 +10248,7 @@
 - [@pkgodara](https://github.com/pkgodara)
 - [@rafaelks](https://github.com/rafaelks)
 - [@rdebeasi](https://github.com/rdebeasi)
+- [@reist](https://github.com/reist)
 - [@ruKurz](https://github.com/ruKurz)
 - [@snoozan](https://github.com/snoozan)
 - [@szluohua](https://github.com/szluohua)
@@ -9268,12 +10267,26 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 0.58.4
-`2017-10-05`
+`2017-10-05  ·  3 🐛  ·  2 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `4.8.4`
 - NPM: `4.6.1`
 
+### 🐛 Bug fixes
+
+
+- Duplicate code in rest api letting in a few bugs with the rest api ([#8408](https://github.com/RocketChat/Rocket.Chat/pull/8408))
+
+- Slack import failing and not being able to be restarted ([#8390](https://github.com/RocketChat/Rocket.Chat/pull/8390))
+
+- Add needed dependency for snaps ([#8389](https://github.com/RocketChat/Rocket.Chat/pull/8389))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@graywolf336](https://github.com/graywolf336)
+
 # 0.58.2
 `2017-08-22  ·  1 🔍  ·  2 👩‍💻👨‍💻`
 
@@ -9323,7 +10336,7 @@
 - [@rodrigok](https://github.com/rodrigok)
 
 # 0.58.0
-`2017-08-16  ·  1 ️️️⚠️  ·  26 🎉  ·  33 🐛  ·  18 🔍  ·  32 👩‍💻👨‍💻`
+`2017-08-16  ·  1 ️️️⚠️  ·  27 🎉  ·  48 🐛  ·  19 🔍  ·  32 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `4.8.4`
@@ -9385,6 +10398,8 @@
 
 - Option to select unread count behavior ([#7477](https://github.com/RocketChat/Rocket.Chat/pull/7477))
 
+- Force use of MongoDB for spotlight queries ([#7311](https://github.com/RocketChat/Rocket.Chat/pull/7311))
+
 - Add healthchecks in OpenShift templates ([#7184](https://github.com/RocketChat/Rocket.Chat/pull/7184) by [@jfchevrette](https://github.com/jfchevrette))
 
 - Add unread options for direct messages ([#7658](https://github.com/RocketChat/Rocket.Chat/pull/7658))
@@ -9392,6 +10407,12 @@
 ### 🐛 Bug fixes
 
 
+- Slack import failing and not being able to be restarted ([#8390](https://github.com/RocketChat/Rocket.Chat/pull/8390))
+
+- Duplicate code in rest api letting in a few bugs with the rest api ([#8408](https://github.com/RocketChat/Rocket.Chat/pull/8408))
+
+- Add needed dependency for snaps ([#8389](https://github.com/RocketChat/Rocket.Chat/pull/8389))
+
 - Error when updating message with an empty attachment array ([#7624](https://github.com/RocketChat/Rocket.Chat/pull/7624))
 
 - Uploading an unknown file type erroring out ([#7623](https://github.com/RocketChat/Rocket.Chat/pull/7623))
@@ -9426,8 +10447,22 @@
 
 - Prevent new room status from playing when user status changes ([#7487](https://github.com/RocketChat/Rocket.Chat/pull/7487))
 
+- S3 uploads not working for custom URLs ([#7443](https://github.com/RocketChat/Rocket.Chat/pull/7443))
+
+- Fix Private Channel List Submit ([#7432](https://github.com/RocketChat/Rocket.Chat/pull/7432))
+
+- Fix file upload on Slack import ([#7469](https://github.com/RocketChat/Rocket.Chat/pull/7469))
+
+- Fix Unread Bar Disappearing ([#7403](https://github.com/RocketChat/Rocket.Chat/pull/7403))
+
+- Always set LDAP properties on login ([#7472](https://github.com/RocketChat/Rocket.Chat/pull/7472))
+
 - url click events in the cordova app open in external browser or not at all ([#7205](https://github.com/RocketChat/Rocket.Chat/pull/7205) by [@flaviogrossi](https://github.com/flaviogrossi))
 
+- Fix Emails in User Admin View ([#7431](https://github.com/RocketChat/Rocket.Chat/pull/7431))
+
+- Fix migration of avatars from version 0.57.0 ([#7428](https://github.com/RocketChat/Rocket.Chat/pull/7428))
+
 - sweetalert alignment on mobile ([#7404](https://github.com/RocketChat/Rocket.Chat/pull/7404) by [@karlprieb](https://github.com/karlprieb))
 
 - Sweet-Alert modal popup position on mobile devices ([#7376](https://github.com/RocketChat/Rocket.Chat/pull/7376) by [@Oliver84](https://github.com/Oliver84))
@@ -9440,8 +10475,18 @@
 
 - Fix Block Delete Message After (n) Minutes ([#7207](https://github.com/RocketChat/Rocket.Chat/pull/7207))
 
+- Fix jump to unread button ([#7320](https://github.com/RocketChat/Rocket.Chat/pull/7320))
+
+- Fix Secret Url ([#7321](https://github.com/RocketChat/Rocket.Chat/pull/7321))
+
 - Use I18n on "File Uploaded" ([#7199](https://github.com/RocketChat/Rocket.Chat/pull/7199))
 
+- "requirePasswordChange" property not being saved when set to false ([#7209](https://github.com/RocketChat/Rocket.Chat/pull/7209))
+
+- Fix oembed previews not being shown ([#7208](https://github.com/RocketChat/Rocket.Chat/pull/7208))
+
+- Fix editing others messages ([#7200](https://github.com/RocketChat/Rocket.Chat/pull/7200))
+
 - Fix error on image preview due to undefined description|title  ([#7187](https://github.com/RocketChat/Rocket.Chat/pull/7187))
 
 - Fix messagebox growth ([#7629](https://github.com/RocketChat/Rocket.Chat/pull/7629))
@@ -9494,6 +10539,8 @@
 
 - update meteor to 1.5.0 ([#7287](https://github.com/RocketChat/Rocket.Chat/pull/7287))
 
+- Fix the Zapier oAuth return url to the new one ([#7215](https://github.com/RocketChat/Rocket.Chat/pull/7215))
+
 - [New] Add instance id to response headers ([#7211](https://github.com/RocketChat/Rocket.Chat/pull/7211))
 
 - Only use "File Uploaded" prefix on files ([#7652](https://github.com/RocketChat/Rocket.Chat/pull/7652))
@@ -9652,7 +10699,7 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 0.57.0
-`2017-07-03  ·  1 ️️️⚠️  ·  10 🎉  ·  44 🐛  ·  30 🔍  ·  25 👩‍💻👨‍💻`
+`2017-07-03  ·  1 ️️️⚠️  ·  12 🎉  ·  45 🐛  ·  29 🔍  ·  25 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `4.8.2`
@@ -9682,6 +10729,10 @@
 
 - Make channel/group delete call answer to roomName ([#6857](https://github.com/RocketChat/Rocket.Chat/pull/6857) by [@reist](https://github.com/reist))
 
+- Show info about multiple instances at admin page ([#6953](https://github.com/RocketChat/Rocket.Chat/pull/6953))
+
+- Improve CI/Docker build/release ([#6938](https://github.com/RocketChat/Rocket.Chat/pull/6938))
+
 - Feature/delete any message permission ([#6919](https://github.com/RocketChat/Rocket.Chat/pull/6919) by [@phutchins](https://github.com/phutchins))
 
 - Force use of MongoDB for spotlight queries ([#7311](https://github.com/RocketChat/Rocket.Chat/pull/7311))
@@ -9749,6 +10800,8 @@
 
 - Use AWS Signature Version 4 signed URLs for uploads ([#6947](https://github.com/RocketChat/Rocket.Chat/pull/6947))
 
+- make channels.create API check for create-c ([#6968](https://github.com/RocketChat/Rocket.Chat/pull/6968) by [@reist](https://github.com/reist))
+
 - Bugs in `isUserFromParams` helper ([#6904](https://github.com/RocketChat/Rocket.Chat/pull/6904) by [@abrom](https://github.com/abrom))
 
 - Allow image insert from slack through slackbridge ([#6910](https://github.com/RocketChat/Rocket.Chat/pull/6910))
@@ -9827,18 +10880,16 @@
 
 - Convert WebRTC Package to Js ([#6775](https://github.com/RocketChat/Rocket.Chat/pull/6775))
 
+- [Fix] Error when trying to show preview of undefined filetype ([#6935](https://github.com/RocketChat/Rocket.Chat/pull/6935))
+
 - Remove missing CoffeeScript dependencies ([#7154](https://github.com/RocketChat/Rocket.Chat/pull/7154))
 
 - Switch logic of artifact name ([#7158](https://github.com/RocketChat/Rocket.Chat/pull/7158))
 
 - Fix the Zapier oAuth return url to the new one ([#7215](https://github.com/RocketChat/Rocket.Chat/pull/7215))
 
-- Fix the admin oauthApps view not working ([#7196](https://github.com/RocketChat/Rocket.Chat/pull/7196))
-
 - Fix forbidden error on setAvatar REST endpoint ([#7159](https://github.com/RocketChat/Rocket.Chat/pull/7159))
 
-- Fix the admin oauthApps view not working ([#7196](https://github.com/RocketChat/Rocket.Chat/pull/7196))
-
 - Fix mobile avatars ([#7177](https://github.com/RocketChat/Rocket.Chat/pull/7177))
 
 </details>
@@ -9875,7 +10926,7 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 0.56.0
-`2017-05-15  ·  11 🎉  ·  19 🐛  ·  19 🔍  ·  19 👩‍💻👨‍💻`
+`2017-05-15  ·  11 🎉  ·  21 🐛  ·  19 🔍  ·  19 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `4.8.2`
@@ -9937,6 +10988,10 @@
 
 - Fix Caddy by forcing go 1.7 as needed by one of caddy's dependencies ([#6721](https://github.com/RocketChat/Rocket.Chat/pull/6721))
 
+- emoji picker exception ([#6709](https://github.com/RocketChat/Rocket.Chat/pull/6709) by [@gdelavald](https://github.com/gdelavald))
+
+- Fix message types ([#6704](https://github.com/RocketChat/Rocket.Chat/pull/6704))
+
 - Users status on main menu always offline ([#6896](https://github.com/RocketChat/Rocket.Chat/pull/6896))
 
 - Not showing unread count on electron app’s icon ([#6923](https://github.com/RocketChat/Rocket.Chat/pull/6923))
@@ -10328,4 +11383,4 @@
 - [@graywolf336](https://github.com/graywolf336)
 - [@marceloschmidt](https://github.com/marceloschmidt)
 - [@rodrigok](https://github.com/rodrigok)
-- [@sampaiodiego](https://github.com/sampaiodiego)
+- [@sampaiodiego](https://github.com/sampaiodiego)
\ No newline at end of file
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index f5c360f56b86..77a6d9273776 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.1.0-rc.4"
+	"version": "3.1.0-rc.5"
 }
diff --git a/package.json b/package.json
index 76226bb395ca..7f5d7e3f0ac7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.1.0-rc.4",
+	"version": "3.1.0-rc.5",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

From 7ad3675ae541445868d1dd413299c6587eeab019 Mon Sep 17 00:00:00 2001
From: gabriellsh <40830821+gabriellsh@users.noreply.github.com>
Date: Tue, 31 Mar 2020 14:38:41 -0300
Subject: [PATCH 119/223] Regression: Collapsible elements didn't respect
 attachment parameter. (#16994)

---
 .../client/messageAttachment.html             |  6 +-
 .../client/messageAttachment.js               | 72 +++++++++++++++--
 app/oembed/client/baseWidget.js               |  8 ++
 app/oembed/client/index.js                    |  3 -
 app/oembed/client/oembedAudioWidget.html      |  7 +-
 app/oembed/client/oembedAudioWidget.js        |  7 --
 app/oembed/client/oembedFrameWidget.html      |  8 +-
 app/oembed/client/oembedFrameWidget.js        |  7 --
 app/oembed/client/oembedImageWidget.html      |  8 +-
 app/oembed/client/oembedImageWidget.js        |  3 -
 app/oembed/client/oembedUrlWidget.js          |  3 -
 app/oembed/client/oembedVideoWidget.html      |  8 +-
 app/oembed/client/oembedVideoWidget.js        |  4 -
 app/oembed/client/oembedYoutubeWidget.html    |  8 +-
 app/oembed/client/oembedYoutubeWidget.js      |  7 --
 app/ui-message/client/message.html            |  5 +-
 app/ui-message/client/message.js              | 77 +------------------
 app/ui-utils/client/index.js                  |  1 +
 app/ui-utils/client/lib/collapseArrow.html    |  7 ++
 app/ui-utils/client/lib/collapseArrow.js      | 31 ++++++++
 20 files changed, 135 insertions(+), 145 deletions(-)
 delete mode 100644 app/oembed/client/oembedAudioWidget.js
 delete mode 100644 app/oembed/client/oembedFrameWidget.js
 delete mode 100644 app/oembed/client/oembedYoutubeWidget.js
 create mode 100644 app/ui-utils/client/lib/collapseArrow.html
 create mode 100644 app/ui-utils/client/lib/collapseArrow.js

diff --git a/app/message-attachments/client/messageAttachment.html b/app/message-attachments/client/messageAttachment.html
index d21442f49ad7..73d753fa6792 100644
--- a/app/message-attachments/client/messageAttachment.html
+++ b/app/message-attachments/client/messageAttachment.html
@@ -62,11 +62,7 @@
 					{{else}}
 						{{title}}
 					{{/if}}
-					{{#if collapsed}}
-						<span class="collapse-switch icon-right-dir" data-index="{{index}}" data-collapsed="{{collapsed}}"></span>
-					{{else}}
-						<span class="collapse-switch icon-down-dir" data-index="{{index}}" data-collapsed="{{collapsed}}"></span>
-					{{/if}}
+					{{> collapseArrow collapsedMedia=collapsedMediaVar}}
 				</div>
 			{{/if}}
 
diff --git a/app/message-attachments/client/messageAttachment.js b/app/message-attachments/client/messageAttachment.js
index 5736a59f4cfc..5e299eb17ee6 100644
--- a/app/message-attachments/client/messageAttachment.js
+++ b/app/message-attachments/client/messageAttachment.js
@@ -1,8 +1,9 @@
+import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
 
 import { DateFormat } from '../../lib';
 import { getURL } from '../../utils/client';
-import { renderMessageBody } from '../../ui-utils';
+import { renderMessageBody, createCollapseable } from '../../ui-utils';
 
 const colors = {
 	good: '#35AC19',
@@ -10,6 +11,59 @@ const colors = {
 	danger: '#D30230',
 };
 
+async function renderPdfToCanvas(canvasId, pdfLink) {
+	const isSafari = /constructor/i.test(window.HTMLElement)
+		|| ((p) => p.toString() === '[object SafariRemoteNotification]')(!window.safari
+			|| (typeof window.safari !== 'undefined' && window.safari.pushNotification));
+
+	if (isSafari) {
+		const [, version] = /Version\/([0-9]+)/.exec(navigator.userAgent) || [null, 0];
+		if (version <= 12) {
+			return;
+		}
+	}
+
+	if (!pdfLink || !/\.pdf$/i.test(pdfLink)) {
+		return;
+	}
+	pdfLink = getURL(pdfLink);
+
+	const canvas = document.getElementById(canvasId);
+	if (!canvas) {
+		return;
+	}
+
+	const pdfjsLib = await import('pdfjs-dist');
+	pdfjsLib.GlobalWorkerOptions.workerSrc = `${ Meteor.absoluteUrl() }pdf.worker.min.js`;
+
+	const loader = document.getElementById(`js-loading-${ canvasId }`);
+
+	if (loader) {
+		loader.style.display = 'block';
+	}
+
+	const pdf = await pdfjsLib.getDocument(pdfLink);
+	const page = await pdf.getPage(1);
+	const scale = 0.5;
+	const viewport = page.getViewport(scale);
+	const context = canvas.getContext('2d');
+	canvas.height = viewport.height;
+	canvas.width = viewport.width;
+	await page.render({
+		canvasContext: context,
+		viewport,
+	}).promise;
+
+	if (loader) {
+		loader.style.display = 'none';
+	}
+
+	canvas.style.maxWidth = '-webkit-fill-available';
+	canvas.style.maxWidth = '-moz-available';
+	canvas.style.display = 'block';
+}
+
+createCollapseable(Template.messageAttachment, (instance) => (instance.data && (instance.data.collapsed || (instance.data.settings && instance.data.settings.collapseMediaByDefault))) || false);
 
 Template.messageAttachment.helpers({
 	parsedText() {
@@ -46,9 +100,6 @@ Template.messageAttachment.helpers({
 	color() {
 		return colors[this.color] || this.color;
 	},
-	collapsed() {
-		return this.collapsedMedia;
-	},
 	time() {
 		const messageDate = new Date(this.ts);
 		const today = new Date();
@@ -78,12 +129,21 @@ Template.messageAttachment.helpers({
 		if (
 			this.type === 'file'
 			&& this.title_link.endsWith('.pdf')
-			&& Template.parentData(2).msg.file
+			&& Template.parentData(1).msg.file
 		) {
-			this.fileId = Template.parentData(2).msg.file._id;
+			this.fileId = Template.parentData(1).msg.file._id;
 			return true;
 		}
 		return false;
 	},
 	getURL,
 });
+
+Template.messageAttachment.onRendered(function() {
+	const { msg } = Template.parentData(1);
+	this.autorun(() => {
+		if (msg && msg.file && msg.file.type === 'application/pdf' && !this.collapsedMedia.get()) {
+			Meteor.defer(() => { renderPdfToCanvas(msg.file._id, msg.attachments[0].title_link); });
+		}
+	});
+});
diff --git a/app/oembed/client/baseWidget.js b/app/oembed/client/baseWidget.js
index 004169306bd6..3f97eabf5dbe 100644
--- a/app/oembed/client/baseWidget.js
+++ b/app/oembed/client/baseWidget.js
@@ -1,7 +1,15 @@
 import { Template } from 'meteor/templating';
 
+import { createCollapseable } from '../../ui-utils';
+
+createCollapseable(Template.oembedBaseWidget, (instance) => instance.data.settings.collapseMediaByDefault || false);
+
 Template.oembedBaseWidget.helpers({
 	template() {
+		const { collapsedMedia } = Template.instance();
+		this.collapsedMediaVar = function() { return collapsedMedia; };
+		this.collapsed = collapsedMedia.get();
+
 		let contentType;
 		if (this.headers) {
 			contentType = this.headers.contentType;
diff --git a/app/oembed/client/index.js b/app/oembed/client/index.js
index c5b326243e89..477fc69b0bf8 100644
--- a/app/oembed/client/index.js
+++ b/app/oembed/client/index.js
@@ -3,12 +3,9 @@ import './baseWidget';
 import './oembedImageWidget.html';
 import './oembedImageWidget';
 import './oembedAudioWidget.html';
-import './oembedAudioWidget';
 import './oembedVideoWidget.html';
 import './oembedVideoWidget';
 import './oembedYoutubeWidget.html';
-import './oembedYoutubeWidget';
 import './oembedUrlWidget.html';
 import './oembedUrlWidget';
 import './oembedFrameWidget.html';
-import './oembedFrameWidget';
diff --git a/app/oembed/client/oembedAudioWidget.html b/app/oembed/client/oembedAudioWidget.html
index 62c1924b4491..1a221a20bef9 100644
--- a/app/oembed/client/oembedAudioWidget.html
+++ b/app/oembed/client/oembedAudioWidget.html
@@ -1,9 +1,8 @@
 <template name="oembedAudioWidget">
 	<a href="{{url}}" rel="noopener noreferrer" target="_blank">
 		{{#if parsedUrl}}
-			{{#if collapsed}}
-				<span class="collapse-switch icon-right-dir" data-index="{{index}}" data-collapsed="{{collapsed}}"></span>
-			{{else}}
+			{{> collapseArrow collapsedMedia=collapsedMediaVar}}
+			{{#unless collapsed}}
 				<span class="collapse-switch icon-down-dir" data-index="{{index}}" data-collapsed="{{collapsed}}"></span>
 				<blockquote class="message-oembed background-transparent-darker-before">
 					<audio controls>
@@ -11,7 +10,7 @@
 						Your browser does not support the audio element.
 					</audio>
 				</blockquote>
-			{{/if}}
+			{{/unless}}
 		{{/if}}
 	</a>
 </template>
diff --git a/app/oembed/client/oembedAudioWidget.js b/app/oembed/client/oembedAudioWidget.js
deleted file mode 100644
index 055c18f280e4..000000000000
--- a/app/oembed/client/oembedAudioWidget.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Template } from 'meteor/templating';
-
-Template.oembedAudioWidget.helpers({
-	collapsed() {
-		return this.collapsedMedia;
-	},
-});
diff --git a/app/oembed/client/oembedFrameWidget.html b/app/oembed/client/oembedFrameWidget.html
index c11a82b79b38..964a76ec536e 100644
--- a/app/oembed/client/oembedFrameWidget.html
+++ b/app/oembed/client/oembedFrameWidget.html
@@ -18,15 +18,13 @@
 				<a href="{{meta.oembedUrl}}" rel="noopener noreferrer" target="_blank">{{meta.oembedTitle}}</a>
 			{{/if}}
 		{{/if}}
-		{{#if collapsed}}
-			<span class="collapse-switch icon-right-dir" data-index="{{index}}" data-collapsed="{{collapsed}}"></span><br/>
-		{{else}}
-			<span class="collapse-switch icon-down-dir" data-index="{{index}}" data-collapsed="{{collapsed}}"></span><br/>
+		{{> collapseArrow collapsedMedia=collapsedMediaVar}} <br>
+		{{#unless collapsed}}
 			{{#if meta.oembedDescription}}
 				<p>{{meta.oembedDescription}}</p>
 			{{/if}}
 			{{{meta.oembedHtml}}}
-		{{/if}}
+		{{/unless}}
 	</blockquote>
 {{/if}}
 </template>
diff --git a/app/oembed/client/oembedFrameWidget.js b/app/oembed/client/oembedFrameWidget.js
deleted file mode 100644
index dd488fa1cbb8..000000000000
--- a/app/oembed/client/oembedFrameWidget.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Template } from 'meteor/templating';
-
-Template.oembedFrameWidget.helpers({
-	collapsed() {
-		return this.collapsedMedia;
-	},
-});
diff --git a/app/oembed/client/oembedImageWidget.html b/app/oembed/client/oembedImageWidget.html
index 4d91c6d9d793..3e01ca1ea069 100644
--- a/app/oembed/client/oembedImageWidget.html
+++ b/app/oembed/client/oembedImageWidget.html
@@ -1,9 +1,7 @@
 <template name="oembedImageWidget">
 	{{#if parsedUrl}}
-		{{#if collapsed}}
-			<span class="collapse-switch icon-right-dir" data-index="{{index}}" data-collapsed="{{collapsed}}"></span>
-		{{else}}
-			<span class="collapse-switch icon-down-dir" data-index="{{index}}" data-collapsed="{{collapsed}}"></span>
+		{{> collapseArrow collapsedMedia=collapsedMediaVar}} <br>
+		{{#unless collapsed}}
 			{{#if loadImage}}
 				<figure>
 					<div class="inline-image" style="background-image: url('{{url}}');">
@@ -16,6 +14,6 @@
 					<div>click to load</div>
 				</div>
 			{{/if}}
-		{{/if}}
+		{{/unless}}
 	{{/if}}
 </template>
diff --git a/app/oembed/client/oembedImageWidget.js b/app/oembed/client/oembedImageWidget.js
index c9ca4c235825..c48812a903d8 100644
--- a/app/oembed/client/oembedImageWidget.js
+++ b/app/oembed/client/oembedImageWidget.js
@@ -13,7 +13,4 @@ Template.oembedImageWidget.helpers({
 		}
 		return true;
 	},
-	collapsed() {
-		return this.collapsedMedia;
-	},
 });
diff --git a/app/oembed/client/oembedUrlWidget.js b/app/oembed/client/oembedUrlWidget.js
index 7ae45dc59c7c..66db81e25af7 100644
--- a/app/oembed/client/oembedUrlWidget.js
+++ b/app/oembed/client/oembedUrlWidget.js
@@ -60,7 +60,4 @@ Template.oembedUrlWidget.helpers({
 	show() {
 		return (getDescription(this) != null) || (getTitle(this) != null);
 	},
-	collapsed() {
-		return this.collapsedMedia;
-	},
 });
diff --git a/app/oembed/client/oembedVideoWidget.html b/app/oembed/client/oembedVideoWidget.html
index 7cbc8e658c78..7f26db74e5ae 100644
--- a/app/oembed/client/oembedVideoWidget.html
+++ b/app/oembed/client/oembedVideoWidget.html
@@ -3,15 +3,13 @@
 	<blockquote class="message-oembed background-transparent-darker-before">
 		<div><a href="{{url}}" rel="noopener noreferrer" target="_blank">{{parsedUrl.host}}</a></div>
 		<span>{{title}}</span>
-		{{#if collapsed}}
-			<span class="collapse-switch icon-right-dir" data-index="{{index}}" data-collapsed="{{collapsed}}"></span>
-		{{else}}
-			<span class="collapse-switch icon-down-dir" data-index="{{index}}" data-collapsed="{{collapsed}}"></span><br/>
+		{{> collapseArrow collapsedMedia=collapsedMediaVar}} <br>
+		{{#unless collapsed}}
 			<video controls class="inline-video">
 				<source src="{{url}}" rel="noopener noreferrer" type="{{contentType}}">
 				Your browser does not support the video element.
 			</video>
-		{{/if}}
+		{{/unless}}
 	</blockquote>
 {{/if}}
 </template>
diff --git a/app/oembed/client/oembedVideoWidget.js b/app/oembed/client/oembedVideoWidget.js
index 03df03333fa4..09934610d9f8 100644
--- a/app/oembed/client/oembedVideoWidget.js
+++ b/app/oembed/client/oembedVideoWidget.js
@@ -25,8 +25,4 @@ Template.oembedVideoWidget.helpers({
 	title() {
 		return getTitle(this);
 	},
-	collapsed() {
-		return this.collapsedMedia;
-	},
-
 });
diff --git a/app/oembed/client/oembedYoutubeWidget.html b/app/oembed/client/oembedYoutubeWidget.html
index a30b1c1eb2d0..2c00c8f3884f 100644
--- a/app/oembed/client/oembedYoutubeWidget.html
+++ b/app/oembed/client/oembedYoutubeWidget.html
@@ -2,13 +2,11 @@
 	{{#if parsedUrl}}
 		<blockquote class="message-oembed background-transparent-darker-before">
 			<a href="{{url}}" rel="noopener noreferrer" target="_blank">{{parsedUrl.host}}</a>
-			{{#if collapsed}}
-				<span class="collapse-switch icon-right-dir" data-index="{{index}}" data-collapsed="{{collapsed}}"></span><br>
-			{{else}}
-				<span class="collapse-switch icon-down-dir" data-index="{{index}}" data-collapsed="{{collapsed}}"></span><br>
+			{{> collapseArrow collapsedMedia=collapsedMediaVar}} <br>
+			{{#unless collapsed}}
 				<iframe width="270" height="200" src="{{meta.twitterPlayer}}" rel="noopener noreferrer" frameborder="0" allowfullscreen></iframe><br>
 				{{{meta.description}}}
-			{{/if}}
+			{{/unless}}
 		</blockquote>
 	{{/if}}
 </template>
diff --git a/app/oembed/client/oembedYoutubeWidget.js b/app/oembed/client/oembedYoutubeWidget.js
deleted file mode 100644
index ce1040c1c268..000000000000
--- a/app/oembed/client/oembedYoutubeWidget.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Template } from 'meteor/templating';
-
-Template.oembedYoutubeWidget.helpers({
-	collapsed() {
-		return this.collapsedMedia;
-	},
-});
diff --git a/app/ui-message/client/message.html b/app/ui-message/client/message.html
index f9bdbcf4648b..a69ad4ca7a71 100644
--- a/app/ui-message/client/message.html
+++ b/app/ui-message/client/message.html
@@ -93,15 +93,16 @@
 			{{#if hasOembed}}
 				{{#each msg.urls}}
 					{{injectMessage . ../msg}}
+					{{injectSettings . ../settings}}
 					{{injectIndex . @index}}
-					{{> oembedBaseWidget (injectCollapsedMedia .)}}
+					{{> oembedBaseWidget}}
 				{{/each}}
 			{{/if}}
 			{{#each msg.attachments}}
 				{{injectMessage . ../msg}}
 				{{injectSettings . ../settings}}
 				{{injectIndex . @index}}
-				{{> messageAttachment (injectCollapsedMedia .)}}
+				{{> messageAttachment}}
 			{{/each}}
 
 			{{#if msg.drid}}
diff --git a/app/ui-message/client/message.js b/app/ui-message/client/message.js
index f8bf9a58036f..628534eb07d4 100644
--- a/app/ui-message/client/message.js
+++ b/app/ui-message/client/message.js
@@ -4,7 +4,6 @@ import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
-import { ReactiveVar } from 'meteor/reactive-var';
 
 import { timeAgo, formatDateAndTime } from '../../lib/client/lib/formatDate';
 import { DateFormat } from '../../lib/client';
@@ -12,64 +11,12 @@ import { renderMessageBody, MessageTypes, MessageAction, call, normalizeThreadMe
 import { RoomRoles, UserRoles, Roles, Messages } from '../../models/client';
 import { callbacks } from '../../callbacks/client';
 import { Markdown } from '../../markdown/client';
-import { t, roomTypes, getURL } from '../../utils';
+import { t, roomTypes } from '../../utils';
 import { upsertMessage } from '../../ui-utils/client/lib/RoomHistoryManager';
 import './message.html';
 import './messageThread.html';
 import { AutoTranslate } from '../../autotranslate/client';
 
-async function renderPdfToCanvas(canvasId, pdfLink) {
-	const isSafari = /constructor/i.test(window.HTMLElement)
-		|| ((p) => p.toString() === '[object SafariRemoteNotification]')(!window.safari
-			|| (typeof window.safari !== 'undefined' && window.safari.pushNotification));
-
-	if (isSafari) {
-		const [, version] = /Version\/([0-9]+)/.exec(navigator.userAgent) || [null, 0];
-		if (version <= 12) {
-			return;
-		}
-	}
-
-	if (!pdfLink || !/\.pdf$/i.test(pdfLink)) {
-		return;
-	}
-	pdfLink = getURL(pdfLink);
-
-	const canvas = document.getElementById(canvasId);
-	if (!canvas) {
-		return;
-	}
-
-	const pdfjsLib = await import('pdfjs-dist');
-	pdfjsLib.GlobalWorkerOptions.workerSrc = `${ Meteor.absoluteUrl() }pdf.worker.min.js`;
-
-	const loader = document.getElementById(`js-loading-${ canvasId }`);
-
-	if (loader) {
-		loader.style.display = 'block';
-	}
-
-	const pdf = await pdfjsLib.getDocument(pdfLink);
-	const page = await pdf.getPage(1);
-	const scale = 0.5;
-	const viewport = page.getViewport(scale);
-	const context = canvas.getContext('2d');
-	canvas.height = viewport.height;
-	canvas.width = viewport.width;
-	await page.render({
-		canvasContext: context,
-		viewport,
-	}).promise;
-
-	if (loader) {
-		loader.style.display = 'none';
-	}
-
-	canvas.style.maxWidth = '-webkit-fill-available';
-	canvas.style.maxWidth = '-moz-available';
-	canvas.style.display = 'block';
-}
-
 const renderBody = (msg, settings) => {
 	const isSystemMessage = MessageTypes.isSystemMessage(msg);
 	const messageType = MessageTypes.getType(msg) || {};
@@ -95,12 +42,6 @@ const renderBody = (msg, settings) => {
 	return msg;
 };
 
-Template.message.events({
-	'click .collapse-switch'(e, instance) {
-		instance.collapsedMedia.set(!instance.collapsedMedia.get());
-	},
-});
-
 Template.message.helpers({
 	body() {
 		const { msg, settings } = this;
@@ -377,11 +318,6 @@ Template.message.helpers({
 	injectSettings(data, settings) {
 		data.settings = settings;
 	},
-	injectCollapsedMedia(data) {
-		const collapsedMedia = Template.instance().collapsedMedia.get();
-		Object.assign(data, { collapsedMedia });
-		return data;
-	},
 	channelName() {
 		const { subscription } = this;
 		// const subscription = Subscriptions.findOne({ rid: this.rid });
@@ -436,9 +372,6 @@ Template.message.helpers({
 			return 'collapsed';
 		}
 	},
-	collapsedMedia() {
-		return Template.instance().collapsedMedia.get();
-	},
 	collapseSwitchClass() {
 		const { msg: { collapsed = true } } = this;
 		return collapsed ? 'icon-right-dir' : 'icon-down-dir';
@@ -485,7 +418,6 @@ const findParentMessage = (() => {
 
 Template.message.onCreated(function() {
 	const { msg, shouldCollapseReplies } = Template.currentData();
-	this.collapsedMedia = new ReactiveVar(this.data.settings.collapseMediaByDefault === true);
 	if (shouldCollapseReplies && msg.tmid && !msg.threadMsg) {
 		findParentMessage(msg.tmid);
 	}
@@ -572,13 +504,10 @@ const isSequential = (currentNode, previousNode, forceDate, period, showDateSepa
 	return false;
 };
 
-const processSequentials = ({ index, currentNode, settings, forceDate, showDateSeparator = true, groupable, msg, shouldCollapseReplies, collapsedMedia }) => {
+const processSequentials = ({ index, currentNode, settings, forceDate, showDateSeparator = true, groupable, shouldCollapseReplies }) => {
 	if (!showDateSeparator && !groupable) {
 		return;
 	}
-	if (msg.file && msg.file.type === 'application/pdf' && !collapsedMedia) {
-		Meteor.defer(() => { renderPdfToCanvas(msg.file._id, msg.attachments[0].title_link); });
-	}
 	// const currentDataset = currentNode.dataset;
 	const previousNode = (index === undefined || index > 0) && getPreviousSentMessage(currentNode);
 	const nextNode = currentNode.nextElementSibling;
@@ -612,5 +541,5 @@ const processSequentials = ({ index, currentNode, settings, forceDate, showDateS
 
 Template.message.onRendered(function() {
 	const currentNode = this.firstNode;
-	this.autorun(() => processSequentials({ currentNode, ...Template.currentData(), collapsedMedia: this.collapsedMedia.get() }));
+	this.autorun(() => processSequentials({ currentNode, ...Template.currentData() }));
 });
diff --git a/app/ui-utils/client/index.js b/app/ui-utils/client/index.js
index 813392fcf961..163a9fa6e0bb 100644
--- a/app/ui-utils/client/index.js
+++ b/app/ui-utils/client/index.js
@@ -28,3 +28,4 @@ export { openRoom } from './lib/openRoom';
 export * from './lib/rtl';
 export * from './lib/keyCodes';
 export * from './lib/prependReplies';
+export * from './lib/collapseArrow';
diff --git a/app/ui-utils/client/lib/collapseArrow.html b/app/ui-utils/client/lib/collapseArrow.html
new file mode 100644
index 000000000000..db848b16ae2c
--- /dev/null
+++ b/app/ui-utils/client/lib/collapseArrow.html
@@ -0,0 +1,7 @@
+<template name='collapseArrow'>
+    {{#if collapsed}}
+        <span class="collapse-switch icon-right-dir" data-index="{{index}}" data-collapsed="{{collapsed}}"></span>
+    {{else}}
+        <span class="collapse-switch icon-down-dir" data-index="{{index}}" data-collapsed="{{collapsed}}"></span>
+    {{/if}}
+</template>
\ No newline at end of file
diff --git a/app/ui-utils/client/lib/collapseArrow.js b/app/ui-utils/client/lib/collapseArrow.js
new file mode 100644
index 000000000000..418a36eafdf4
--- /dev/null
+++ b/app/ui-utils/client/lib/collapseArrow.js
@@ -0,0 +1,31 @@
+import { Template } from 'meteor/templating';
+import { ReactiveVar } from 'meteor/reactive-var';
+
+import './collapseArrow.html';
+
+export const createCollapseable = (template, getInicialFromInstance = () => false) => {
+	template.onCreated(function() {
+		this.collapsedMedia = new ReactiveVar(getInicialFromInstance(Template.instance()));
+	});
+	template.helpers({
+		collapsed() {
+			return Template.instance().collapsedMedia.get();
+		},
+		collapsedMediaVar() {
+			return Template.instance().collapsedMedia;
+		},
+	});
+};
+
+Template.collapseArrow.events({
+	'click .collapse-switch'(e, i) {
+		e.preventDefault();
+		i.data.collapsedMedia.set(!i.data.collapsedMedia.get());
+	},
+});
+
+Template.collapseArrow.helpers({
+	collapsed() {
+		return this.collapsedMedia.get();
+	},
+});

From 4a1dedc88ecefa8ef7f9e9e59240a3e67d05b6b1 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Tue, 31 Mar 2020 18:52:34 -0300
Subject: [PATCH 120/223] Regression: Block users was not possible for 1:1 DMs
 (#17105)

---
 app/lib/lib/roomTypes/direct.js     | 11 ++++++++---
 app/lib/server/methods/blockUser.js |  8 ++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/lib/lib/roomTypes/direct.js b/app/lib/lib/roomTypes/direct.js
index 01b6f962f444..1a36927ba561 100644
--- a/app/lib/lib/roomTypes/direct.js
+++ b/app/lib/lib/roomTypes/direct.js
@@ -3,7 +3,7 @@ import { Session } from 'meteor/session';
 
 import { ChatRoom, Subscriptions } from '../../../models';
 import { openRoom } from '../../../ui-utils';
-import { getUserPreference, RoomTypeConfig, RoomTypeRouteConfig, RoomSettingsEnum, UiTextContext } from '../../../utils';
+import { getUserPreference, RoomTypeConfig, RoomTypeRouteConfig, RoomSettingsEnum, RoomMemberActions, UiTextContext } from '../../../utils';
 import { hasPermission, hasAtLeastOnePermission } from '../../../authorization';
 import { settings } from '../../../settings';
 import { getUserAvatarURL } from '../../../utils/lib/getUserAvatarURL';
@@ -131,8 +131,13 @@ export class DirectMessageRoomType extends RoomTypeConfig {
 		}
 	}
 
-	allowMemberAction(/* room, action */) {
-		return false;
+	allowMemberAction(room, action) {
+		switch (action) {
+			case RoomMemberActions.BLOCK:
+				return !this.isGroupChat(room);
+			default:
+				return false;
+		}
 	}
 
 	enableMembersListProfile() {
diff --git a/app/lib/server/methods/blockUser.js b/app/lib/server/methods/blockUser.js
index aeb622e65694..f9e4bb4c54d2 100644
--- a/app/lib/server/methods/blockUser.js
+++ b/app/lib/server/methods/blockUser.js
@@ -2,6 +2,8 @@ import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 
 import { Subscriptions } from '../../../models';
+import { roomTypes, RoomMemberActions } from '../../../utils/server';
+import { Rooms } from '../../../models/server';
 
 Meteor.methods({
 	blockUser({ rid, blocked }) {
@@ -12,6 +14,12 @@ Meteor.methods({
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'blockUser' });
 		}
 
+		const room = Rooms.findOne({ _id: rid });
+
+		if (!roomTypes.getConfig(room.t).allowMemberAction(room, RoomMemberActions.BLOCK)) {
+			throw new Meteor.Error('error-invalid-room', 'Invalid room', { method: 'blockUser' });
+		}
+
 		const subscription = Subscriptions.findOneByRoomIdAndUserId(rid, Meteor.userId());
 		const subscription2 = Subscriptions.findOneByRoomIdAndUserId(rid, blocked);
 

From ca85376e8408b7030d1b6bad0ba0878d09637318 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 31 Mar 2020 20:27:22 -0300
Subject: [PATCH 121/223] Regression: Files were been deleted when deleting
 users as last members of private rooms (#17111)

---
 app/file-upload/server/lib/FileUpload.js | 3 +++
 app/lib/server/functions/deleteUser.js   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/file-upload/server/lib/FileUpload.js b/app/file-upload/server/lib/FileUpload.js
index fafd92f034b1..3d006b14aa0d 100644
--- a/app/file-upload/server/lib/FileUpload.js
+++ b/app/file-upload/server/lib/FileUpload.js
@@ -405,6 +405,9 @@ export const FileUpload = {
 	},
 
 	removeFilesByRoomId(rid) {
+		if (typeof rid !== 'string' || rid.trim().length === 0) {
+			return;
+		}
 		Messages.find({
 			rid,
 			'file._id': {
diff --git a/app/lib/server/functions/deleteUser.js b/app/lib/server/functions/deleteUser.js
index 1038c6783d46..ef39206c74bd 100644
--- a/app/lib/server/functions/deleteUser.js
+++ b/app/lib/server/functions/deleteUser.js
@@ -101,7 +101,7 @@ export const deleteUser = function(userId) {
 
 			// Remove non-channel rooms with only 1 user (the one being deleted)
 			return roomData.t !== 'c' && roomData.subscribers === 1;
-		}).map(({ _id }) => _id);
+		}).map(({ rid }) => rid);
 
 		Rooms.find1On1ByUserId(user._id, { fields: { _id: 1 } }).forEach(({ _id }) => roomIds.push(_id));
 

From f4f4ff9bf13e97d54fc6db45ec73d9b8931627cd Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Tue, 31 Mar 2020 20:36:29 -0300
Subject: [PATCH 122/223] Bump version to 3.1.0-rc.6

---
 .docker/Dockerfile.rhel   |  2 +-
 .github/history.json      | 40 +++++++++++++++++++++++++++++++++++++++
 HISTORY.md                | 21 ++++++++++++++++++++
 app/utils/rocketchat.info |  2 +-
 package.json              |  2 +-
 5 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index bd0adbbbda24..cf38e2d5fe94 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.1.0-rc.5
+ENV RC_VERSION 3.1.0-rc.6
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index 38b2712206e6..669163f1f675 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -41679,6 +41679,46 @@
           ]
         }
       ]
+    },
+    "3.1.0-rc.6": {
+      "node_version": "12.16.1",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "17111",
+          "title": "Regression: Files were been deleted when deleting users as last members of private rooms",
+          "userLogin": "rodrigok",
+          "milestone": "3.1.0",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "17105",
+          "title": "Regression: Block users was not possible for 1:1 DMs",
+          "userLogin": "ggazzo",
+          "milestone": "3.1.0",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "16994",
+          "title": "Regression: Collapsible elements didn't respect attachment parameter.",
+          "userLogin": "gabriellsh",
+          "milestone": "3.1.0",
+          "contributors": [
+            "gabriellsh",
+            "web-flow",
+            "ggazzo"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/HISTORY.md b/HISTORY.md
index bcdf18a0766b..0b94b78ef297 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,6 +1,27 @@
 
 # 3.1.0 (Under Release Candidate Process)
 
+## 3.1.0-rc.6
+`2020-03-31  ·  3 🔍  ·  3 👩‍💻👨‍💻`
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Regression: Files were been deleted when deleting users as last members of private rooms ([#17111](https://github.com/RocketChat/Rocket.Chat/pull/17111))
+
+- Regression: Block users was not possible for 1:1 DMs ([#17105](https://github.com/RocketChat/Rocket.Chat/pull/17105))
+
+- Regression: Collapsible elements didn't respect attachment parameter. ([#16994](https://github.com/RocketChat/Rocket.Chat/pull/16994))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@gabriellsh](https://github.com/gabriellsh)
+- [@ggazzo](https://github.com/ggazzo)
+- [@rodrigok](https://github.com/rodrigok)
+
 ## 3.1.0-rc.5
 `2020-03-31  ·  1 🐛  ·  1 👩‍💻👨‍💻`
 
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index 77a6d9273776..d857506287d8 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.1.0-rc.5"
+	"version": "3.1.0-rc.6"
 }
diff --git a/package.json b/package.json
index 7f5d7e3f0ac7..adb4b214b20d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.1.0-rc.5",
+	"version": "3.1.0-rc.6",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

From fd098226d41e10443a16f470a6b9826ca1705c92 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Tue, 31 Mar 2020 21:32:11 -0300
Subject: [PATCH 123/223] [NEW] Sort List, View Mode and Group by revamp
 (#17103)

---
 app/ui-sidenav/client/SortList.js          | 131 +++++++++++++++++++++
 app/ui-sidenav/client/index.js             |   2 -
 app/ui-sidenav/client/sidebarHeader.js     | 101 ++--------------
 app/ui-sidenav/client/sortlist.html        |  65 ----------
 app/ui-sidenav/client/sortlist.js          |  52 --------
 client/routes.js                           |   2 +-
 packages/rocketchat-i18n/i18n/en.i18n.json |   2 +
 7 files changed, 143 insertions(+), 212 deletions(-)
 create mode 100644 app/ui-sidenav/client/SortList.js
 delete mode 100644 app/ui-sidenav/client/sortlist.html
 delete mode 100644 app/ui-sidenav/client/sortlist.js

diff --git a/app/ui-sidenav/client/SortList.js b/app/ui-sidenav/client/SortList.js
new file mode 100644
index 000000000000..bb9e874e2361
--- /dev/null
+++ b/app/ui-sidenav/client/SortList.js
@@ -0,0 +1,131 @@
+import React, { useCallback } from 'react';
+import { Icon, ToggleSwitch, RadioButton, Box, Flex, Margins } from '@rocket.chat/fuselage';
+
+
+import { useTranslation } from '../../../client/contexts/TranslationContext';
+import { useUserPreference } from '../../../client/contexts/UserContext';
+import { useMethod } from '../../../client/contexts/ServerContext';
+
+function SortListItem({ text, icon, input }) {
+	return <Flex.Container>
+		<Box is='li'>
+			<Flex.Container>
+				<Box is='label' componentClassName='rc-popover__label' style={{ width: '100%' }}>
+					<Flex.Item grow={0}>
+						<Box componentClassName='rc-popover__icon'><Icon name={icon} size={20}/></Box>
+					</Flex.Item>
+					<Margins inline='x8'>
+						<Flex.Item grow={1}>
+							<Box is='span' textStyle='p2'>{text}</Box>
+						</Flex.Item>
+					</Margins>
+					<Flex.Item grow={0}>
+						{input}
+					</Flex.Item>
+				</Box>
+			</Flex.Container>
+		</Box>
+	</Flex.Container>;
+}
+const style = {
+	textTransform: 'uppercase',
+};
+export function SortList() {
+	return <>
+		<div className='rc-popover__column'>
+			<SortModeList/>
+			<ViewModeList/>
+			<GroupingList/>
+		</div>
+	</>;
+}
+
+export function SortModeList() {
+	const t = useTranslation();
+	const saveUserPreferences = useMethod('saveUserPreferences');
+	const sidebarSortBy = useUserPreference('sidebarSortby', 'alphabetical');
+
+	const handleChange = (value) => () => saveUserPreferences({ sidebarSortby: value });
+
+	const setToAlphabetical = useCallback(handleChange('alphabetical'), []);
+	const setToActivity = useCallback(handleChange('activity'), []);
+
+	return <>
+		<Margins block='x8'>
+			<Box is='p' style={style} textStyle='micro'>{t('Sort_By')}</Box>
+		</Margins>
+		<ul className='rc-popover__list'>
+			<Margins block='x8'>
+				<SortListItem icon={'sort'} text={t('Alphabetical')} input={<RadioButton name='sidebarSortby' onChange={setToAlphabetical} checked={sidebarSortBy === 'alphabetical'} />} />
+				<SortListItem icon={'clock'} text={t('Activity')} input={<RadioButton name='sidebarSortby' onChange={setToActivity} checked={sidebarSortBy === 'activity'} />} />
+			</Margins>
+		</ul>
+	</>;
+}
+
+
+function ViewModeList() {
+	const t = useTranslation();
+
+	const saveUserPreferences = useMethod('saveUserPreferences');
+
+	const handleChange = (value) => () => saveUserPreferences({ sidebarViewMode: value });
+
+	const sidebarViewMode = useUserPreference('sidebarViewMode', 'extended');
+	const sidebarHideAvatar = useUserPreference('sidebarHideAvatar', false);
+
+	const setToExtended = useCallback(handleChange('extended'), []);
+	const setToMedium = useCallback(handleChange('medium'), []);
+	const setToCondensed = useCallback(handleChange('condensed'), []);
+
+	const handleChangeSidebarHideAvatar = useCallback(() => saveUserPreferences({ sidebarHideAvatar: !sidebarHideAvatar }), [sidebarHideAvatar]);
+
+	return <>
+		<Margins block='x8'>
+			<Box is='p' style={style} textStyle='micro'>{t('View_mode')}</Box>
+		</Margins>
+		<ul className='rc-popover__list'>
+			<Margins block='x8'>
+				<SortListItem icon={'th-list'} text={t('Extended')} input={<RadioButton onChange={setToExtended} name='sidebarViewMode' value='extended' checked={sidebarViewMode === 'extended'} />} />
+				<SortListItem icon={'list'} text={t('Medium')} input={<RadioButton onChange={setToMedium} name='sidebarViewMode' value='medium' checked={sidebarViewMode === 'medium'} />} />
+				<SortListItem icon={'list-alt'} text={t('Condensed')} input={<RadioButton onChange={setToCondensed} name='sidebarViewMode' value='condensed' checked={sidebarViewMode === 'condensed'} />} />
+				<SortListItem icon={'user-rounded'} text={t('Hide_Avatars')} input={<ToggleSwitch onChange={handleChangeSidebarHideAvatar} name='sidebarHideAvatar' checked={sidebarHideAvatar} />} />
+			</Margins>
+		</ul>
+	</>;
+}
+
+
+function GroupingList() {
+	const sidebarShowDiscussion = useUserPreference('sidebarShowDiscussion');
+	const sidebarGroupByType = useUserPreference('sidebarGroupByType');
+	const sidebarShowFavorites = useUserPreference('sidebarShowFavorites');
+	const sidebarShowUnread = useUserPreference('sidebarShowUnread');
+
+	const saveUserPreferences = useMethod('saveUserPreferences');
+
+	const handleChange = (key, value) => () => saveUserPreferences({ [key]: value });
+
+	const handleChangeShowDicussion = useCallback(handleChange('sidebarShowDiscussion', !sidebarShowDiscussion), [sidebarShowDiscussion]);
+	const handleChangeGroupByType = useCallback(handleChange('sidebarGroupByType', !sidebarGroupByType), [sidebarGroupByType]);
+	const handleChangeShoFavorite = useCallback(handleChange('sidebarShowFavorites', !sidebarShowFavorites), [sidebarShowFavorites]);
+	const handleChangeShowUnread = useCallback(handleChange('sidebarShowUnread', !sidebarShowUnread), [sidebarShowUnread]);
+
+
+	const t = useTranslation();
+	return <>
+		<Margins block='x8'>
+			<Box is='p' style={style} textStyle='micro'>{t('Grouping')}</Box>
+		</Margins>
+		<ul className='rc-popover__list'>
+			<Margins block='x8'>
+				<SortListItem icon={'discussion'} text={t('Group_discussions')} input={<ToggleSwitch onChange={handleChangeShowDicussion} name='sidebarShowDiscussion' checked={sidebarShowDiscussion} />} />
+				<SortListItem icon={'sort-amount-down'} text={t('Group_by_Type')} input={<ToggleSwitch onChange={handleChangeGroupByType} name='sidebarGroupByType' checked={sidebarGroupByType} />} />
+				<SortListItem icon={'star'} text={t('Group_favorites')} input={<ToggleSwitch onChange={handleChangeShoFavorite} name='sidebarShowFavorites' checked={sidebarShowFavorites} />} />
+				<SortListItem icon={'eye-off'} text={t('Unread_on_top')} input={<ToggleSwitch onChange={handleChangeShowUnread} name='sidebarShowUnread' checked={sidebarShowUnread} />} />
+			</Margins>
+		</ul>
+	</>;
+}
+
+SortList.name = 'SortList';
diff --git a/app/ui-sidenav/client/index.js b/app/ui-sidenav/client/index.js
index 216d156fe5e4..ce46c1f15fa7 100644
--- a/app/ui-sidenav/client/index.js
+++ b/app/ui-sidenav/client/index.js
@@ -4,14 +4,12 @@ import './sidebarItem.html';
 import './sideNav.html';
 import './toolbar.html';
 import './roomList.html';
-import './sortlist.html';
 import './userStatus.html';
 import './chatRoomItem';
 import { toolbarSearch } from './sidebarHeader';
 import './sidebarItem';
 import './sideNav';
 import './roomList';
-import './sortlist';
 import './toolbar';
 import './userPresence';
 
diff --git a/app/ui-sidenav/client/sidebarHeader.js b/app/ui-sidenav/client/sidebarHeader.js
index ef4139876f3f..100ae6793ce8 100644
--- a/app/ui-sidenav/client/sidebarHeader.js
+++ b/app/ui-sidenav/client/sidebarHeader.js
@@ -4,12 +4,14 @@ import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Template } from 'meteor/templating';
 
 import { popover, AccountBox, menu, SideNav, modal } from '../../ui-utils';
-import { t, getUserPreference, handleError } from '../../utils';
+import { t } from '../../utils';
 import { callbacks } from '../../callbacks';
 import { settings } from '../../settings';
 import { hasAtLeastOnePermission } from '../../authorization';
 import { userStatus } from '../../user-status';
 import { hasPermission } from '../../authorization/client';
+import { createTemplateForComponent } from '../../../client/routes';
+
 
 const setStatus = (status, statusText) => {
 	AccountBox.setStatus(status, statusText);
@@ -17,29 +19,6 @@ const setStatus = (status, statusText) => {
 	popover.close();
 };
 
-const viewModeIcon = {
-	extended: 'th-list',
-	medium: 'list',
-	condensed: 'list-alt',
-};
-
-const extendedViewOption = (user) => {
-	if (settings.get('Store_Last_Message')) {
-		return {
-			icon: viewModeIcon.extended,
-			name: t('Extended'),
-			modifier: getUserPreference(user, 'sidebarViewMode') === 'extended' ? 'bold' : null,
-			action: () => {
-				Meteor.call('saveUserPreferences', { sidebarViewMode: 'extended' }, function(error) {
-					if (error) {
-						return handleError(error);
-					}
-				});
-			},
-		};
-	}
-};
-
 const showToolbar = new ReactiveVar(false);
 
 export const toolbarSearch = {
@@ -57,7 +36,7 @@ export const toolbarSearch = {
 	},
 };
 
-const toolbarButtons = (user) => [{
+const toolbarButtons = (/* user */) => [{
 	name: t('Home'),
 	icon: 'home',
 	condition: () => settings.get('Layout_Show_Home_Button'),
@@ -80,84 +59,22 @@ const toolbarButtons = (user) => [{
 		FlowRouter.go('directory');
 	},
 },
-{
-	name: t('View_mode'),
-	icon: () => viewModeIcon[getUserPreference(user, 'sidebarViewMode') || 'condensed'],
-	hasPopup: true,
-	action: (e) => {
-		const hideAvatarSetting = getUserPreference(user, 'sidebarHideAvatar');
-		const config = {
-			columns: [
-				{
-					groups: [
-						{
-							items: [
-								extendedViewOption(user),
-								{
-									icon: viewModeIcon.medium,
-									name: t('Medium'),
-									modifier: getUserPreference(user, 'sidebarViewMode') === 'medium' ? 'bold' : null,
-									action: () => {
-										Meteor.call('saveUserPreferences', { sidebarViewMode: 'medium' }, function(error) {
-											if (error) {
-												return handleError(error);
-											}
-										});
-									},
-								},
-								{
-									icon: viewModeIcon.condensed,
-									name: t('Condensed'),
-									modifier: getUserPreference(user, 'sidebarViewMode') === 'condensed' ? 'bold' : null,
-									action: () => {
-										Meteor.call('saveUserPreferences', { sidebarViewMode: 'condensed' }, function(error) {
-											if (error) {
-												return handleError(error);
-											}
-										});
-									},
-								},
-							],
-						},
-						{
-							items: [
-								{
-									icon: 'user-rounded',
-									name: hideAvatarSetting ? t('Show_Avatars') : t('Hide_Avatars'),
-									action: () => {
-										Meteor.call('saveUserPreferences', { sidebarHideAvatar: !hideAvatarSetting }, function(error) {
-											if (error) {
-												return handleError(error);
-											}
-										});
-									},
-								},
-							],
-						},
-					],
-				},
-			],
-			currentTarget: e.currentTarget,
-			offsetVertical: e.currentTarget.clientHeight + 10,
-		};
-
-		popover.open(config);
-	},
-},
 {
 	name: t('Sort'),
 	icon: 'sort',
 	hasPopup: true,
-	action: (e) => {
+	action: async (e) => {
 		const options = [];
 		const config = {
-			template: 'sortlist',
+			template: 'SortList',
 			currentTarget: e.currentTarget,
 			data: {
 				options,
 			},
 			offsetVertical: e.currentTarget.clientHeight + 10,
 		};
+		const { SortList } = require('./SortList');
+		await createTemplateForComponent(SortList);
 		popover.open(config);
 	},
 },
@@ -312,7 +229,7 @@ Template.sidebarHeader.helpers({
 		} });
 	},
 	toolbarButtons() {
-		return toolbarButtons(Meteor.userId()).filter((button) => !button.condition || button.condition());
+		return toolbarButtons().filter((button) => !button.condition || button.condition());
 	},
 	showToolbar() {
 		return showToolbar.get();
diff --git a/app/ui-sidenav/client/sortlist.html b/app/ui-sidenav/client/sortlist.html
deleted file mode 100644
index fa8efb05de23..000000000000
--- a/app/ui-sidenav/client/sortlist.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<template name="sortlist">
-	<div class="rc-popover__column">
-		<ul class="rc-popover__list">
-			<li class="rc-popover__item {{bold 'sidebarSortby' 'alphabetical'}}">
-				<label class="rc-popover__label">
-					<input type="radio" name="sidebarSortby" value="alphabetical" class="hidden" checked="{{checked 'sidebarSortby' 'alphabetical'}}">
-					<span class="rc-popover__icon">
-						{{> icon block="rc-popover__icon-element" icon='sort' }}
-					</span>
-					<span class="rc-popover__item-text"> {{_"Alphabetical"}}</span>
-				</label>
-			</li>
-			<li class="rc-popover__item {{bold 'sidebarSortby' 'activity'}}">
-				<label class="rc-popover__label">
-					<input type="radio" name="sidebarSortby" value="activity" class="hidden" checked="{{checked 'sidebarSortby' 'activity'}}">
-					<span class="rc-popover__icon">
-						{{> icon block="rc-popover__icon-element" icon='clock' }}
-					</span>
-					<span class="rc-popover__item-text">{{ _"Activity"}}</span>
-				</label>
-			</li>
-		</ul>
-		<span class="rc-popover__divider"></span>
-		<ul class="rc-popover__list">
-			<li class="rc-popover__item {{bold 'sidebarShowDiscussion'}}">
-				<label class="rc-popover__label">
-					<input type="checkbox" name="sidebarShowDiscussion" class="hidden" checked="{{checked 'sidebarShowDiscussion'}}" />
-					<span class="rc-popover__icon">
-						{{> icon block="rc-popover__icon-element" icon='discussion' }}
-					</span>
-					<span class="rc-popover__item-text">{{_ "Group_discussions"}}</span>
-				</label>
-			</li>
-			<li class="rc-popover__item {{bold 'sidebarGroupByType'}}">
-				<label class="rc-popover__label">
-					<input type="checkbox" name="sidebarGroupByType" class="hidden" checked="{{checked 'sidebarGroupByType'}}"/>
-					<span class="rc-popover__icon">
-						{{> icon block="rc-popover__icon-element" icon='sort-amount-down' }}
-					</span>
-					<span class="rc-popover__item-text">{{_ "Group_by_Type"}}</span>
-				</label>
-			</li>
-			{{#if favorite}}
-				<li class="rc-popover__item {{bold 'sidebarShowFavorites'}}">
-					<label class="rc-popover__label">
-						<input type="checkbox" name="sidebarShowFavorites" class="hidden" checked="{{checked 'sidebarShowFavorites'}}"/>
-						<span class="rc-popover__icon">
-							{{> icon block="rc-popover__icon-element" icon='star' }}
-						</span>
-						<span class="rc-popover__item-text">{{_"Group_favorites"}}</span>
-					</label>
-				</li>
-			{{/if}}
-			<li class="rc-popover__item {{bold 'sidebarShowUnread'}}">
-				<label class="rc-popover__label">
-					<input type="checkbox" name="sidebarShowUnread" class="hidden" checked="{{checked 'sidebarShowUnread'}}">
-					<span class="rc-popover__icon">
-						{{> icon block="rc-popover__icon-element" icon='eye-off' }}
-					</span>
-					<span class="rc-popover__item-text">{{_"Unread_on_top"}}</span>
-				</label>
-			</li>
-		</ul>
-	</div>
-</template>
diff --git a/app/ui-sidenav/client/sortlist.js b/app/ui-sidenav/client/sortlist.js
deleted file mode 100644
index 23144008b15e..000000000000
--- a/app/ui-sidenav/client/sortlist.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { Template } from 'meteor/templating';
-
-import { popover } from '../../ui-utils';
-import { getUserPreference } from '../../utils';
-import { settings } from '../../settings';
-
-const checked = function(prop, field) {
-	const userId = Meteor.userId();
-
-	if (prop === 'sidebarShowDiscussion') {
-		return getUserPreference(userId, 'sidebarShowDiscussion');
-	}
-	if (prop === 'sidebarShowFavorites') {
-		return getUserPreference(userId, 'sidebarShowFavorites');
-	}
-	if (prop === 'sidebarGroupByType') {
-		return getUserPreference(userId, 'sidebarGroupByType');
-	}
-	if (prop === 'sidebarShowUnread') {
-		return getUserPreference(userId, 'sidebarShowUnread');
-	}
-	if (prop === 'sidebarSortby') {
-		return (getUserPreference(userId, 'sidebarSortby') || 'alphabetical') === field;
-	}
-};
-
-Template.sortlist.helpers({
-	favorite() {
-		return settings.get('Favorite_Rooms');
-	},
-	checked,
-	bold(...props) {
-		return checked(...props) ? 'rc-popover__item--bold' : '';
-	},
-});
-
-Template.sortlist.events({
-	'change input'({ currentTarget }) {
-		const name = currentTarget.getAttribute('name');
-		let value = currentTarget.getAttribute('type') === 'checkbox' ? currentTarget.checked : currentTarget.value;
-
-		// TODO change mergeChannels to GroupByType
-		if (name === 'mergeChannels') {
-			value = !value;
-		}
-		Meteor.call('saveUserPreferences', {
-			[name]: value,
-		});
-		popover.close();
-	},
-});
diff --git a/client/routes.js b/client/routes.js
index ce613e76b182..d9da7ee66895 100644
--- a/client/routes.js
+++ b/client/routes.js
@@ -34,7 +34,7 @@ FlowRouter.goToRoomById = async (rid) => {
 
 BlazeLayout.setRoot('body');
 
-const createTemplateForComponent = async (
+export const createTemplateForComponent = async (
 	component,
 	props = {},
 	// eslint-disable-next-line new-cap
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 6e1ec0c127c6..491f55fb055e 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1659,6 +1659,7 @@
   "Group_favorites": "Group favorites",
   "Group_mentions_disabled_x_members": "Group mentions `@all` and `@here` have been disabled for rooms with more than __total__ members.",
   "Group_mentions_only": "Group mentions only",
+  "Grouping": "Grouping",
   "Hash": "Hash",
   "Header": "Header",
   "Header_and_Footer": "Header and Footer",
@@ -3108,6 +3109,7 @@
   "Social_Network": "Social Network",
   "Sorry_page_you_requested_does_not_exist_or_was_deleted": "Sorry, page you requested does not exist or was deleted!",
   "Sort": "Sort",
+  "Sort_By": "Sort by",
   "Sort_by_activity": "Sort by Activity",
   "Sound": "Sound",
   "Sound_File_mp3": "Sound File (mp3)",

From f0fc738a45422b7ee10295a1c734b717b0d38567 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Tue, 31 Mar 2020 21:58:18 -0300
Subject: [PATCH 124/223] [NEW] Directory page refactored, new user's bio field
 (#17043)

---
 app/api/server/v1/misc.js                     |   1 +
 app/api/server/v1/users.js                    |   1 +
 .../server/methods/saveRoomSettings.js        |  11 +-
 app/lib/server/functions/getFullUserData.js   |   1 +
 app/lib/server/functions/saveUser.js          |  26 +-
 app/lib/server/startup/settings.js            |   2 +-
 app/models/server/models/Rooms.js             |  29 ++
 app/models/server/models/Users.js             |  28 +-
 app/ui-account/client/accountProfile.html     |  49 +--
 app/ui-account/client/accountProfile.js       |  37 ++-
 app/ui-admin/client/rooms/adminRooms.js       |  16 +
 .../client/rooms/channelSettingsFeatured.html |  15 +
 .../client/rooms/channelSettingsFeatured.js   |  65 ++++
 app/ui-admin/client/rooms/views.js            |   1 +
 app/ui-flextab/client/tabs/membersList.js     |  17 +-
 app/ui-flextab/client/tabs/userEdit.html      |  15 +
 app/ui-flextab/client/tabs/userEdit.js        |   1 +
 app/ui-flextab/client/tabs/userInfo.html      |   5 +
 app/ui-flextab/client/tabs/userInfo.js        |  10 +-
 app/ui-sidenav/client/sidebarHeader.js        |   2 +-
 app/ui/client/index.js                        |   1 -
 .../app/components/Directory/ChannelsTab.js   |  89 ++++++
 .../components/Directory/Directory.stories.js |  19 ++
 .../components/Directory/DirectoryTable.js    | 115 +++++++
 .../views/app/components/Directory/UserTab.js |  97 ++++++
 .../views/app/components/Directory/index.js   |  51 ++++
 app/ui/client/views/app/components/hooks.js   |  84 ++++++
 app/ui/client/views/app/directory.html        | 173 -----------
 app/ui/client/views/app/directory.js          | 280 ------------------
 .../server/functions/getDefaultUserFields.js  |   1 +
 .../settings/inputs/StringSettingInput.js     |  19 +-
 client/components/basic/Page.js               |   4 +-
 client/main.js                                |   1 +
 client/routes.js                              |  22 +-
 client/startup/startup.js                     |   1 +
 .../components/EngagementDashboardPage.js     |   8 +-
 .../client/components/Section.js              |   2 +-
 package-lock.json                             |  69 +++--
 package.json                                  |  11 +-
 packages/rocketchat-i18n/i18n/en.i18n.json    |   4 +
 server/methods/browseChannels.js              |  16 +-
 server/methods/getUsersOfRoom.js              |  14 +-
 server/methods/saveUserProfile.js             |   9 +
 43 files changed, 860 insertions(+), 562 deletions(-)
 create mode 100644 app/ui-admin/client/rooms/channelSettingsFeatured.html
 create mode 100644 app/ui-admin/client/rooms/channelSettingsFeatured.js
 create mode 100644 app/ui/client/views/app/components/Directory/ChannelsTab.js
 create mode 100644 app/ui/client/views/app/components/Directory/Directory.stories.js
 create mode 100644 app/ui/client/views/app/components/Directory/DirectoryTable.js
 create mode 100644 app/ui/client/views/app/components/Directory/UserTab.js
 create mode 100644 app/ui/client/views/app/components/Directory/index.js
 create mode 100644 app/ui/client/views/app/components/hooks.js
 delete mode 100644 app/ui/client/views/app/directory.html
 delete mode 100644 app/ui/client/views/app/directory.js

diff --git a/app/api/server/v1/misc.js b/app/api/server/v1/misc.js
index 033bc3b9b055..4caefb489221 100644
--- a/app/api/server/v1/misc.js
+++ b/app/api/server/v1/misc.js
@@ -179,6 +179,7 @@ API.v1.addRoute('directory', { authRequired: true }, {
 		const { sort, query } = this.parseJsonQuery();
 
 		const { text, type, workspace = 'local' } = query;
+
 		if (sort && Object.keys(sort).length > 1) {
 			return API.v1.failure('This method support only one "sort" parameter');
 		}
diff --git a/app/api/server/v1/users.js b/app/api/server/v1/users.js
index a3618a3caa2e..4b861eb11407 100644
--- a/app/api/server/v1/users.js
+++ b/app/api/server/v1/users.js
@@ -199,6 +199,7 @@ API.v1.addRoute('users.info', { authRequired: true }, {
 			user.rooms = Subscriptions.findByUserId(user._id, {
 				fields: {
 					rid: 1,
+					bio: 1,
 					name: 1,
 					t: 1,
 					roles: 1,
diff --git a/app/channel-settings/server/methods/saveRoomSettings.js b/app/channel-settings/server/methods/saveRoomSettings.js
index 91d7fbcecf41..adef8f1ed12c 100644
--- a/app/channel-settings/server/methods/saveRoomSettings.js
+++ b/app/channel-settings/server/methods/saveRoomSettings.js
@@ -17,7 +17,7 @@ import { saveRoomTokenpass } from '../functions/saveRoomTokens';
 import { saveStreamingOptions } from '../functions/saveStreamingOptions';
 import { RoomSettingsEnum, roomTypes } from '../../../utils';
 
-const fields = ['roomName', 'roomTopic', 'roomAnnouncement', 'roomCustomFields', 'roomDescription', 'roomType', 'readOnly', 'reactWhenReadOnly', 'systemMessages', 'default', 'joinCode', 'tokenpass', 'streamingOptions', 'retentionEnabled', 'retentionMaxAge', 'retentionExcludePinned', 'retentionFilesOnly', 'retentionOverrideGlobal', 'encrypted'];
+const fields = ['featured', 'roomName', 'roomTopic', 'roomAnnouncement', 'roomCustomFields', 'roomDescription', 'roomType', 'readOnly', 'reactWhenReadOnly', 'systemMessages', 'default', 'joinCode', 'tokenpass', 'streamingOptions', 'retentionEnabled', 'retentionMaxAge', 'retentionExcludePinned', 'retentionFilesOnly', 'retentionOverrideGlobal', 'encrypted'];
 Meteor.methods({
 	saveRoomSettings(rid, settings, value) {
 		const userId = Meteor.userId();
@@ -79,6 +79,12 @@ Meteor.methods({
 					action: 'Viewing_room_administration',
 				});
 			}
+			if (settings === 'featured' && !hasPermission(userId, 'view-room-administration')) {
+				throw new Meteor.Error('error-action-not-allowed', 'Viewing room administration is not allowed', {
+					method: 'saveRoomSettings',
+					action: 'Viewing_room_administration',
+				});
+			}
 			if (setting === 'roomType' && value !== room.t && value === 'c' && !hasPermission(userId, 'create-c')) {
 				throw new Meteor.Error('error-action-not-allowed', 'Changing a private group to a public channel is not allowed', {
 					method: 'saveRoomSettings',
@@ -194,6 +200,9 @@ Meteor.methods({
 				case 'default':
 					Rooms.saveDefaultById(rid, value);
 					break;
+				case 'featured':
+					Rooms.saveFeaturedById(rid, value);
+					break;
 				case 'retentionEnabled':
 					Rooms.saveRetentionEnabledById(rid, value);
 					break;
diff --git a/app/lib/server/functions/getFullUserData.js b/app/lib/server/functions/getFullUserData.js
index b79cc953adb9..d3892bca9c51 100644
--- a/app/lib/server/functions/getFullUserData.js
+++ b/app/lib/server/functions/getFullUserData.js
@@ -22,6 +22,7 @@ const fullFields = {
 	emails: 1,
 	phone: 1,
 	statusConnection: 1,
+	bio: 1,
 	createdAt: 1,
 	lastLogin: 1,
 	services: 1,
diff --git a/app/lib/server/functions/saveUser.js b/app/lib/server/functions/saveUser.js
index 953a14e2b5c7..6f365454eb88 100644
--- a/app/lib/server/functions/saveUser.js
+++ b/app/lib/server/functions/saveUser.js
@@ -193,6 +193,23 @@ function validateUserEditing(userId, userData) {
 	}
 }
 
+const handleBio = (updateUser, bio) => {
+	if (bio) {
+		if (bio.trim()) {
+			if (typeof bio !== 'string' || bio.length > 260) {
+				throw new Meteor.Error('error-invalid-field', 'bio', {
+					method: 'saveUserProfile',
+				});
+			}
+			updateUser.$set = updateUser.$set || {};
+			updateUser.$set.bio = bio;
+		} else {
+			updateUser.$unset = updateUser.$unset || {};
+			updateUser.$unset.bio = 1;
+		}
+	}
+};
+
 export const saveUser = function(userId, userData) {
 	validateUserData(userId, userData);
 	let sendPassword = false;
@@ -225,14 +242,11 @@ export const saveUser = function(userId, userData) {
 		const updateUser = {
 			$set: {
 				roles: userData.roles || ['user'],
+				...typeof userData.name !== 'undefined' && { name: userData.name },
 				settings: userData.settings || {},
 			},
 		};
 
-		if (typeof userData.name !== 'undefined') {
-			updateUser.$set.name = userData.name;
-		}
-
 		if (typeof userData.requirePasswordChange !== 'undefined') {
 			updateUser.$set.requirePasswordChange = userData.requirePasswordChange;
 		}
@@ -241,6 +255,8 @@ export const saveUser = function(userId, userData) {
 			updateUser.$set['emails.0.verified'] = userData.verified;
 		}
 
+		handleBio(updateUser, userData.bio);
+
 		Meteor.users.update({ _id }, updateUser);
 
 		if (userData.sendWelcomeEmail) {
@@ -294,6 +310,8 @@ export const saveUser = function(userId, userData) {
 		$set: {},
 	};
 
+	handleBio(updateUser, userData.bio);
+
 	if (userData.roles) {
 		updateUser.$set.roles = userData.roles;
 	}
diff --git a/app/lib/server/startup/settings.js b/app/lib/server/startup/settings.js
index ede7feccac60..597e9f3efaad 100644
--- a/app/lib/server/startup/settings.js
+++ b/app/lib/server/startup/settings.js
@@ -97,7 +97,7 @@ settings.addGroup('Accounts', function() {
 		type: 'boolean',
 		public: true,
 	});
-	this.add('Accounts_SearchFields', 'username, name', {
+	this.add('Accounts_SearchFields', '', {
 		type: 'string',
 		public: true,
 	});
diff --git a/app/models/server/models/Rooms.js b/app/models/server/models/Rooms.js
index 2ed0cd76c83b..d7a244e68008 100644
--- a/app/models/server/models/Rooms.js
+++ b/app/models/server/models/Rooms.js
@@ -11,12 +11,14 @@ export class Rooms extends Base {
 
 		this.tryEnsureIndex({ name: 1 }, { unique: true, sparse: true });
 		this.tryEnsureIndex({ default: 1 });
+		this.tryEnsureIndex({ featured: 1 });
 		this.tryEnsureIndex({ t: 1 });
 		this.tryEnsureIndex({ 'u._id': 1 });
 		this.tryEnsureIndex({ 'tokenpass.tokens.token': 1 });
 		this.tryEnsureIndex({ ts: 1 });
 		// discussions
 		this.tryEnsureIndex({ prid: 1 }, { sparse: true });
+		this.tryEnsureIndex({ fname: 1 }, { sparse: true });
 		// Livechat - statistics
 		this.tryEnsureIndex({ closedAt: 1 }, { sparse: true });
 
@@ -414,6 +416,20 @@ export class Rooms extends Base {
 		return this._db.find(query, options);
 	}
 
+	findByNameOrFNameAndType(name, type, options) {
+		const query = {
+			t: type,
+			$or: [{
+				name,
+			}, {
+				fname: name,
+			}],
+		};
+
+		// do not use cache
+		return this._db.find(query, options);
+	}
+
 	findByNameAndTypeNotDefault(name, type, options) {
 		const query = {
 			t: type,
@@ -873,6 +889,19 @@ export class Rooms extends Base {
 		return this.update(query, update);
 	}
 
+	saveFeaturedById(_id, featured) {
+		const query = { _id };
+		const set = ['true', true].includes(featured);
+
+		const update = {
+			[set ? '$set' : '$unset']: {
+				featured: true,
+			},
+		};
+
+		return this.update(query, update);
+	}
+
 	saveDefaultById(_id, defaultValue) {
 		const query = { _id };
 
diff --git a/app/models/server/models/Users.js b/app/models/server/models/Users.js
index 6ace2d3a9c94..43c9c03530b2 100644
--- a/app/models/server/models/Users.js
+++ b/app/models/server/models/Users.js
@@ -30,6 +30,7 @@ export class Users extends Base {
 
 		this.tryEnsureIndex({ roles: 1 }, { sparse: 1 });
 		this.tryEnsureIndex({ name: 1 });
+		this.tryEnsureIndex({ name: 'text', username: 'text', bio: 'text' }, { default_language: 'none', language_override: 'documentLanguage' });
 		this.tryEnsureIndex({ createdAt: 1 });
 		this.tryEnsureIndex({ lastLogin: 1 });
 		this.tryEnsureIndex({ status: 1 });
@@ -688,16 +689,20 @@ export class Users extends Base {
 		const searchFields = forcedSearchFields || settings.get('Accounts_SearchFields').trim().split(',');
 
 		const orStmt = _.reduce(searchFields, function(acc, el) {
-			acc.push({ [el.trim()]: termRegex });
+			el = el.trim();
+			if (el && !['name', 'username', 'bio'].includes(el)) {
+				acc.push({ [el]: termRegex });
+			}
 			return acc;
 		}, []);
+
 		const query = {
 			$and: [
 				{
 					active: true,
-					$or: orStmt,
-				},
-				{
+					$or: [{
+						$text: { $search: searchTerm },
+					}, ...orStmt],
 					username: { $exists: true, $nin: exceptions },
 				},
 				...extraQuery,
@@ -1117,6 +1122,21 @@ export class Users extends Base {
 		return this.update(_id, update);
 	}
 
+	setBio(_id, bio = '') {
+		const update = {
+			...bio.trim() ? {
+				$set: {
+					bio,
+				},
+			} : {
+				$unset: {
+					bio: 1,
+				},
+			},
+		};
+		return this.update(_id, update);
+	}
+
 	clearSettings(_id) {
 		const update = {
 			$set: {
diff --git a/app/ui-account/client/accountProfile.html b/app/ui-account/client/accountProfile.html
index 03ee6b0da865..4f6196f3e2c9 100644
--- a/app/ui-account/client/accountProfile.html
+++ b/app/ui-account/client/accountProfile.html
@@ -70,26 +70,6 @@
 									{{/if}}
 							</div>
 						</div>
-						<div class="rc-form-group rc-grid">
-							{{# with canChange=allowStatusMessageChange}}
-
-							<div class="rc-input rc-w100 padded {{#if statusMessageInvalid}}rc-input--error{{/if}}">
-								<label class="rc-input__label">
-									<div class="rc-input__title">{{_ "StatusMessage"}}</div>
-									<div class="rc-input__wrapper">
-										<div class="rc-input__icon">
-											{{> icon block="rc-input__icon-svg" icon="edit"}}
-										</div>
-
-										<input type="text" class="rc-input__element" maxlength="120" name="statusText" id="statusText" placeholder="{{_ "StatusMessage_Placeholder" }}" value="{{statusText}}" {{ifThenElse canChange '' 'disabled'}}>
-									</div>
-								</label>
-								{{# unless canChange}}
-									<div class="rc-input__description">{{_ 'StatusMessage_Change_Disabled'}}</div>
-								{{/unless}}
-							</div>
-							{{/with}}
-						</div>
 						<div class="rc-form-group rc-grid">
 							{{# with canChange=allowRealNameChange}}
 							<div class="rc-input rc-w50 padded {{#if nameInvalid}}rc-input--error{{/if}}">
@@ -129,6 +109,35 @@
 							</div>
 							{{/with}}
 						</div>
+						<div class="rc-form-group rc-grid">
+							{{# with canChange=allowStatusMessageChange}}
+								<div class="rc-input rc-w100 padded {{#if statusMessageInvalid}}rc-input--error{{/if}}">
+									<label class="rc-input__label">
+										<div class="rc-input__title">{{_ "StatusMessage"}}</div>
+										<div class="rc-input__wrapper">
+											<div class="rc-input__icon">
+												{{> icon block="rc-input__icon-svg" icon="edit"}}
+											</div>
+
+											<input type="text" class="rc-input__element" maxlength="120" name="statusText" id="statusText" placeholder="{{_ "StatusMessage_Placeholder" }}" value="{{get 'statusText'}}" {{ifThenElse canChange '' 'disabled'}}>
+										</div>
+									</label>
+									{{# unless canChange}}
+										<div class="rc-input__description">{{_ 'StatusMessage_Change_Disabled'}}</div>
+									{{/unless}}
+								</div>
+							{{/with}}
+						</div>
+						<div class="rc-form-group">
+							<div class="rc-input rc-w100 padded">
+								<label class="rc-input__label">
+									<div class="rc-input__title">{{_ "Bio"}}</div>
+									<div class="rc-input__wrapper">
+										<textarea type="text" class="rc-input__element" name="bio" id="bio" maxlength="260" rows="4" style="height: auto" placeholder="{{_ "Bio_Placeholder" }}" value="{{get 'bio'}}"></textarea>
+									</div>
+								</label>
+							</div>
+						</div>
 						<div class="rc-form-group rc-grid">
 							{{#with canChange=allowEmailChange}}
 							<div class="rc-input rc-w50 padded {{#if emailInvalid}}rc-input--error{{/if}}">
diff --git a/app/ui-account/client/accountProfile.js b/app/ui-account/client/accountProfile.js
index 79ba12d4d098..035358f2bd7d 100644
--- a/app/ui-account/client/accountProfile.js
+++ b/app/ui-account/client/accountProfile.js
@@ -1,5 +1,6 @@
 import { SHA256 } from 'meteor/sha';
 import { ReactiveVar } from 'meteor/reactive-var';
+import { ReactiveDict } from 'meteor/reactive-dict';
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import { FlowRouter } from 'meteor/kadira:flow-router';
@@ -78,7 +79,7 @@ Template.accountProfile.helpers({
 		return !validateName(Template.instance().realname.get());
 	},
 	statusMessageInvalid() {
-		return !validateStatusMessage(Template.instance().statusText.get());
+		return !validateStatusMessage(Template.instance().fields.get('statusText'));
 	},
 	confirmationPasswordInvalid() {
 		const { password, confirmationPassword } = Template.instance();
@@ -117,7 +118,8 @@ Template.accountProfile.helpers({
 		const instance = Template.instance();
 		instance.dep.depend();
 		const realname = instance.realname.get();
-		const statusText = instance.statusText.get();
+		const statusText = instance.fields.get('statusText');
+		const bio = instance.fields.get('bio');
 		const username = instance.username.get();
 		const password = instance.password.get();
 		const confirmationPassword = instance.confirmationPassword.get();
@@ -135,7 +137,7 @@ Template.accountProfile.helpers({
 				return;
 			}
 		}
-		if (!avatar && user.name === realname && user.username === username && getUserEmailAddress(user) === email && statusText === user.statusText && !password) {
+		if (!avatar && user.bio === bio && user.name === realname && user.username === username && getUserEmailAddress(user) === email && statusText === user.statusText && !password) {
 			return ret;
 		}
 		if (!validateEmail(email) || !validatePassword(password, confirmationPassword) || (!validateUsername(username) || usernameAvaliable !== true) || !validateName(realname) || !validateStatusMessage(statusText)) {
@@ -151,9 +153,6 @@ Template.accountProfile.helpers({
 	username() {
 		return Meteor.user().username;
 	},
-	statusText() {
-		return Meteor.user().statusText;
-	},
 	email() {
 		const user = Meteor.user();
 		return getUserEmailAddress(user);
@@ -187,11 +186,20 @@ Template.accountProfile.helpers({
 	customFields() {
 		return Meteor.user().customFields;
 	},
+	get(field) {
+		return Template.instance().fields.get(field);
+	},
 });
 
 Template.accountProfile.onCreated(function() {
-	const self = this;
 	const user = Meteor.user();
+
+	this.fields = new ReactiveDict({
+		statusText: user.statusText,
+		bio: user.bio,
+	});
+
+	const self = this;
 	self.dep = new Tracker.Dependency();
 	self.realname = new ReactiveVar(user.name);
 	self.email = new ReactiveVar(getUserEmailAddress(user));
@@ -267,7 +275,7 @@ Template.accountProfile.onCreated(function() {
 			}
 			data.realname = s.trim(self.realname.get());
 		}
-		if (s.trim(self.statusText.get()) !== user.statusText) {
+		if (s.trim(self.fields.get('statusText')) !== user.statusText) {
 			if (!settings.get('Accounts_AllowUserStatusMessageChange')) {
 				toastr.remove();
 				toastr.error(t('StatusMessage_Change_Disabled'));
@@ -275,7 +283,11 @@ Template.accountProfile.onCreated(function() {
 				return cb && cb();
 			}
 
-			data.statusText = s.trim(self.statusText.get());
+			data.statusText = s.trim(self.fields.get('statusText'));
+		}
+
+		if (s.trim(self.fields.get('bio')) !== user.statusText) {
+			data.bio = s.trim(self.fields.get('bio'));
 		}
 		if (s.trim(self.username.get()) !== user.username) {
 			if (!settings.get('Accounts_AllowUsernameChange')) {
@@ -295,6 +307,7 @@ Template.accountProfile.onCreated(function() {
 			}
 			data.email = s.trim(self.email.get());
 		}
+
 		const customFields = {};
 		$('[data-customfield=true]').each(function() {
 			customFields[this.name] = $(this).val() || '';
@@ -396,9 +409,6 @@ Template.accountProfile.events({
 	'input [name=realname]'(e, instance) {
 		instance.realname.set(e.target.value);
 	},
-	'input [name=statusText]'(e, instance) {
-		instance.statusText.set(e.target.value);
-	},
 	'input [name=password]'(e, instance) {
 		instance.password.set(e.target.value);
 
@@ -406,6 +416,9 @@ Template.accountProfile.events({
 			instance.confirmationPassword.set('');
 		}
 	},
+	'input [name=bio], input [name=statusText]'(e, instance) {
+		instance.fields.set(e.target.name, e.target.value);
+	},
 	'input [name=confirmation-password]'(e, instance) {
 		instance.confirmationPassword.set(e.target.value);
 	},
diff --git a/app/ui-admin/client/rooms/adminRooms.js b/app/ui-admin/client/rooms/adminRooms.js
index 96a7c4c562fd..407048b92a5d 100644
--- a/app/ui-admin/client/rooms/adminRooms.js
+++ b/app/ui-admin/client/rooms/adminRooms.js
@@ -102,6 +102,7 @@ Template.adminRooms.onCreated(function() {
 		template: 'adminRoomInfo',
 		order: 7,
 	});
+
 	ChannelSettings.addOption({
 		group: ['admin-room'],
 		id: 'make-default',
@@ -117,6 +118,21 @@ Template.adminRooms.onCreated(function() {
 		},
 	});
 
+	ChannelSettings.addOption({
+		group: ['admin-room'],
+		id: 'make-default',
+		template: 'channelSettingsFeatured',
+		data() {
+			return {
+				room: instance.tabBarData.get().room,
+				onSuccess: instance.tabBarData.get().onSuccess,
+			};
+		},
+		validation() {
+			return hasAllPermission('view-room-administration');
+		},
+	});
+
 	this.onSuccessCallback = () => {
 		instance.offset.set(0);
 		return instance.loadRooms(instance.types.get(), instance.filter.get(), instance.offset.get());
diff --git a/app/ui-admin/client/rooms/channelSettingsFeatured.html b/app/ui-admin/client/rooms/channelSettingsFeatured.html
new file mode 100644
index 000000000000..a6b003286736
--- /dev/null
+++ b/app/ui-admin/client/rooms/channelSettingsFeatured.html
@@ -0,0 +1,15 @@
+<template name="channelSettingsFeatured">
+	<li>
+		<label>{{_ "Featured"}}</label>
+		<div>
+			{{#if editing 'featured'}}
+				<label><input type="radio" name="featured" class="editing" value="true" checked="{{$eq roomFeatured true}}" /> {{_ "True"}}</label>
+				<label><input type="radio" name="featured" value="false" checked="{{$neq roomFeatured true}}" /> {{_ "False"}}</label>
+				<button type="button" class="button cancel">{{_ "Cancel"}}</button>
+				<button type="button" class="button primary save">{{_ "Save"}}</button>
+			{{else}}
+				<span>{{featuredDescription}} <i class="icon-pencil" data-edit="featured"></i></span>
+			{{/if}}
+		</div>
+	</li>
+</template>
diff --git a/app/ui-admin/client/rooms/channelSettingsFeatured.js b/app/ui-admin/client/rooms/channelSettingsFeatured.js
new file mode 100644
index 000000000000..a0ffb03881ee
--- /dev/null
+++ b/app/ui-admin/client/rooms/channelSettingsFeatured.js
@@ -0,0 +1,65 @@
+import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
+import { Template } from 'meteor/templating';
+import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
+import toastr from 'toastr';
+import './channelSettingsFeatured.html';
+
+import { t, handleError } from '../../../utils';
+
+Template.channelSettingsFeatured.helpers({
+	editing(field) {
+		return Template.instance().editing.get() === field;
+	},
+	roomFeatured() {
+		const room = Template.instance().room.get();
+
+		if (room) {
+			return room.featured;
+		}
+	},
+	featuredDescription() {
+		const room = Template.instance().room.get();
+		if (room && room.featured) {
+			return t('True');
+		}
+		return t('False');
+	},
+});
+
+Template.channelSettingsFeatured.events({
+	'click [data-edit]'(e, t) {
+		e.preventDefault();
+		t.editing.set($(e.currentTarget).data('edit'));
+		setTimeout(() => {
+			t.$('input.editing').focus().select();
+		}, 100);
+	},
+	'click .cancel'(e, t) {
+		e.preventDefault();
+		t.editing.set();
+	},
+	'click .save'(e, t) {
+		e.preventDefault();
+
+		Meteor.call('saveRoomSettings', Template.instance().room.get()._id, 'featured', $('input[name=featured]:checked').val(), (err/* , result*/) => {
+			if (err) {
+				return handleError(err);
+			}
+			toastr.success(TAPi18n.__('Room_changed_successfully'));
+		});
+		t.onSuccess();
+		t.editing.set();
+	},
+});
+
+Template.channelSettingsFeatured.onCreated(function() {
+	this.editing = new ReactiveVar();
+	this.room = new ReactiveVar();
+	this.onSuccess = Template.currentData().onSuccess;
+
+	this.autorun(() => {
+		const { room } = Template.currentData();
+		this.room.set(room);
+	});
+});
diff --git a/app/ui-admin/client/rooms/views.js b/app/ui-admin/client/rooms/views.js
index cfd9eee52505..9bfc9dcf830d 100644
--- a/app/ui-admin/client/rooms/views.js
+++ b/app/ui-admin/client/rooms/views.js
@@ -3,4 +3,5 @@ import './adminRoomInfo.html';
 import './adminRoomInfo';
 import './channelSettingsDefault.html';
 import './channelSettingsDefault';
+import './channelSettingsFeatured';
 import './adminRooms';
diff --git a/app/ui-flextab/client/tabs/membersList.js b/app/ui-flextab/client/tabs/membersList.js
index ac77958a13c6..bd1797578ab8 100644
--- a/app/ui-flextab/client/tabs/membersList.js
+++ b/app/ui-flextab/client/tabs/membersList.js
@@ -40,17 +40,6 @@ Template.membersList.helpers({
 		let totalOnline = 0;
 		let users = roomUsers;
 
-		const filter = Template.instance().filter.get();
-		let reg = null;
-		try {
-			reg = new RegExp(filter, 'i');
-		} catch (e) {
-			console.log(e);
-		}
-		if (filter && reg) {
-			users = users.filter((user) => reg.test(user.username) || reg.test(user.name));
-		}
-
 		users = users.map(function(user) {
 			let utcOffset;
 			if (onlineUsers[user.username] != null) {
@@ -247,10 +236,10 @@ Template.membersList.events({
 	},
 
 	'click .show-more-users'(e, instance) {
-		const { showAllUsers, usersLimit, users, total, loadingMore } = instance;
+		const { showAllUsers, usersLimit, users, total, loadingMore, filter } = instance;
 
 		loadingMore.set(true);
-		Meteor.call('getUsersOfRoom', this.rid, showAllUsers.get(), { limit: usersLimit.get() + 100, skip: 0 }, (error, result) => {
+		Meteor.call('getUsersOfRoom', this.rid, showAllUsers.get(), { limit: usersLimit.get() + 100, skip: 0 }, filter.get(), (error, result) => {
 			if (error) {
 				console.error(error);
 				loadingMore.set(false);
@@ -283,7 +272,7 @@ Template.membersList.onCreated(function() {
 	this.autorun(() => {
 		if (this.data.rid == null) { return; }
 		this.loading.set(true);
-		return Meteor.call('getUsersOfRoom', this.data.rid, this.showAllUsers.get(), { limit: 100, skip: 0 }, (error, users) => {
+		return Meteor.call('getUsersOfRoom', this.data.rid, this.showAllUsers.get(), { limit: 100, skip: 0 }, this.filter.get(), (error, users) => {
 			if (error) {
 				console.error(error);
 				this.loading.set(false);
diff --git a/app/ui-flextab/client/tabs/userEdit.html b/app/ui-flextab/client/tabs/userEdit.html
index fb83c6096fae..f4e17c2aef7b 100644
--- a/app/ui-flextab/client/tabs/userEdit.html
+++ b/app/ui-flextab/client/tabs/userEdit.html
@@ -113,6 +113,21 @@
 			</div>
 
 
+			<div class="rc-form-group rc-form-group--small">
+				<div class="rc-input">
+					<label class="rc-input__label">
+						<div class="rc-input__title">{{_ "Bio"}}</div>
+						<div class="rc-input__wrapper">
+							<div class="rc-input__icon">
+								{{> icon icon='edit' }}
+							</div>
+							<input name="name" type="text" maxlength="260" class="rc-input__element rc-input__element--small" id="bio" autocomplete="off" value="{{user.bio}}"/>
+						</div>
+					</label>
+				</div>
+			</div>
+
+
 			{{#if hasPermission 'edit-other-user-password'}}
 			<div class="rc-form-group rc-form-group--small rc-form-group--inline" style="position: relative;">
 				<div class="rc-input rc-form-item-inline">
diff --git a/app/ui-flextab/client/tabs/userEdit.js b/app/ui-flextab/client/tabs/userEdit.js
index df4d933c3598..6ccae14800f9 100644
--- a/app/ui-flextab/client/tabs/userEdit.js
+++ b/app/ui-flextab/client/tabs/userEdit.js
@@ -205,6 +205,7 @@ Template.userEdit.onCreated(function() {
 		userData.name = s.trim(this.$('#name').val());
 		userData.username = s.trim(this.$('#username').val());
 		userData.statusText = s.trim(this.$('#status').val());
+		userData.bio = s.trim(this.$('#bio').val());
 		userData.email = s.trim(this.$('#email').val());
 		userData.verified = this.$('#verified:checked').length > 0;
 		userData.password = s.trim(this.$('#password').val());
diff --git a/app/ui-flextab/client/tabs/userInfo.html b/app/ui-flextab/client/tabs/userInfo.html
index c57a711be264..69e6128cf614 100644
--- a/app/ui-flextab/client/tabs/userInfo.html
+++ b/app/ui-flextab/client/tabs/userInfo.html
@@ -51,6 +51,11 @@ <h3 title="{{name}}" class="rc-user-info__name"><i class="status-{{status}}"></i
 							{{/with}}
 						</div>
 
+						{{#if hasBio}}
+							<div class="rc-user-info-details">
+								{{ bio }}
+							</div>
+						{{/if}}
 						<div class="rc-user-info-details">
 							{{#if roleTags}}
 								<div class="rc-user-info-details__item">
diff --git a/app/ui-flextab/client/tabs/userInfo.js b/app/ui-flextab/client/tabs/userInfo.js
index e5dd9b135b11..53041723b572 100644
--- a/app/ui-flextab/client/tabs/userInfo.js
+++ b/app/ui-flextab/client/tabs/userInfo.js
@@ -14,6 +14,7 @@ import { settings } from '../../../settings';
 import { getActions } from './userActions';
 import './userInfo.html';
 import { APIClient } from '../../../utils/client';
+import { Markdown } from '../../../markdown/lib/markdown';
 
 const shownActionsCount = 2;
 
@@ -188,7 +189,14 @@ Template.userInfo.helpers({
 			},
 		};
 	},
-
+	hasBio() {
+		const user = Template.instance().user.get();
+		return user.bio && user.bio.trim();
+	},
+	bio() {
+		const user = Template.instance().user.get();
+		return Markdown.parse(user.bio);
+	},
 	roleTags() {
 		const user = Template.instance().user.get();
 		if (!user || !user._id) {
diff --git a/app/ui-sidenav/client/sidebarHeader.js b/app/ui-sidenav/client/sidebarHeader.js
index 100ae6793ce8..a75ce5bd7c81 100644
--- a/app/ui-sidenav/client/sidebarHeader.js
+++ b/app/ui-sidenav/client/sidebarHeader.js
@@ -229,7 +229,7 @@ Template.sidebarHeader.helpers({
 		} });
 	},
 	toolbarButtons() {
-		return toolbarButtons().filter((button) => !button.condition || button.condition());
+		return toolbarButtons(/* Meteor.userId() */).filter((button) => !button.condition || button.condition());
 	},
 	showToolbar() {
 		return showToolbar.get();
diff --git a/app/ui/client/index.js b/app/ui/client/index.js
index f44ba3083e41..4867309779f8 100644
--- a/app/ui/client/index.js
+++ b/app/ui/client/index.js
@@ -37,7 +37,6 @@ import './views/app/CreateDirectMessage';
 import './views/app/editStatus';
 import './views/app/fullModal';
 import './views/app/home';
-import './views/app/directory';
 import './views/app/roomSearch';
 import './views/app/secretURL';
 import './views/app/invite';
diff --git a/app/ui/client/views/app/components/Directory/ChannelsTab.js b/app/ui/client/views/app/components/Directory/ChannelsTab.js
new file mode 100644
index 000000000000..71c0d193bfc4
--- /dev/null
+++ b/app/ui/client/views/app/components/Directory/ChannelsTab.js
@@ -0,0 +1,89 @@
+import React, { useMemo, useState, useCallback } from 'react';
+import { Box, Margins, Table, Flex, Avatar, Tag } from '@rocket.chat/fuselage';
+import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
+
+import { useEndpointData } from '../../../../../../../ee/app/engagement-dashboard/client/hooks/useEndpointData';
+import { DirectoryTable, Th } from './DirectoryTable';
+import { useTranslation } from '../../../../../../../client/contexts/TranslationContext';
+import { useRoute } from '../../../../../../../client/contexts/RouterContext';
+import { useQuery, useFormatDate } from '../hooks';
+
+const style = { whiteSpace: 'nowrap', textOverflow: 'ellipsis', overflow: 'hidden' };
+
+function RoomTags({ room }) {
+	const t = useTranslation();
+	return <Margins inline='x2'>
+		{room.default && <Tag variant='primary'>{t('default')}</Tag>}
+		{room.featured && <Tag variant='primary'>{t('featured')}</Tag>}
+	</Margins>;
+}
+
+export function ChannelsTab() {
+	const t = useTranslation();
+	const [sort, setSort] = useState(['name', 'asc']);
+	const [params, setParams] = useState({});
+
+	const mediaQuery = useMediaQuery('(min-width: 768px)');
+
+	const query = useQuery(params, sort, 'channels');
+
+	const onHeaderClick = useCallback((id) => {
+		const [sortBy, sortDirection] = sort;
+
+		if (sortBy === id) {
+			setSort([id, sortDirection === 'asc' ? 'desc' : 'asc']);
+			return;
+		}
+		setSort([id, 'asc']);
+	}, [sort]);
+
+	const header = useMemo(() => [
+		<Th key={'name'} direction={sort[1]} active={sort[0] === 'name'} onClick={onHeaderClick} sort='name'>{t('Name')}</Th>,
+		<Th key={'usersCount'} direction={sort[1]} active={sort[0] === 'usersCount'} onClick={onHeaderClick} sort='usersCount' style={{ width: '100px' }}>{t('Users')}</Th>,
+		mediaQuery && <Th key={'createdAt'} direction={sort[1]} active={sort[0] === 'createdAt'} onClick={onHeaderClick} sort='createdAt' style={{ width: '150px' }}>{t('Created_at')}</Th>,
+		mediaQuery && <Th key={'lastMessage'} direction={sort[1]} active={sort[0] === 'lastMessage'} onClick={onHeaderClick} sort='lastMessage' style={{ width: '150px' }}>{t('Last_Message')}</Th>,
+	].filter(Boolean), [sort, mediaQuery]);
+
+	const go = useRoute('channel');
+
+	const data = useEndpointData('GET', 'directory', query) || {};
+
+	const onClick = useMemo(() => (name) => (e) => {
+		if (e.type === 'click' || e.key === 'Enter') {
+			go({ name });
+		}
+	}, []);
+
+	const formatDate = useFormatDate();
+	const renderRow = useCallback(({ _id, ts, name, fname, description, usersCount, lastMessage, topic, ...room }) => <Table.Row key={_id} onKeyDown={onClick(name)} onClick={onClick(name)} tabIndex={0} role='link' action>
+		<Table.Cell>
+			<Flex.Container>
+				<Box>
+					<Flex.Item>
+						<Avatar size='x40' title={fname || name} url={`%40${ fname || name }`} />
+					</Flex.Item>
+					<Margins inline='x8'>
+						<Flex.Item grow={1}>
+							<Box>
+								<Box textStyle='p2'>{fname || name} <RoomTags room={room} style={style} /></Box>
+								{topic && <Box textStyle='p1' textColor='hint' style={style}>{topic}</Box> }
+							</Box>
+						</Flex.Item>
+					</Margins>
+				</Box>
+			</Flex.Container>
+		</Table.Cell>
+		<Table.Cell textStyle='p1' textColor='hint' style={style}>
+			{usersCount}
+		</Table.Cell>
+		{ mediaQuery && <Table.Cell textStyle='p1' textColor='hint' style={style}>
+			{formatDate(ts)}
+		</Table.Cell>}
+		{ mediaQuery && <Table.Cell textStyle='p1' textColor='hint' style={style}>
+			{lastMessage && formatDate(lastMessage.ts)}
+		</Table.Cell>}
+	</Table.Row>
+	, [mediaQuery]);
+
+	return <DirectoryTable searchPlaceholder={t('Search_Channels')} header={header} renderRow={renderRow} data={data} setParams={setParams} />;
+}
diff --git a/app/ui/client/views/app/components/Directory/Directory.stories.js b/app/ui/client/views/app/components/Directory/Directory.stories.js
new file mode 100644
index 000000000000..13f1cef83ed0
--- /dev/null
+++ b/app/ui/client/views/app/components/Directory/Directory.stories.js
@@ -0,0 +1,19 @@
+import React from 'react';
+
+import { DirectoryTable, Th } from './DirectoryTable';
+
+export default {
+	title: 'directory/table',
+	component: DirectoryTable,
+	decorators: [(fn) => <div children={fn()} style={{ height: '100vh' }} />],
+};
+
+export const _default = () => {
+	const header = [
+		<Th>Name</Th>,
+		<Th>Email</Th>,
+		<Th>Data</Th>,
+		<Th>Info</Th>,
+	];
+	return <DirectoryTable header={header} />;
+};
diff --git a/app/ui/client/views/app/components/Directory/DirectoryTable.js b/app/ui/client/views/app/components/Directory/DirectoryTable.js
new file mode 100644
index 000000000000..30382c07205f
--- /dev/null
+++ b/app/ui/client/views/app/components/Directory/DirectoryTable.js
@@ -0,0 +1,115 @@
+import React, { useMemo, useState, useEffect, useCallback } from 'react';
+import { Box, Icon, Margins, Pagination, Skeleton, Table, Flex, TextInput, Tile } from '@rocket.chat/fuselage';
+
+import { useTranslation } from '../../../../../../../client/contexts/TranslationContext';
+import { useDebounce } from '../hooks';
+
+function SortIcon({ direction }) {
+	return <Box is='svg' width='16' height='16' viewBox='0 0 16 16' fill='none' xmlns='http://www.w3.org/2000/svg'>
+		<path d='M5.33337 5.99999L8.00004 3.33333L10.6667 5.99999' stroke={direction === 'desc' ? '#9EA2A8' : '#E4E7EA' } strokeWidth='1.33333' strokeLinecap='round' strokeLinejoin='round'/>
+		<path d='M5.33337 10L8.00004 12.6667L10.6667 10' stroke={ direction === 'asc' ? '#9EA2A8' : '#E4E7EA'} strokeWidth='1.33333' strokeLinecap='round' strokeLinejoin='round'/>
+	</Box>;
+}
+
+export function Th({ children, active, direction, sort, onClick, align, ...props }) {
+	const fn = useMemo(() => () => onClick && onClick(sort), [sort, onClick]);
+	return <Table.Cell clickable={!!sort} onClick={fn} { ...props }>
+		<Flex.Container alignItems='center' wrap='no-wrap'>
+			<Box>{children}{sort && <SortIcon mod-active={active} direction={active && direction} />}</Box>
+		</Flex.Container>
+	</Table.Cell>;
+}
+
+const LoadingRow = ({ cols }) => <Table.Row>
+	<Table.Cell>
+		<Flex.Container>
+			<Box>
+				<Flex.Item>
+					<Skeleton variant='rect' height={40} width={40} />
+				</Flex.Item>
+				<Margins inline='x8'>
+					<Flex.Item grow={1}>
+						<Box>
+							<Skeleton width='100%' />
+							<Skeleton width='100%' />
+						</Box>
+					</Flex.Item>
+				</Margins>
+			</Box>
+		</Flex.Container>
+	</Table.Cell>
+	{ Array.from({ length: cols - 1 }, (_, i) => <Table.Cell key={i}>
+		<Skeleton width='100%' />
+	</Table.Cell>)}
+</Table.Row>;
+
+export function DirectoryTable({
+	data = {},
+	renderRow,
+	header,
+	searchPlaceholder = 'placeholder',
+	setParams = () => { },
+}) {
+	const t = useTranslation();
+
+	const [text, setText] = useState('');
+
+	const [itemsPerPage, setItemsPerPage] = useState(25);
+
+	const [current, setCurrent] = useState(0);
+
+	const term = useDebounce(text, 500);
+
+	useEffect(() => {
+		setParams({ term, current, itemsPerPage });
+	}, [term, current, itemsPerPage]);
+
+	const { result: channels, total } = data;
+
+
+	const handleChange = useCallback((event) => setText(event.currentTarget.value), []);
+
+	const Loading = useCallback(() => Array.from({ length: 10 }, (_, i) => <LoadingRow cols={header.length} key={i}/>), [header && header.length]);
+
+	const showingResultsLabel = useCallback(({ count, current, itemsPerPage }) => t('Showing results %s - %s of %s', current + 1, Math.min(current + itemsPerPage, count), count), []);
+
+	const itemsPerPageLabel = useCallback(() => t('Items_per_page:'), []);
+
+	return <>
+		<Flex.Container direction='column'>
+			<Box>
+				<Margins block='x16'>
+					<TextInput placeholder={searchPlaceholder} addon={<Icon name='magnifier' size='20'/>} onChange={handleChange} value={text} />
+				</Margins>
+				{channels && !channels.length
+					? <Tile textStyle='p1' elevation='0' textColor='info' style={{ textAlign: 'center' }}>
+						{t('No_data_found')}
+					</Tile>
+					: <>
+						<Table fixed>
+							{ header && <Table.Head>
+								<Table.Row>
+									{header}
+								</Table.Row>
+							</Table.Head> }
+							<Table.Body>
+								{channels
+									? channels.map(renderRow)
+									:	<Loading/>}
+							</Table.Body>
+						</Table>
+						<Pagination
+							current={current}
+							itemsPerPage={itemsPerPage}
+							itemsPerPageLabel={itemsPerPageLabel}
+							showingResultsLabel={showingResultsLabel}
+							count={total || 0}
+							onSetItemsPerPage={setItemsPerPage}
+							onSetCurrent={setCurrent}
+						/>
+					</>
+				}
+			</Box>
+		</Flex.Container>
+	</>;
+}
diff --git a/app/ui/client/views/app/components/Directory/UserTab.js b/app/ui/client/views/app/components/Directory/UserTab.js
new file mode 100644
index 000000000000..23924d11f558
--- /dev/null
+++ b/app/ui/client/views/app/components/Directory/UserTab.js
@@ -0,0 +1,97 @@
+import React, { useMemo, useState, useCallback } from 'react';
+import { Box, Margins, Table, Flex, Avatar } from '@rocket.chat/fuselage';
+import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
+
+import { useEndpointData } from '../../../../../../../ee/app/engagement-dashboard/client/hooks/useEndpointData';
+import { DirectoryTable, Th } from './DirectoryTable';
+import { useTranslation } from '../../../../../../../client/contexts/TranslationContext';
+import { useRoute } from '../../../../../../../client/contexts/RouterContext';
+import { usePermission } from '../../../../../../../client/contexts/AuthorizationContext';
+import { useQuery, useFormatDate } from '../hooks';
+
+const style = { whiteSpace: 'nowrap', textOverflow: 'ellipsis', overflow: 'hidden' };
+
+export function UserTab({
+	workspace = 'local',
+}) {
+	const [params, setParams] = useState({});
+	const [sort, setSort] = useState(['name', 'asc']);
+	const canViewFullOtherUserInfo = usePermission('view-full-other-user-info');
+	const t = useTranslation();
+
+	const federation = workspace === 'external';
+
+	const query = useQuery(params, sort, 'users', workspace);
+
+	const mediaQuery = useMediaQuery('(min-width: 1024px)');
+
+	const onHeaderClick = (id) => {
+		const [sortBy, sortDirection] = sort;
+
+		if (sortBy === id) {
+			setSort([id, sortDirection === 'asc' ? 'desc' : 'asc']);
+			return;
+		}
+		setSort([id, 'asc']);
+	};
+	const bioStyle = useMemo(() => ({ ...style, width: '200px' }), [mediaQuery]);
+
+	const header = useMemo(() => [
+		<Th key={'name'} direction={sort[1]} active={sort[0] === 'name'} onClick={onHeaderClick} sort='name'>{t('Name')}</Th>,
+		<Th key={'bio'} direction={sort[1]} active={sort[0] === 'bio'} onClick={onHeaderClick} sort='bio' style={bioStyle}>{t('Bio')}</Th>,
+		mediaQuery && canViewFullOtherUserInfo && <Th key={'email'} direction={sort[1]} active={sort[0] === 'email'} onClick={onHeaderClick} sort='email' style={{ width: '200px' }} >{t('Email')}</Th>,
+		federation && <Th key={'origin'} direction={sort[1]} active={sort[0] === 'origin'} onClick={onHeaderClick} sort='origin' style={{ width: '200px' }} >{t('Domain')}</Th>,
+		mediaQuery && <Th key={'createdAt'} direction={sort[1]} active={sort[0] === 'createdAt'} onClick={onHeaderClick} sort='createdAt' style={{ width: '200px' }}>{t('Joined_at')}</Th>,
+	].filter(Boolean), [sort, federation, canViewFullOtherUserInfo, mediaQuery]);
+
+	const go = useRoute('direct');
+
+	const data = useEndpointData('GET', 'directory', query) || {};
+
+	const onClick = useMemo(() => (username) => (e) => {
+		if (e.type === 'click' || e.key === 'Enter') {
+			go({ rid: username });
+		}
+	}, []);
+
+
+	const formatDate = useFormatDate();
+
+	const renderRow = useCallback(({ createdAt, emails, _id, username, name, domain, bio }) => <Table.Row key={_id} onKeyDown={onClick(username)} onClick={onClick(username)} tabIndex={0} role='link' action>
+		<Table.Cell>
+			<Flex.Container>
+				<Box>
+					<Flex.Item>
+						<Avatar size='x40' title={username} url={username} />
+					</Flex.Item>
+					<Margins inline='x8'>
+						<Flex.Item grow={1}>
+							<Box style={style}>
+								<Box textStyle='p2' style={style}>{name || username}</Box>
+								<Box textStyle='p1' textColor='hint' style={style}>{name && username}</Box>
+							</Box>
+						</Flex.Item>
+					</Margins>
+				</Box>
+			</Flex.Container>
+		</Table.Cell>
+		<Table.Cell textStyle='p1' textColor='hint' style={ bioStyle }>
+			<Box is='div' style={ style }>
+				{bio}
+			</Box>
+		</Table.Cell>
+		{mediaQuery && canViewFullOtherUserInfo
+			&& <Table.Cell style={style} >
+				{emails && emails[0].address}
+			</Table.Cell>}
+		{federation
+		&& <Table.Cell style={style}>
+			{domain}
+		</Table.Cell>}
+		{mediaQuery && <Table.Cell textStyle='p1' textColor='hint' style={style}>
+			{formatDate(createdAt)}
+		</Table.Cell>}
+	</Table.Row>, [mediaQuery, federation, canViewFullOtherUserInfo]);
+
+	return <DirectoryTable searchPlaceholder={t('Search_Users')} header={header} renderRow={renderRow} data={data} setParams={setParams} />;
+}
diff --git a/app/ui/client/views/app/components/Directory/index.js b/app/ui/client/views/app/components/Directory/index.js
new file mode 100644
index 000000000000..0908510cc2f9
--- /dev/null
+++ b/app/ui/client/views/app/components/Directory/index.js
@@ -0,0 +1,51 @@
+import React, { useEffect, useCallback } from 'react';
+import { Box, Margins, Tabs, Avatar } from '@rocket.chat/fuselage';
+
+import { Page } from '../../../../../../../client/components/basic/Page';
+import { useTranslation } from '../../../../../../../client/contexts/TranslationContext';
+import { UserTab } from './UserTab';
+import { ChannelsTab } from './ChannelsTab';
+import { useRoute, useRouteParameter } from '../../../../../../../client/contexts/RouterContext';
+import { useSetting } from '../../../../../../../client/contexts/SettingsContext';
+
+const style = { padding: 0 };
+const avatarBase = { baseUrl: '/avatar/' };
+export function DirectoryPage() {
+	const t = useTranslation();
+
+	const federationEnabled = useSetting('FEDERATION_Enabled');
+
+	const tab = useRouteParameter('tab');
+
+	const goToDirectory = useRoute('directory');
+	const handleTabClick = useCallback((tab) => () => goToDirectory({ tab }), [tab]);
+
+	useEffect(() => {
+		if (!tab || (tab === 'external' && !federationEnabled)) {
+			return goToDirectory.replacingState({ tab: 'channels' });
+		}
+	}, [tab, federationEnabled]);
+
+	return <Avatar.Context.Provider value={avatarBase}><Page>
+		<Page.Header title={t('Directory')} />
+		<Page.Content style={style}>
+			<Tabs>
+				<Tabs.Item selected={tab === 'channels'} onClick={handleTabClick('channels')}>{t('Channels')}</Tabs.Item>
+				<Tabs.Item selected={tab === 'users'} onClick={handleTabClick('users')}>{t('Users')}</Tabs.Item>
+				{ federationEnabled && <Tabs.Item selected={tab === 'external'} onClick={handleTabClick('external')}>{t('External_Users')}</Tabs.Item> }
+			</Tabs>
+			<Margins inline='x24'>
+				<Box>
+					{
+						(tab === 'users' && <UserTab />)
+					|| (tab === 'channels' && <ChannelsTab />)
+					|| (federationEnabled && tab === 'external' && <UserTab workspace='external' />)
+					}
+				</Box>
+			</Margins>
+		</Page.Content>
+	</Page></Avatar.Context.Provider>;
+}
+
+
+DirectoryPage.name = 'DirectoryPage';
diff --git a/app/ui/client/views/app/components/hooks.js b/app/ui/client/views/app/components/hooks.js
new file mode 100644
index 000000000000..92ef5c55bb54
--- /dev/null
+++ b/app/ui/client/views/app/components/hooks.js
@@ -0,0 +1,84 @@
+import { useState, useEffect, useMemo, useCallback } from 'react';
+import moment from 'moment';
+
+import { useUserPreference } from '../../../../../../client/contexts/UserContext';
+import { useSetting } from '../../../../../../client/contexts/SettingsContext';
+
+export function useDebounce(value, delay) {
+	const [debouncedValue, setDebouncedValue] = useState(value);
+
+	useEffect(() => {
+		const handler = setTimeout(() => {
+			setDebouncedValue(value);
+		}, delay);
+		return () => clearTimeout(handler);
+	}, [value]);
+
+	return debouncedValue;
+}
+
+export function useMediaQuery(query) {
+	const [matches, setQuery] = useState(window.matchMedia(query).matches);
+
+	useEffect(() => {
+		const resizeObserver = new ResizeObserver(() => {
+			setQuery(window.matchMedia(query).matches);
+		});
+		resizeObserver.observe(document.body);
+
+		return () => {
+			resizeObserver.unobserve(document.body);
+		};
+	}, [query]);
+
+	return matches;
+}
+
+export function useQuery(params, sort, type, workspace = 'local') {
+	return useMemo(() => ({
+		query: JSON.stringify({
+			type,
+			text: params.term,
+			workspace,
+		}),
+		sort: JSON.stringify({ [sort[0]]: sort[1] === 'asc' ? 1 : 0 }),
+		...params.itemsPerPage && { count: params.itemsPerPage },
+		...params.current && { offset: params.current },
+	}), [params, sort, type, workspace]);
+}
+
+const dayFormat = ['h:mm A', 'H:mm'];
+export function useFormatTime() {
+	const clockMode = useUserPreference('clockMode', false);
+	const format = useSetting('Message_TimeFormat');
+	const sameDay = dayFormat[clockMode - 1] || format;
+	return useCallback((time) => {
+		switch (clockMode) {
+			case 1:
+			case 2:
+				return moment(time).format(sameDay);
+			default:
+				return moment(time).format(format);
+		}
+	}, [clockMode, format]);
+}
+
+export function useFormatDateAndTime() {
+	const clockMode = useUserPreference('clockMode', false);
+	const format = useSetting('Message_TimeAndDateFormat');
+	return useCallback((time) => {
+		switch (clockMode) {
+			case 1:
+				return moment(time).format('MMMM D, Y h:mm A');
+			case 2:
+				return moment(time).format('MMMM D, Y H:mm');
+			default:
+				return moment(time).format(format);
+		}
+	}, [clockMode, format]);
+}
+
+export function useFormatDate() {
+	const format = useSetting('Message_DateFormat');
+	return useCallback((time) => moment(time).format(format), [format]);
+}
diff --git a/app/ui/client/views/app/directory.html b/app/ui/client/views/app/directory.html
deleted file mode 100644
index a9c729f6b159..000000000000
--- a/app/ui/client/views/app/directory.html
+++ /dev/null
@@ -1,173 +0,0 @@
-<template name="directory">
-	<section class="directory">
-		{{> header sectionName="Directory" hideHelp=true fullpage=true}}
-		<div class="rc-table-content">
-			{{>tabs tabs=tabsData}}
-
-			<form class="directory__search-form js-search-form" role="form">
-				<div class="rc-input">
-					<div class="rc-input__icon">
-						{{#if isLoading}}
-							{{> loading }}
-						{{else}}
-							{{> icon block="rc-input__icon-svg" icon="magnifier" }}
-						{{/if}}
-					</div>
-					<input
-						type="text"
-						class="rc-input__element js-search"
-						name="message-search"
-						id="message-search"
-						placeholder="{{#if $eq searchType 'channels'}}{{_ "Search_Channels"}}{{/if}}{{#if $eq searchType 'users'}}{{_ "Search_Users"}}{{/if}}"
-						autocomplete="off">
-				</div>
-				{{#if $eq searchType 'users'}}
-					{{#if federationEnabled}}
-						<label class="rc-select">
-							<select class="rc-select__element js-workspace" name="search-type">
-								<option class="rc-select__option" value="local" selected="true">{{_ "Local_Domains"}}</option>
-								<option class="rc-select__option" value="external">{{_ "External_Domains"}}</option>
-							</select>
-							{{> icon block="rc-select__arrow" icon="arrow-down" }}
-						</label>
-					{{/if}}
-				{{/if}}
-			</form>
-
-			{{#if $eq searchType 'channels'}}
-				{{#table fixed='true' onItemClick=onTableItemClick onScroll=onTableScroll onResize=onTableResize onSort=onTableSort}}
-					<thead>
-						<tr>
-							<th class="directory__channel-name js-sort {{#if searchSortBy 'name'}}is-sorting{{/if}}" data-sort="name">
-								<div class="table-fake-th"><span>{{_ "Name"}}</span> {{> icon icon=(sortIcon 'name')}}</div>
-							</th>
-							<th class="directory__user-count js-sort {{#if searchSortBy 'usersCount'}}is-sorting{{/if}}" data-sort="usersCount">
-								<div class="table-fake-th"><span>{{_ "Users"}}</span> {{> icon icon=(sortIcon 'usersCount')}}</div>
-							</th>
-							{{#if showLastMessage}}
-							<th class="table-column-date js-sort {{#if searchSortBy 'lastMessage'}}is-sorting{{/if}}" data-sort="lastMessage">
-								<div class="table-fake-th"><span>{{_ "Last_Message"}}</span> {{> icon icon=(sortIcon 'lastMessage')}}</div>
-							</th>
-							{{/if}}
-							<th class="js-sort table-column-date {{#if searchSortBy 'createdAt'}}is-sorting{{/if}}" data-sort="createdAt">
-								<div class="table-fake-th"><span>{{_ "Created_at"}}</span> {{> icon icon=(sortIcon 'createdAt') }}</div>
-							</th>
-							<th>
-								<div class="table-fake-th"><span>{{_ "Topic"}}</span></div>
-							</th>
-						</tr>
-					</thead>
-					<tbody>
-						{{#each searchResults}}
-							<tr data-name="{{name}}">
-								<td>
-									<div class="rc-table-wrapper">
-										<div class="rc-table-avatar">{{> avatar username=name roomIcon="true"}}</div>
-										<div class="rc-table-info">
-											<span class="rc-table-title">
-												{{>icon icon="hashtag" block="rc-table-icon"}}
-												{{name}}
-											</span>
-										</div>
-									</div>
-								</td>
-								<td>{{users}}</td>
-								{{#if showLastMessage}}
-									<td class="table-column-date">{{lastMessage}}</td>
-								{{/if}}
-								<td class="table-column-date">{{createdAt}}</td>
-								<td>{{topic}}</td>
-							</tr>
-						{{else}}
-							{{# with searchText}}
-								<tr class="table-no-click">
-									<td colspan="{{sumColumnCount 4 showLastMessage}}">
-										{{_ "No_results_found_for"}} {{.}}
-									</td>
-								</tr>
-							{{/with}}
-						{{/each}}
-						{{#if isLoading}}
-							<tr class="table-no-click">
-								<td class="table-loading-td" colspan="{{sumColumnCount 4 showLastMessage}}">
-									{{> loading}}
-								</td>
-							</tr>
-						{{/if}}
-					</tbody>
-				{{/table}}
-			{{/if}}
-			{{#if $eq searchType 'users'}}
-				{{#table onItemClick=onTableItemClick onScroll=onTableScroll onResize=onTableResize onSort=onTableSort}}
-					<thead>
-						<tr>
-							<th class="directory__user-name js-sort {{#if searchSortBy 'name'}}is-sorting{{/if}}" data-sort="name">
-								<div class="table-fake-th"><span>{{_ "Name"}}</span> {{> icon icon=(sortIcon 'name') }}</div>
-							</th>
-							<th class="directory__username js-sort {{#if searchSortBy 'username'}}is-sorting{{/if}}" data-sort="username">
-								<div class="table-fake-th"><span>{{_ "Username"}}</span> {{> icon icon=(sortIcon 'username') }}</div>
-							</th>
-							{{#if canViewOtherUserInfo}}
-							<th class="directory__email js-sort {{#if searchSortBy 'email'}}is-sorting{{/if}}" data-sort="email">
-								<div class="table-fake-th"><span>{{_ "Email"}}</span> {{> icon icon=(sortIcon 'email') }}</div>
-							</th>
-							{{/if}}
-							{{#if $eq searchWorkspace 'external'}}
-							<th class="directory__origin js-sort {{#if searchSortBy 'origin'}}is-sorting{{/if}}" data-sort="origin">
-								<div class="table-fake-th"><span>{{_ "Domain"}}</span> {{> icon icon=(sortIcon 'origin') }}</div>
-							</th>
-							{{/if}}
-							{{#if $eq searchWorkspace 'local'}}
-							<th class="table-column-date js-sort {{#if searchSortBy 'createdAt'}}is-sorting{{/if}}" data-sort="createdAt">
-								<div class="table-fake-th"><span>{{_ "Created_at"}}</span> {{> icon icon=(sortIcon 'createdAt') }}</div>
-							</th>
-							{{/if}}
-						</tr>
-					</thead>
-					<tbody>
-						{{#each searchResults}}
-							<tr data-name="{{name}}">
-								<td>
-									<div class="rc-table-wrapper">
-										<div class="rc-table-avatar">{{> avatar username=username}}</div>
-										<div class="rc-table-info">
-											<span class="rc-table-title">
-												{{name}}
-											</span>
-										</div>
-									</div>
-								</td>
-								<td>{{username}}</td>
-								{{#if canViewOtherUserInfo}}
-								<td>{{email}}</td>
-								{{/if}}
-								{{#if $eq searchWorkspace 'external'}}
-								<td>{{domain}}</td>
-								{{/if}}
-								{{#if $eq searchWorkspace 'local'}}
-								<td>{{createdAt}}</td>
-								{{/if}}
-							</tr>
-						{{else}}
-							{{# with searchText}}
-								<tr class="table-no-click">
-									<td colspan="{{sumColumnCount 3 (canViewOtherUserInfo) ($eq searchWorkspace 'external')}}">
-										{{_ "No_results_found_for"}} {{.}}
-									</td>
-								</tr>
-							{{/with}}
-						{{/each}}
-						{{#if isLoading}}
-							<tr class="table-no-click">
-								<td class="table-loading-td"
-									colspan="{{sumColumnCount 3 (canViewOtherUserInfo) ($eq searchWorkspace 'external')}}">
-									{{> loading}}
-								</td>
-							</tr>
-						{{/if}}
-					</tbody>
-				{{/table}}
-			{{/if}}
-		</div>
-	</section>
-</template>
diff --git a/app/ui/client/views/app/directory.js b/app/ui/client/views/app/directory.js
deleted file mode 100644
index af0a22ff6822..000000000000
--- a/app/ui/client/views/app/directory.js
+++ /dev/null
@@ -1,280 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { ReactiveVar } from 'meteor/reactive-var';
-import { Template } from 'meteor/templating';
-import _ from 'underscore';
-
-import { timeAgo } from './helpers';
-import { hasAllPermission } from '../../../../authorization/client';
-import { t, roomTypes } from '../../../../utils';
-import { settings } from '../../../../settings';
-import { hasAtLeastOnePermission } from '../../../../authorization';
-import './directory.html';
-import './directory.css';
-
-function directorySearch(config, cb) {
-	return Meteor.call('browseChannels', config, (err, result) => {
-		cb(result && result.results && result.results.length && result.results.map((result) => {
-			if (config.type === 'channels') {
-				return {
-					name: result.name,
-					users: result.usersCount || 0,
-					createdAt: timeAgo(result.ts, t),
-					lastMessage: result.lastMessage && timeAgo(result.lastMessage.ts, t),
-					description: result.description,
-					archived: result.archived,
-					topic: result.topic,
-				};
-			}
-
-			if (config.type === 'users') {
-				return {
-					name: result.name,
-					username: result.username,
-					// If there is no email address (rocket.cat and app users) show the username)
-					email: (result.emails && result.emails[0] && result.emails[0].address) || result.username,
-					createdAt: timeAgo(result.createdAt, t),
-					origin: result.federation && result.federation.origin,
-					isRemote: result.isRemote,
-				};
-			}
-			return null;
-		}));
-	});
-}
-
-Template.directory.helpers({
-	federationEnabled() {
-		return settings.get('FEDERATION_Enabled');
-	},
-	searchText() {
-		return Template.instance().searchText.get();
-	},
-	searchWorkspace() {
-		return Template.instance().searchWorkspace.get();
-	},
-	showLastMessage() {
-		return settings.get('Store_Last_Message');
-	},
-	searchResults() {
-		return Template.instance().results.get();
-	},
-	searchType() {
-		return Template.instance().searchType.get();
-	},
-	sortIcon(key) {
-		const { sortDirection, searchSortBy } = Template.instance();
-
-		return key === searchSortBy.get() && sortDirection.get() === 'asc'
-			? 'sort-up'
-			: 'sort-down';
-	},
-	searchSortBy(key) {
-		return Template.instance().searchSortBy.get() === key;
-	},
-	createChannelOrGroup() {
-		return hasAtLeastOnePermission(['create-c', 'create-p']);
-	},
-	tabsData() {
-		const {
-			sortDirection,
-			searchType,
-			searchSortBy,
-			results,
-			end,
-			page,
-		} = Template.instance();
-		const channelsTab = {
-			label: t('Channels'),
-			value: 'channels',
-			condition() {
-				return true;
-			},
-		};
-		const usersTab = {
-			label: t('Users'),
-			value: 'users',
-			condition() {
-				return true;
-			},
-		};
-		if (searchType.get() === 'channels') {
-			channelsTab.active = true;
-		} else {
-			usersTab.active = true;
-		}
-		return {
-			tabs: [channelsTab, usersTab],
-			onChange(value) {
-				results.set([]);
-				end.set(false);
-				if (value === 'channels') {
-					searchSortBy.set('usersCount');
-					sortDirection.set('desc');
-				} else {
-					searchSortBy.set('name');
-					sortDirection.set('asc');
-				}
-				page.set(0);
-				searchType.set(value);
-			},
-		};
-	},
-	onTableItemClick() {
-		const instance = Template.instance();
-
-		const { searchType } = instance;
-
-		let type;
-		let routeConfig;
-
-		return function(item) {
-			if (searchType.get() === 'channels') {
-				type = 'c';
-				routeConfig = { name: item.name };
-			} else {
-				type = 'd';
-				routeConfig = { name: item.username };
-			}
-			roomTypes.openRouteLink(type, routeConfig);
-		};
-	},
-	isLoading() {
-		return Template.instance().isLoading.get();
-	},
-	onTableScroll() {
-		const instance = Template.instance();
-		if (instance.isLoading.get() || instance.end.get()) {
-			return;
-		}
-		return function(currentTarget) {
-			if (
-				currentTarget.offsetHeight + currentTarget.scrollTop
-				>= currentTarget.scrollHeight - 100
-			) {
-				return instance.page.set(instance.page.get() + 1);
-			}
-		};
-	},
-	onTableResize() {
-		const { limit } = Template.instance();
-
-		return function() {
-			limit.set(Math.ceil(this.$('.table-scroll').height() / 40 + 5));
-		};
-	},
-	onTableSort() {
-		const { end, page, sortDirection, searchSortBy } = Template.instance();
-
-		return function(type) {
-			end.set(false);
-			page.set(0);
-
-			if (searchSortBy.get() === type) {
-				sortDirection.set(sortDirection.get() === 'asc' ? 'desc' : 'asc');
-				return;
-			}
-
-			searchSortBy.set(type);
-			sortDirection.set('asc');
-		};
-	},
-	canViewOtherUserInfo() {
-		const { canViewOtherUserInfo } = Template.instance();
-
-		return canViewOtherUserInfo.get();
-	},
-	sumColumnCount(...args) {
-		return args
-			.slice(0, -1)
-			.map((value) => (typeof value === 'number' ? value : Number(!!value)))
-			.reduce((sum, value) => sum + value, 0);
-	},
-});
-
-Template.directory.events({
-	'submit .js-search-form'(e) {
-		e.preventDefault();
-		e.stopPropagation();
-	},
-	'input .js-search': _.debounce((e, t) => {
-		t.end.set(false);
-		t.sortDirection.set('asc');
-		t.page.set(0);
-		t.searchText.set(e.currentTarget.value);
-	}, 300),
-	'change .js-workspace': (e, t) => {
-		t.end.set(false);
-		t.sortDirection.set('asc');
-		t.page.set(0);
-		t.searchWorkspace.set(e.target.value);
-	},
-});
-
-Template.directory.onRendered(function() {
-	this.$('input').focus();
-	function setResults(result) {
-		if (!Array.isArray(result)) {
-			result = [];
-		}
-
-		if (this.page.get() > 0) {
-			return this.results.set([...this.results.get(), ...result]);
-		}
-
-		return this.results.set(result);
-	}
-
-	this.autorun(() => {
-		const searchConfig = {
-			text: this.searchText.get(),
-			workspace: this.searchWorkspace.get(),
-			type: this.searchType.get(),
-			sortBy: this.searchSortBy.get(),
-			sortDirection: this.sortDirection.get(),
-			limit: this.limit.get(),
-			page: this.page.get(),
-		};
-
-		if (this.end.get() || this.loading) {
-			return;
-		}
-
-		this.loading = true;
-		this.isLoading.set(true);
-
-		directorySearch(searchConfig, (result) => {
-			this.loading = false;
-			this.isLoading.set(false);
-			this.end.set(!result);
-
-			setResults.call(this, result);
-		});
-	});
-});
-
-Template.directory.onCreated(function() {
-	const viewType = settings.get('Accounts_Directory_DefaultView') || 'channels';
-	this.searchType = new ReactiveVar(viewType);
-	if (viewType === 'channels') {
-		this.searchSortBy = new ReactiveVar('usersCount');
-		this.sortDirection = new ReactiveVar('desc');
-	} else {
-		this.searchSortBy = new ReactiveVar('name');
-		this.sortDirection = new ReactiveVar('asc');
-	}
-	this.searchText = new ReactiveVar('');
-	this.searchWorkspace = new ReactiveVar('local');
-	this.limit = new ReactiveVar(0);
-	this.page = new ReactiveVar(0);
-	this.end = new ReactiveVar(false);
-
-	this.results = new ReactiveVar([]);
-
-	this.isLoading = new ReactiveVar(false);
-
-	this.canViewOtherUserInfo = new ReactiveVar(false);
-
-	this.autorun(() => {
-		this.canViewOtherUserInfo.set(hasAllPermission('view-full-other-user-info'));
-	});
-});
diff --git a/app/utils/server/functions/getDefaultUserFields.js b/app/utils/server/functions/getDefaultUserFields.js
index 492a3732018e..1fc95c087dd5 100644
--- a/app/utils/server/functions/getDefaultUserFields.js
+++ b/app/utils/server/functions/getDefaultUserFields.js
@@ -6,6 +6,7 @@ export const getDefaultUserFields = () => ({
 	statusDefault: 1,
 	statusText: 1,
 	statusConnection: 1,
+	bio: 1,
 	avatarOrigin: 1,
 	utcOffset: 1,
 	language: 1,
diff --git a/client/components/admin/settings/inputs/StringSettingInput.js b/client/components/admin/settings/inputs/StringSettingInput.js
index e044f0dfc01a..b5ddaa78672e 100644
--- a/client/components/admin/settings/inputs/StringSettingInput.js
+++ b/client/components/admin/settings/inputs/StringSettingInput.js
@@ -1,8 +1,17 @@
-import { Box, Field, Flex, TextAreaInput, TextInput } from '@rocket.chat/fuselage';
+import { Box, Field, Flex, TextAreaInput, TextInput, Icon, Callout, Margins } from '@rocket.chat/fuselage';
 import React from 'react';
 
 import { ResetSettingButton } from '../ResetSettingButton';
 
+export function Input({ hint, callout, ...props }) {
+	return <Field>
+		<StringSettingInput {...props} />
+		{hint && <Field.Hint>{hint}</Field.Hint>}
+		{callout && <Margins block='x16'>
+			<Callout type='warning'>{callout}</Callout></Margins>}
+	</Field>;
+}
+
 export function StringSettingInput({
 	_id,
 	label,
@@ -15,6 +24,8 @@ export function StringSettingInput({
 	hasResetButton,
 	onChangeValue,
 	onResetButtonClick,
+	addon,
+	...props
 }) {
 	const handleChange = (event) => {
 		onChangeValue(event.currentTarget.value);
@@ -39,6 +50,8 @@ export function StringSettingInput({
 					readOnly={readonly}
 					autoComplete={autocomplete === false ? 'off' : undefined}
 					onChange={handleChange}
+					{ ...addon && { addon: <Icon name={addon} size='20' /> }}
+					{ ...props }
 				/>
 				: <TextInput
 					data-qa-setting-id={_id}
@@ -49,7 +62,11 @@ export function StringSettingInput({
 					readOnly={readonly}
 					autoComplete={autocomplete === false ? 'off' : undefined}
 					onChange={handleChange}
+					{ ...addon && { addon: <Icon name={addon} size='20' /> }}
+					{ ...props }
 				/> }
 		</Field.Row>
 	</>;
 }
+
+Input.name = 'Input';
diff --git a/client/components/basic/Page.js b/client/components/basic/Page.js
index 37b39c81edec..d87cc9541350 100644
--- a/client/components/basic/Page.js
+++ b/client/components/basic/Page.js
@@ -16,9 +16,9 @@ export function Page(props) {
 export function PageHeader({ children, title, ...props }) {
 	const [border] = useContext(PageContext);
 	return <Box style={{ borderBlockEndColor: border ? 'var(--color-gray-lightest)' : 'transparent', transition: 'border-block-end-color 0.3s', borderBlockEnd: '2px solid transparent' }}>
-		<Margins all='x16'>
+		<Margins block='x16' all='x24'>
 			<Flex.Container wrap='no-wrap' alignItems='center' direction='row'>
-				<Box style={{ minHeight: '2.75rem' }} {...props}>
+				<Box {...props}>
 					<Margins inlineEnd='x8'>
 						<BurgerMenuButton />
 					</Margins>
diff --git a/client/main.js b/client/main.js
index a1013d38d72e..33ce4ec3a119 100644
--- a/client/main.js
+++ b/client/main.js
@@ -1,3 +1,4 @@
+import '@rocket.chat/fuselage-polyfills';
 import 'url-polyfill';
 
 import './importsCss';
diff --git a/client/routes.js b/client/routes.js
index d9da7ee66895..b14945c4ac8b 100644
--- a/client/routes.js
+++ b/client/routes.js
@@ -39,6 +39,8 @@ export const createTemplateForComponent = async (
 	props = {},
 	// eslint-disable-next-line new-cap
 	renderContainerView = () => HTML.DIV(),
+	url,
+
 ) => {
 	const name = component.displayName || component.name;
 
@@ -74,6 +76,13 @@ export const createTemplateForComponent = async (
 					children: React.createElement(TemplateComponent),
 				}), Template.instance().firstNode);
 		});
+
+		url && Template.instance().autorun(() => {
+			const routeName = FlowRouter.getRouteName();
+			if (routeName !== url) {
+				ReactDOM.unmountComponentAtNode(Template.instance().container);
+			}
+		});
 	});
 
 	Template[name].onDestroyed(() => {
@@ -136,11 +145,12 @@ FlowRouter.route('/home', {
 	},
 });
 
-FlowRouter.route('/directory', {
+FlowRouter.route('/directory/:tab?', {
 	name: 'directory',
 
-	action() {
-		BlazeLayout.render('main', { center: 'directory' });
+	async action() {
+		const { DirectoryPage } = await require('../app/ui/client/views/app/components/Directory');
+		BlazeLayout.render('main', { center: await createTemplateForComponent(DirectoryPage, { }, () => HTML.DIV({ style }), 'directory')}); // eslint-disable-line
 	},
 	triggersExit: [function() {
 		$('.main-content').addClass('rc-old');
@@ -150,10 +160,12 @@ FlowRouter.route('/directory', {
 FlowRouter.route('/account/:group?', {
 	name: 'account',
 
-	action(params) {
+	async action(params) {
 		if (!params.group) {
-			params.group = 'Preferences';
+			params.group = 'Profile';
 		}
+		const { Input } = await require('../client/components/admin/settings/inputs/StringSettingInput');
+		console.log(await createTemplateForComponent(Input, { }, () => HTML.DIV({ style }))); // eslint-disable-line
 		params.group = s.capitalize(params.group, true);
 		BlazeLayout.render('main', { center: `account${ params.group }` });
 	},
diff --git a/client/startup/startup.js b/client/startup/startup.js
index 685428df2379..d9fd3f37b5aa 100644
--- a/client/startup/startup.js
+++ b/client/startup/startup.js
@@ -6,6 +6,7 @@ import { UserPresence } from 'meteor/konecty:user-presence';
 import { Accounts } from 'meteor/accounts-base';
 import toastr from 'toastr';
 
+
 import hljs from '../../app/markdown/lib/hljs';
 import { fireGlobalEvent } from '../../app/ui-utils';
 import { getUserPreference } from '../../app/utils';
diff --git a/ee/app/engagement-dashboard/client/components/EngagementDashboardPage.js b/ee/app/engagement-dashboard/client/components/EngagementDashboardPage.js
index f9843adf08c4..e77a75fbac52 100644
--- a/ee/app/engagement-dashboard/client/components/EngagementDashboardPage.js
+++ b/ee/app/engagement-dashboard/client/components/EngagementDashboardPage.js
@@ -1,5 +1,5 @@
 import { Box, Margins, Tabs } from '@rocket.chat/fuselage';
-import React from 'react';
+import React, { useMemo } from 'react';
 
 import { useTranslation } from '../../../../../client/contexts/TranslationContext';
 import { Page } from '../../../../../client/components/basic/Page';
@@ -7,13 +7,15 @@ import { UsersTab } from './UsersTab';
 import { MessagesTab } from './MessagesTab';
 import { ChannelsTab } from './ChannelsTab';
 
+const style = { padding: 0 };
+
 export function EngagementDashboardPage({
 	tab = 'users',
 	onSelectTab,
 }) {
 	const t = useTranslation();
 
-	const handleTabClick = onSelectTab ? (tab) => () => onSelectTab(tab) : () => undefined;
+	const handleTabClick = useMemo(() => (onSelectTab ? (tab) => () => onSelectTab(tab) : () => undefined), [onSelectTab]);
 
 	return <Page>
 		<Page.Header title={t('Engagement_Dashboard')} />
@@ -22,7 +24,7 @@ export function EngagementDashboardPage({
 			<Tabs.Item selected={tab === 'messages'} onClick={handleTabClick('messages')}>{t('Messages')}</Tabs.Item>
 			<Tabs.Item selected={tab === 'channels'} onClick={handleTabClick('channels')}>{t('Channels')}</Tabs.Item>
 		</Tabs>
-		<Page.Content style={{ padding: 0 }}>
+		<Page.Content style={style}>
 			<Margins all='x24'>
 				<Box>
 					{(tab === 'users' && <UsersTab />)
diff --git a/ee/app/engagement-dashboard/client/components/Section.js b/ee/app/engagement-dashboard/client/components/Section.js
index 94c9e22cec0e..8d52f7be6272 100644
--- a/ee/app/engagement-dashboard/client/components/Section.js
+++ b/ee/app/engagement-dashboard/client/components/Section.js
@@ -7,7 +7,7 @@ export function Section({
 	filter = <InputBox.Skeleton />,
 }) {
 	return <Box>
-		<Margins block='x16'>
+		<Margins block='x24'>
 			<Flex.Container alignItems='center' wrap='no-wrap'>
 				<Box>
 					<Flex.Item grow={1}>
diff --git a/package-lock.json b/package-lock.json
index 53f7a877b7d5..12ebb5844d59 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2541,6 +2541,11 @@
 			"integrity": "sha512-QPcGmICAPbGLGb6F/yNf/KzKqvFx8z5qx3D1yFqVAjoFmXK35EgyW+cJ57Te3CNsmzblwtzakLGFqHPqrfb4Tw==",
 			"dev": true
 		},
+		"@juggle/resize-observer": {
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.1.2.tgz",
+			"integrity": "sha512-Yao5AFq8HKHsyLCLZn15BybqN67cdbgDbVDnnaN54IUaffkwDHj0VMgBp1C/IxOsFsNltsI7LdnW4GEHmQarLQ=="
+		},
 		"@kossnocorp/desvg": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/@kossnocorp/desvg/-/desvg-0.2.0.tgz",
@@ -2865,9 +2870,9 @@
 			}
 		},
 		"@rocket.chat/css-in-js": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/css-in-js/-/css-in-js-0.6.1.tgz",
-			"integrity": "sha512-LNvPIj06YQmEI7kl1RFHAOk6ts95lCczafl5Nqx5jXo5SY8XKCjrR0qK1awD5sTSU9mGrDv/rE3tPTKbQPIH6A==",
+			"version": "0.6.2",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/css-in-js/-/css-in-js-0.6.2.tgz",
+			"integrity": "sha512-zcuqSqdhq6EvlJJctQkO/UG56b08DA19ERdA/mnFOlXZCFD+yba3ByUHOOLXtgN45M04Qj5zZuIheGzoa+asfQ==",
 			"requires": {
 				"@emotion/hash": "^0.8.0",
 				"@emotion/stylis": "^0.8.5"
@@ -2890,37 +2895,46 @@
 			}
 		},
 		"@rocket.chat/fuselage": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.6.1.tgz",
-			"integrity": "sha512-B3Q7hoD3gw2qfbUmqwT8byOiRnJQju3ozHJcBMyJ8z9qFDdf2qBpMbU0FQ8Gq/lrIy4cSv17+kI5RtOURyfadQ==",
+			"version": "0.6.2",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.6.2.tgz",
+			"integrity": "sha512-BvaoYgp4eTPv0+3sCzYMQelye4cQ/f5GRFlASFFL6kRevvczNaR/RPUKPH1oIHsbEbfioBRw9WsUjqfZ0qo8NQ==",
 			"requires": {
-				"@rocket.chat/css-in-js": "^0.6.1",
-				"@rocket.chat/fuselage-tokens": "^0.6.1",
-				"@rocket.chat/icons": "^0.6.1"
+				"@rocket.chat/css-in-js": "^0.6.2",
+				"@rocket.chat/fuselage-tokens": "^0.6.2",
+				"@rocket.chat/icons": "^0.6.2"
 			}
 		},
 		"@rocket.chat/fuselage-hooks": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-hooks/-/fuselage-hooks-0.6.1.tgz",
-			"integrity": "sha512-/M4lqd3D443GgKstncUokNgJYii7BgiaDLlIgV8LhDcWeLPzc2xDlRfrSmFN7MGcazmrwECq5DUmDSnbVsoCyw=="
+			"version": "0.6.2",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-hooks/-/fuselage-hooks-0.6.2.tgz",
+			"integrity": "sha512-43hjN6mlsUE331dq79BKncsfXD8rsoxODgBG6cEn62Y7Ghq5TKE5HYZ7UVPgeVfONarbA7QwyjSjSrNgzDvR+Q=="
+		},
+		"@rocket.chat/fuselage-polyfills": {
+			"version": "0.6.2",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-polyfills/-/fuselage-polyfills-0.6.2.tgz",
+			"integrity": "sha512-S3nxW97C/V9/vo+eS+bPXFvi/Na/0ktmPZREi+K++ZXJAhxAI3+F5KZZKJW8bCXeo4AEfJ9+7KYgDu4mJ29GjA==",
+			"requires": {
+				"@juggle/resize-observer": "^3.1.2",
+				"focus-visible": "^5.0.2"
+			}
 		},
 		"@rocket.chat/fuselage-tokens": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-tokens/-/fuselage-tokens-0.6.1.tgz",
-			"integrity": "sha512-8G3h9PTT6I57wddxvJCBqLmGJwzce3v6cSTOjcvnMAQ8xYEjY+NXK2Asq/Xh4Nxwhqwl7vsQLHbBz6XBCNqWZQ=="
+			"version": "0.6.2",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-tokens/-/fuselage-tokens-0.6.2.tgz",
+			"integrity": "sha512-PgmagdGzPmh1Dxbkf2YLbPuPjFKYh17CXLuWo0WafxlTrIbMKfw3mq0AJJ1YZrpj6K9tsO6Ty8bIliNRRgXl2A=="
 		},
 		"@rocket.chat/fuselage-ui-kit": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-ui-kit/-/fuselage-ui-kit-0.6.1.tgz",
-			"integrity": "sha512-Pj2vU4NXmZl+WznJVtVWBD9fHDyL5kt1y0rGDteoOobHLrCnJVwSCTvBDcgO4rTlf5seiqV/qTE7Qdo0Fm5vdg==",
+			"version": "0.6.2",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-ui-kit/-/fuselage-ui-kit-0.6.2.tgz",
+			"integrity": "sha512-b4Q/OG/Xy7IiTvGv0YDFvMcCadGzpb5YG5AX4YhCORTGKHwi1vZYQBPvhsjtfInHUTjAmwPTP6SY2t9ryZ9YjQ==",
 			"requires": {
-				"@rocket.chat/ui-kit": "^0.6.1"
+				"@rocket.chat/ui-kit": "^0.6.2"
 			}
 		},
 		"@rocket.chat/icons": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/icons/-/icons-0.6.1.tgz",
-			"integrity": "sha512-uXg4oXscOQKhNP5DxF/O5f9zG8rKfLVJoXzv3AhNf/YGutqwUzLUCzt3O6bO2aeL43GjdfhxD9tZnpZlviZM9Q=="
+			"version": "0.6.2",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/icons/-/icons-0.6.2.tgz",
+			"integrity": "sha512-+INyHScojyrUjiJ7LWwutydFdrxzRK+QRUpT/W1R0nj1TcG4P4ey7xxad2eNt7KNCZ+Hu+AyxOeEHtp8wVEc+w=="
 		},
 		"@rocket.chat/livechat": {
 			"version": "1.4.0",
@@ -3010,9 +3024,9 @@
 			}
 		},
 		"@rocket.chat/ui-kit": {
-			"version": "0.6.1",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.6.1.tgz",
-			"integrity": "sha512-YlcrDZta5CiqIF6F4w+V6zpOGlb/O9vNKctAfnM7YPBnIz2ERnjZ+jkGH5mD6yfLaQa0YMdMseJXofWlLrPayw=="
+			"version": "0.6.2",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.6.2.tgz",
+			"integrity": "sha512-rB2a2gnGZp7wZQaV8qwg9Hqn3ltMzP9DwepRs9vLzeTh/swgpwVXY4ZcbWwaeelZNKpUqDsUxoaQqReToMRAZA=="
 		},
 		"@samverschueren/stream-to-observable": {
 			"version": "0.3.0",
@@ -15068,6 +15082,11 @@
 			"integrity": "sha512-Dx69IXGCq1qsUExWuG+5wkiMqVM/zGx/reXSJSLogECwp3x6KeNQZ+NAetgxEFpnC41rD8U3+jRCW68+LNzdtw==",
 			"dev": true
 		},
+		"focus-visible": {
+			"version": "5.0.2",
+			"resolved": "https://registry.npmjs.org/focus-visible/-/focus-visible-5.0.2.tgz",
+			"integrity": "sha512-zT2fj/bmOgEBjqGbURGlowTmCwsIs3bRDMr/sFZz8Ly7VkEiwuCn9swNTL3pPuf8Oua2de7CLuKdnuNajWdDsQ=="
+		},
 		"follow-redirects": {
 			"version": "1.5.10",
 			"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
diff --git a/package.json b/package.json
index 4cef01785a23..ce8d80ed754b 100644
--- a/package.json
+++ b/package.json
@@ -128,12 +128,13 @@
 		"@nivo/heatmap": "^0.61.0",
 		"@nivo/line": "^0.61.1",
 		"@nivo/pie": "^0.61.1",
+		"@rocket.chat/fuselage-polyfills": "^0.6.2",
 		"@rocket.chat/apps-engine": "^1.13.0-beta.3003",
-		"@rocket.chat/fuselage": "^0.6.1",
-		"@rocket.chat/fuselage-hooks": "^0.6.1",
-		"@rocket.chat/fuselage-ui-kit": "^0.6.1",
-		"@rocket.chat/icons": "^0.6.1",
-		"@rocket.chat/ui-kit": "^0.6.1",
+		"@rocket.chat/fuselage": "^0.6.2",
+		"@rocket.chat/fuselage-hooks": "^0.6.2",
+		"@rocket.chat/fuselage-ui-kit": "^0.6.2",
+		"@rocket.chat/icons": "^0.6.2",
+		"@rocket.chat/ui-kit": "^0.6.2",
 		"@slack/client": "^4.8.0",
 		"adm-zip": "RocketChat/adm-zip",
 		"archiver": "^3.0.0",
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 491f55fb055e..db6b1b166bc8 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -519,6 +519,8 @@
   "Blockstack_ButtonLabelText": "Button label text",
   "Blockstack_Generate_Username": "Generate username",
   "Body": "Body",
+  "Bio": "Bio",
+  "Bio_Placeholder": "Bio Placeholder",
   "bold": "bold",
   "bot_request": "Bot request",
   "BotHelpers_userFields": "User Fields",
@@ -1465,6 +1467,7 @@
   "expression": "Expression",
   "Extended": "Extended",
   "External_Domains": "External Domains",
+  "External_Users": "External Users",
   "External_Queue_Service_URL": "External Queue Service URL",
   "External_Service": "External Service",
   "Facebook_Page": "Facebook Page",
@@ -1939,6 +1942,7 @@
   "Join_the_given_channel": "Join the given channel",
   "Join_video_call": "Join video call",
   "Joined": "Joined",
+  "Joined_at": "Joined at",
   "Jump": "Jump",
   "Jump_to_first_unread": "Jump to first unread",
   "Jump_to_message": "Jump to Message",
diff --git a/server/methods/browseChannels.js b/server/methods/browseChannels.js
index a0b61baad54c..e1433d25d780 100644
--- a/server/methods/browseChannels.js
+++ b/server/methods/browseChannels.js
@@ -55,7 +55,7 @@ Meteor.methods({
 			return;
 		}
 
-		if (!['name', 'createdAt', 'usersCount', ...type === 'channels' ? ['usernames', 'lastMessage'] : [], ...type === 'users' ? ['username', 'email'] : []].includes(sortBy)) {
+		if (!['name', 'createdAt', 'usersCount', ...type === 'channels' ? ['usernames', 'lastMessage'] : [], ...type === 'users' ? ['username', 'email', 'bio'] : []].includes(sortBy)) {
 			return;
 		}
 
@@ -78,16 +78,22 @@ Meteor.methods({
 				return;
 			}
 
-			const result = Rooms.findByNameAndType(regex, 'c', {
+			const result = Rooms.findByNameOrFNameAndType(regex, 'c', {
 				...pagination,
-				sort,
+				sort: {
+					featured: -1,
+					...sort,
+				},
 				fields: {
 					description: 1,
 					topic: 1,
 					name: 1,
+					fname: 1,
 					lastMessage: 1,
 					ts: 1,
 					archived: 1,
+					default: 1,
+					featured: 1,
 					usersCount: 1,
 				},
 			});
@@ -118,6 +124,7 @@ Meteor.methods({
 			fields: {
 				username: 1,
 				name: 1,
+				bio: 1,
 				createdAt: 1,
 				emails: 1,
 				federation: 1,
@@ -136,7 +143,7 @@ Meteor.methods({
 		const total = result.count(); // count ignores the `skip` and `limit` options
 		const results = result.fetch();
 
-		// Try to find federated users, when appliable
+		// Try to find federated users, when applicable
 		if (isFederationEnabled() && type === 'users' && workspace === 'external' && text.indexOf('@') !== -1) {
 			const users = federationSearchUsers(text);
 
@@ -147,6 +154,7 @@ Meteor.methods({
 				results.unshift({
 					username: user.username,
 					name: user.name,
+					bio: user.bio,
 					emails: user.emails,
 					federation: user.federation,
 					isRemote: true,
diff --git a/server/methods/getUsersOfRoom.js b/server/methods/getUsersOfRoom.js
index 951e76091e88..43e2a8dca8b3 100644
--- a/server/methods/getUsersOfRoom.js
+++ b/server/methods/getUsersOfRoom.js
@@ -1,12 +1,16 @@
 import { Meteor } from 'meteor/meteor';
+import s from 'underscore.string';
 
 import { Subscriptions } from '../../app/models';
 import { hasPermission } from '../../app/authorization';
 import { settings } from '../../app/settings';
 
-function findUsers({ rid, status, skip, limit }) {
+function findUsers({ rid, status, skip, limit, filter = '' }) {
+	const regex = new RegExp(s.trim(s.escapeRegExp(filter)), 'i');
 	return Subscriptions.model.rawCollection().aggregate([
-		{ $match: { rid } },
+		{
+			$match: { rid },
+		},
 		{
 			$lookup:
 				{
@@ -25,6 +29,7 @@ function findUsers({ rid, status, skip, limit }) {
 			},
 		},
 		...status ? [{ $match: { 'u.status': status } }] : [],
+		...filter.trim() ? [{ $match: { $or: [{ 'u.name': regex }, { 'u.username': regex }] } }] : [],
 		{
 			$sort: {
 				[settings.get('UI_Use_Real_Name') ? 'u.name' : 'u.username']: 1,
@@ -43,7 +48,7 @@ function findUsers({ rid, status, skip, limit }) {
 }
 
 Meteor.methods({
-	async getUsersOfRoom(rid, showAll, { limit, skip } = {}) {
+	async getUsersOfRoom(rid, showAll, { limit, skip } = {}, filter) {
 		const userId = Meteor.userId();
 		if (!userId) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'getUsersOfRoom' });
@@ -59,13 +64,14 @@ Meteor.methods({
 		}
 
 		const total = Subscriptions.findByRoomIdWhenUsernameExists(rid).count();
-		const users = await findUsers({ rid, status: { $ne: 'offline' }, limit, skip });
+		const users = await findUsers({ rid, status: { $ne: 'offline' }, limit, skip, filter });
 		if (showAll && (!limit || users.length < limit)) {
 			const offlineUsers = await findUsers({
 				rid,
 				status: { $eq: 'offline' },
 				limit: limit ? limit - users.length : 0,
 				skip: skip || 0,
+				filter,
 			});
 
 			return {
diff --git a/server/methods/saveUserProfile.js b/server/methods/saveUserProfile.js
index b197a3a038f4..53cd761d6a1f 100644
--- a/server/methods/saveUserProfile.js
+++ b/server/methods/saveUserProfile.js
@@ -57,6 +57,15 @@ Meteor.methods({
 			Meteor.call('setUserStatus', null, settings.statusText);
 		}
 
+		if (settings.bio) {
+			if (typeof settings.bio !== 'string' || settings.bio.length > 260) {
+				throw new Meteor.Error('error-invalid-field', 'bio', {
+					method: 'saveUserProfile',
+				});
+			}
+			Users.setBio(user._id, settings.bio.trim());
+		}
+
 		if (settings.email) {
 			if (!checkPassword(user, settings.typedPassword)) {
 				throw new Meteor.Error('error-invalid-password', 'Invalid password', {

From 4cc8092dc94b2d65c4e3bd735dbb92c906018018 Mon Sep 17 00:00:00 2001
From: SingLi <Sing-Li@users.noreply.github.com>
Date: Tue, 31 Mar 2020 21:39:04 -0400
Subject: [PATCH 125/223] Single codebase announcement (#17081)

---
 README.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 68c9519112a6..86ad92ff9efa 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,7 @@
 [![Code Climate](https://codeclimate.com/github/RocketChat/Rocket.Chat/badges/gpa.svg)](https://codeclimate.com/github/RocketChat/Rocket.Chat)
 [![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)](https://github.com/RocketChat/Rocket.Chat/raw/master/LICENSE)
 
-
-* [**NEW!** Help Wanted](#help-wanted)
+* [**NEW!** Rocket.Chat Moving to a Single Codebase](#moving-to-one-codebase) 
 * [Community](#community)
 * [Mobile Apps](#mobile-apps)
 * [Desktop Apps](#desktop-apps)
@@ -58,8 +57,13 @@
   * [Translations](#translations)
   * [How to Contribute](#how-to-contribute)
 * [Credits](#credits)
+* [Help Wanted](#help-wanted)
 * [Donate](#donate)
 
+# Moving to a Single Codebase
+
+Rocket.Chat is moving to a single codebase. Get to know the reasons and how the community will benefit from it. Read the [details](https://rocket.chat/2020/03/28/moving-to-a-single-codebase/).
+
 # Help Wanted
 
 At Rocket.Chat, our community drives *everything* we do. The Rocket.Chat team is expanding, and we know no better place to find qualified new team members than *right here* - in our Github  community.

From 5d7092f029072d441887eb118a98353ecaa90410 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Wed, 1 Apr 2020 00:56:38 -0300
Subject: [PATCH 126/223] [FIX] Member's list only filtering users already on
 screen (#17110)


From b4d99fe0d8e71e203c35a30f41986256460ffcf7 Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Wed, 1 Apr 2020 01:23:50 -0300
Subject: [PATCH 127/223] Regression: Remove old and closed Omnichannel
 inquiries (#17113)

---
 server/startup/migrations/index.js |  1 +
 server/startup/migrations/v180.js  | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 server/startup/migrations/v180.js

diff --git a/server/startup/migrations/index.js b/server/startup/migrations/index.js
index 6ad1177c8965..da1f016bf8f2 100644
--- a/server/startup/migrations/index.js
+++ b/server/startup/migrations/index.js
@@ -177,4 +177,5 @@ import './v176';
 import './v177';
 import './v178';
 import './v179';
+import './v180';
 import './xrun';
diff --git a/server/startup/migrations/v180.js b/server/startup/migrations/v180.js
new file mode 100644
index 000000000000..b7c845caa21f
--- /dev/null
+++ b/server/startup/migrations/v180.js
@@ -0,0 +1,20 @@
+import { Migrations } from '../../../app/migrations/server';
+import { LivechatRooms, LivechatInquiry } from '../../../app/models/server';
+
+Migrations.add({
+	version: 180,
+	up() {
+		// Remove Old Omnichannel Inquiries related to rooms already closed
+		LivechatInquiry.find().forEach((inquiry) => {
+			const { rid, status } = inquiry;
+			if (status === 'closed') {
+				return LivechatInquiry.removeByRoomId(rid);
+			}
+
+			const room = LivechatRooms.findOneById(rid, { closedAt: 1 });
+			if (!room || room.closedAt) {
+				LivechatInquiry.removeByRoomId(rid);
+			}
+		});
+	},
+});

From 506d7fc327d565010f549e86f2adcb795013a1cc Mon Sep 17 00:00:00 2001
From: Douglas Gubert <d-gubert@users.noreply.github.com>
Date: Wed, 1 Apr 2020 01:24:42 -0300
Subject: [PATCH 128/223] [IMPROVE] Apps Engine: Reduce some stream calls and
 remove a find user from the app's status changes (#17115)

---
 app/apps/server/bridges/activation.js       | 18 ++--------
 app/apps/server/communication/websockets.js | 38 ++++++++++-----------
 app/models/server/raw/Users.js              | 15 ++++++++
 3 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/app/apps/server/bridges/activation.js b/app/apps/server/bridges/activation.js
index b926061ed506..8f3500de68ae 100644
--- a/app/apps/server/bridges/activation.js
+++ b/app/apps/server/bridges/activation.js
@@ -1,6 +1,4 @@
-import { STATUS_MAP } from '../../../../imports/users-presence/server/activeUsers';
-import { Users } from '../../../models/server';
-import { Notifications } from '../../../notifications/server';
+import { Users } from '../../../models/server/raw';
 
 export class AppActivationBridge {
 	constructor(orch) {
@@ -20,19 +18,9 @@ export class AppActivationBridge {
 	}
 
 	async appStatusChanged(app, status) {
-		const user = Users.findOneByAppId(app.getID(), { fields: { username: 1 } });
+		const userStatus = ['auto_enabled', 'manually_enabled'].includes(status) ? 'online' : 'offline';
 
-		if (user) {
-			const { _id, username } = user;
-			const userStatus = ['auto_enabled', 'manually_enabled'].includes(status) ? 'online' : 'offline';
-
-			Users.updateStatusById(_id, userStatus);
-			Notifications.notifyLogged('user-status', [
-				_id,
-				username,
-				STATUS_MAP[userStatus],
-			]);
-		}
+		await Users.updateStatusByAppId(app.getID(), userStatus);
 
 		await this.orch.getNotifier().appStatusUpdated(app.getID(), status);
 	}
diff --git a/app/apps/server/communication/websockets.js b/app/apps/server/communication/websockets.js
index ec3f54b662a9..e5615c0e2d91 100644
--- a/app/apps/server/communication/websockets.js
+++ b/app/apps/server/communication/websockets.js
@@ -34,7 +34,7 @@ export class AppServerListener {
 
 	async onAppAdded(appId) {
 		await this.orch.getManager().loadOne(appId);
-		this.clientStreamer.emit(AppEvents.APP_ADDED, appId);
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.APP_ADDED, appId);
 	}
 
 
@@ -49,17 +49,17 @@ export class AppServerListener {
 
 		if (AppStatusUtils.isEnabled(status)) {
 			await this.orch.getManager().enable(appId).catch(console.error);
-			this.clientStreamer.emit(AppEvents.APP_STATUS_CHANGE, { appId, status });
+			this.clientStreamer.emitWithoutBroadcast(AppEvents.APP_STATUS_CHANGE, { appId, status });
 		} else if (AppStatusUtils.isDisabled(status)) {
 			await this.orch.getManager().disable(appId, status, true).catch(console.error);
-			this.clientStreamer.emit(AppEvents.APP_STATUS_CHANGE, { appId, status });
+			this.clientStreamer.emitWithoutBroadcast(AppEvents.APP_STATUS_CHANGE, { appId, status });
 		}
 	}
 
 	async onAppSettingUpdated({ appId, setting }) {
 		this.received.set(`${ AppEvents.APP_SETTING_UPDATED }_${ appId }_${ setting.id }`, { appId, setting, when: new Date() });
 		await this.orch.getManager().getSettingsManager().updateAppSetting(appId, setting);
-		this.clientStreamer.emit(AppEvents.APP_SETTING_UPDATED, { appId });
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.APP_SETTING_UPDATED, { appId });
 	}
 
 	async onAppUpdated(appId) {
@@ -68,7 +68,7 @@ export class AppServerListener {
 		const storageItem = await this.orch.getStorage().retrieveOne(appId);
 
 		await this.orch.getManager().update(storageItem.zip);
-		this.clientStreamer.emit(AppEvents.APP_UPDATED, appId);
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.APP_UPDATED, appId);
 	}
 
 	async onAppRemoved(appId) {
@@ -79,23 +79,23 @@ export class AppServerListener {
 		}
 
 		await this.orch.getManager().remove(appId);
-		this.clientStreamer.emit(AppEvents.APP_REMOVED, appId);
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.APP_REMOVED, appId);
 	}
 
 	async onCommandAdded(command) {
-		this.clientStreamer.emit(AppEvents.COMMAND_ADDED, command);
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.COMMAND_ADDED, command);
 	}
 
 	async onCommandDisabled(command) {
-		this.clientStreamer.emit(AppEvents.COMMAND_DISABLED, command);
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.COMMAND_DISABLED, command);
 	}
 
 	async onCommandUpdated(command) {
-		this.clientStreamer.emit(AppEvents.COMMAND_UPDATED, command);
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.COMMAND_UPDATED, command);
 	}
 
 	async onCommandRemoved(command) {
-		this.clientStreamer.emit(AppEvents.COMMAND_REMOVED, command);
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.COMMAND_REMOVED, command);
 	}
 }
 
@@ -120,12 +120,12 @@ export class AppServerNotifier {
 
 	async appAdded(appId) {
 		this.engineStreamer.emit(AppEvents.APP_ADDED, appId);
-		this.clientStreamer.emit(AppEvents.APP_ADDED, appId);
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.APP_ADDED, appId);
 	}
 
 	async appRemoved(appId) {
 		this.engineStreamer.emit(AppEvents.APP_REMOVED, appId);
-		this.clientStreamer.emit(AppEvents.APP_REMOVED, appId);
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.APP_REMOVED, appId);
 	}
 
 	async appUpdated(appId) {
@@ -135,7 +135,7 @@ export class AppServerNotifier {
 		}
 
 		this.engineStreamer.emit(AppEvents.APP_UPDATED, appId);
-		this.clientStreamer.emit(AppEvents.APP_UPDATED, appId);
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.APP_UPDATED, appId);
 	}
 
 	async appStatusUpdated(appId, status) {
@@ -148,7 +148,7 @@ export class AppServerNotifier {
 		}
 
 		this.engineStreamer.emit(AppEvents.APP_STATUS_CHANGE, { appId, status });
-		this.clientStreamer.emit(AppEvents.APP_STATUS_CHANGE, { appId, status });
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.APP_STATUS_CHANGE, { appId, status });
 	}
 
 	async appSettingsChange(appId, setting) {
@@ -158,26 +158,26 @@ export class AppServerNotifier {
 		}
 
 		this.engineStreamer.emit(AppEvents.APP_SETTING_UPDATED, { appId, setting });
-		this.clientStreamer.emit(AppEvents.APP_SETTING_UPDATED, { appId });
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.APP_SETTING_UPDATED, { appId });
 	}
 
 	async commandAdded(command) {
 		this.engineStreamer.emit(AppEvents.COMMAND_ADDED, command);
-		this.clientStreamer.emit(AppEvents.COMMAND_ADDED, command);
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.COMMAND_ADDED, command);
 	}
 
 	async commandDisabled(command) {
 		this.engineStreamer.emit(AppEvents.COMMAND_DISABLED, command);
-		this.clientStreamer.emit(AppEvents.COMMAND_DISABLED, command);
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.COMMAND_DISABLED, command);
 	}
 
 	async commandUpdated(command) {
 		this.engineStreamer.emit(AppEvents.COMMAND_UPDATED, command);
-		this.clientStreamer.emit(AppEvents.COMMAND_UPDATED, command);
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.COMMAND_UPDATED, command);
 	}
 
 	async commandRemoved(command) {
 		this.engineStreamer.emit(AppEvents.COMMAND_REMOVED, command);
-		this.clientStreamer.emit(AppEvents.COMMAND_REMOVED, command);
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.COMMAND_REMOVED, command);
 	}
 }
diff --git a/app/models/server/raw/Users.js b/app/models/server/raw/Users.js
index 30f45692d77e..fcb6b9955bce 100644
--- a/app/models/server/raw/Users.js
+++ b/app/models/server/raw/Users.js
@@ -224,4 +224,19 @@ export class UsersRaw extends BaseRaw {
 
 		return this.update({ _id }, update);
 	}
+
+	updateStatusByAppId(appId, status) {
+		const query = {
+			appId,
+			status: { $ne: status },
+		};
+
+		const update = {
+			$set: {
+				status,
+			},
+		};
+
+		return this.update(query, update, { multi: true });
+	}
 }

From aa79e0f539ab9b19b14a9e25e2627478d90221d7 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Wed, 1 Apr 2020 02:38:57 -0300
Subject: [PATCH 129/223] Regression: fix fuselage import, remove directory css
 (#17116)

---
 .../views/app/components/Directory/index.js   | 10 +--
 app/ui/client/views/app/directory.css         | 78 -------------------
 client/components/admin/settings/GroupPage.js |  4 +-
 client/components/basic/Page.js               |  9 ++-
 package-lock.json                             | 56 ++++++-------
 package.json                                  | 12 +--
 6 files changed, 48 insertions(+), 121 deletions(-)
 delete mode 100644 app/ui/client/views/app/directory.css

diff --git a/app/ui/client/views/app/components/Directory/index.js b/app/ui/client/views/app/components/Directory/index.js
index 0908510cc2f9..85349d4cf539 100644
--- a/app/ui/client/views/app/components/Directory/index.js
+++ b/app/ui/client/views/app/components/Directory/index.js
@@ -28,12 +28,12 @@ export function DirectoryPage() {
 
 	return <Avatar.Context.Provider value={avatarBase}><Page>
 		<Page.Header title={t('Directory')} />
+		<Tabs>
+			<Tabs.Item selected={tab === 'channels'} onClick={handleTabClick('channels')}>{t('Channels')}</Tabs.Item>
+			<Tabs.Item selected={tab === 'users'} onClick={handleTabClick('users')}>{t('Users')}</Tabs.Item>
+			{ federationEnabled && <Tabs.Item selected={tab === 'external'} onClick={handleTabClick('external')}>{t('External_Users')}</Tabs.Item> }
+		</Tabs>
 		<Page.Content style={style}>
-			<Tabs>
-				<Tabs.Item selected={tab === 'channels'} onClick={handleTabClick('channels')}>{t('Channels')}</Tabs.Item>
-				<Tabs.Item selected={tab === 'users'} onClick={handleTabClick('users')}>{t('Users')}</Tabs.Item>
-				{ federationEnabled && <Tabs.Item selected={tab === 'external'} onClick={handleTabClick('external')}>{t('External_Users')}</Tabs.Item> }
-			</Tabs>
 			<Margins inline='x24'>
 				<Box>
 					{
diff --git a/app/ui/client/views/app/directory.css b/app/ui/client/views/app/directory.css
deleted file mode 100644
index 0caa385fec3b..000000000000
--- a/app/ui/client/views/app/directory.css
+++ /dev/null
@@ -1,78 +0,0 @@
-.directory {
-	display: flex;
-	flex-direction: column;
-
-	height: 100vh;
-
-	padding: 1.25rem 2rem;
-
-	& &__search-form {
-		display: grid;
-		grid-gap: 0 10px;
-
-		grid-template-columns: 2fr auto;
-	}
-
-	& &__channel-name,
-	& &__user-name,
-	& &__user-count,
-	& &__username,
-	& &__email,
-	& &__domain {
-		overflow: hidden;
-
-		white-space: nowrap;
-		text-overflow: ellipsis;
-	}
-
-	& &__user-count {
-		width: 80px;
-	}
-
-	& &__user-name,
-	& &__username,
-	& &__email,
-	& &__domain {
-		min-width: 100px;
-	}
-
-	.rc-table-content {
-		display: flex;
-		overflow-x: auto;
-		flex-direction: column;
-		flex: 1 1 100%;
-
-		height: 100vh;
-
-		& .js-sort {
-			cursor: pointer;
-
-			&.is-sorting .table-fake-th .rc-icon {
-				opacity: 1;
-			}
-		}
-
-		& .table-fake-th {
-			&:hover .rc-icon {
-				opacity: 1;
-			}
-
-			& .rc-icon {
-				transition: opacity 0.3s;
-
-				opacity: 0;
-
-				font-size: 1rem;
-			}
-		}
-	}
-
-	@media (width <= 980px) {
-		.rc-table-content {
-			& th:not(:first-child),
-			& td:not(:first-child) {
-				display: none;
-			}
-		}
-	}
-}
diff --git a/client/components/admin/settings/GroupPage.js b/client/components/admin/settings/GroupPage.js
index dda4c13abad5..75ff9f5213da 100644
--- a/client/components/admin/settings/GroupPage.js
+++ b/client/components/admin/settings/GroupPage.js
@@ -46,7 +46,7 @@ export function GroupPage({ children, headerButtons, save, cancel, _id, i18nLabe
 			</ButtonGroup>
 		</Page.Header>
 
-		<Page.Content>
+		<Page.ContentShadowScroll>
 			<Box style={useMemo(() => ({ margin: '0 auto', width: '100%', maxWidth: '590px' }), [])}>
 				{t.has(i18nDescription) && <Paragraph hintColor>{t(i18nDescription)}</Paragraph>}
 
@@ -54,7 +54,7 @@ export function GroupPage({ children, headerButtons, save, cancel, _id, i18nLabe
 					{children}
 				</Accordion>
 			</Box>
-		</Page.Content>
+		</Page.ContentShadowScroll>
 	</Page>;
 }
 
diff --git a/client/components/basic/Page.js b/client/components/basic/Page.js
index d87cc9541350..afa756eb2f99 100644
--- a/client/components/basic/Page.js
+++ b/client/components/basic/Page.js
@@ -32,12 +32,17 @@ export function PageHeader({ children, title, ...props }) {
 	</Box>;
 }
 
-export function PageContent(props) {
+export function PageContentShadowScroll({ onScrollContent, ...props }) {
 	const [, setBorder] = useContext(PageContext);
-	return <Scrollable onScrollContent={({ top }) => { setBorder(!top); }}>
+	return <PageContent onScrollContent={({ top, ...args }) => { setBorder(!top); onScrollContent && onScrollContent({ top, ...args }); }} { ...props } ></PageContent>;
+}
+
+export function PageContent({ onScrollContent, ...props }) {
+	return <Scrollable onScrollContent={onScrollContent} >
 		<Box style={useMemo(() => ({ padding: '1rem' }), [])} {...props} />
 	</Scrollable>;
 }
 
 Page.Header = PageHeader;
 Page.Content = PageContent;
+Page.ContentShadowScroll = PageContentShadowScroll;
diff --git a/package-lock.json b/package-lock.json
index 12ebb5844d59..3c3deb7a3daa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2870,9 +2870,9 @@
 			}
 		},
 		"@rocket.chat/css-in-js": {
-			"version": "0.6.2",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/css-in-js/-/css-in-js-0.6.2.tgz",
-			"integrity": "sha512-zcuqSqdhq6EvlJJctQkO/UG56b08DA19ERdA/mnFOlXZCFD+yba3ByUHOOLXtgN45M04Qj5zZuIheGzoa+asfQ==",
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/css-in-js/-/css-in-js-0.7.0.tgz",
+			"integrity": "sha512-LlfGPXxwCIDg3iXRWioY9xPdXCGMEbWy7RMxoZPT5CeUmxsMdxBmvjXslaiPFp2Qg8qperQynKCFjMoe3YALSA==",
 			"requires": {
 				"@emotion/hash": "^0.8.0",
 				"@emotion/stylis": "^0.8.5"
@@ -2895,46 +2895,46 @@
 			}
 		},
 		"@rocket.chat/fuselage": {
-			"version": "0.6.2",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.6.2.tgz",
-			"integrity": "sha512-BvaoYgp4eTPv0+3sCzYMQelye4cQ/f5GRFlASFFL6kRevvczNaR/RPUKPH1oIHsbEbfioBRw9WsUjqfZ0qo8NQ==",
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.7.0.tgz",
+			"integrity": "sha512-k+XWd8fbTuyslD+lEqfAt1+RMeuJcMFRDZIpKfjwhJKcZno9XUpNmOZCOamFNlLA9nq0LqA2FBpIS8IZPGOitQ==",
 			"requires": {
-				"@rocket.chat/css-in-js": "^0.6.2",
-				"@rocket.chat/fuselage-tokens": "^0.6.2",
-				"@rocket.chat/icons": "^0.6.2"
+				"@rocket.chat/css-in-js": "^0.7.0",
+				"@rocket.chat/fuselage-tokens": "^0.7.0",
+				"@rocket.chat/icons": "^0.7.0"
 			}
 		},
 		"@rocket.chat/fuselage-hooks": {
-			"version": "0.6.2",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-hooks/-/fuselage-hooks-0.6.2.tgz",
-			"integrity": "sha512-43hjN6mlsUE331dq79BKncsfXD8rsoxODgBG6cEn62Y7Ghq5TKE5HYZ7UVPgeVfONarbA7QwyjSjSrNgzDvR+Q=="
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-hooks/-/fuselage-hooks-0.7.0.tgz",
+			"integrity": "sha512-DeBIIPUoZLqPq/kXFQsCSMOroDwEWsqE6hQRkakc25kpmPVyJqsCb8rmSJFon4IpqJ8vbAyHADiWnVjxSEAtnQ=="
 		},
 		"@rocket.chat/fuselage-polyfills": {
-			"version": "0.6.2",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-polyfills/-/fuselage-polyfills-0.6.2.tgz",
-			"integrity": "sha512-S3nxW97C/V9/vo+eS+bPXFvi/Na/0ktmPZREi+K++ZXJAhxAI3+F5KZZKJW8bCXeo4AEfJ9+7KYgDu4mJ29GjA==",
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-polyfills/-/fuselage-polyfills-0.7.0.tgz",
+			"integrity": "sha512-S8IE82RjqCazRDPkL0Mbye7R1dx9Re2iwTjDGW13kWhGjDJFWuieO+twbawLWVRZuGSvxIGVJR468lz2B9krpQ==",
 			"requires": {
 				"@juggle/resize-observer": "^3.1.2",
 				"focus-visible": "^5.0.2"
 			}
 		},
 		"@rocket.chat/fuselage-tokens": {
-			"version": "0.6.2",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-tokens/-/fuselage-tokens-0.6.2.tgz",
-			"integrity": "sha512-PgmagdGzPmh1Dxbkf2YLbPuPjFKYh17CXLuWo0WafxlTrIbMKfw3mq0AJJ1YZrpj6K9tsO6Ty8bIliNRRgXl2A=="
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-tokens/-/fuselage-tokens-0.7.0.tgz",
+			"integrity": "sha512-vMEwXeYYL8BG9Y+ZXqjMbUXzwS06nvSSMu5aVhNiE1C/RkEAJiYxVzE6dw2MgXMLuLTc+ezyv8T6dBpVN7cPHg=="
 		},
 		"@rocket.chat/fuselage-ui-kit": {
-			"version": "0.6.2",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-ui-kit/-/fuselage-ui-kit-0.6.2.tgz",
-			"integrity": "sha512-b4Q/OG/Xy7IiTvGv0YDFvMcCadGzpb5YG5AX4YhCORTGKHwi1vZYQBPvhsjtfInHUTjAmwPTP6SY2t9ryZ9YjQ==",
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-ui-kit/-/fuselage-ui-kit-0.7.0.tgz",
+			"integrity": "sha512-eRZxxDBA9+9ZHVXBeVTN0LeweM1qz0fGCTlgvEmmmqCmbQJ2FetxrkRh32tCGO6iwF+Pmwf3410BvNJ0no1LZg==",
 			"requires": {
-				"@rocket.chat/ui-kit": "^0.6.2"
+				"@rocket.chat/ui-kit": "^0.7.0"
 			}
 		},
 		"@rocket.chat/icons": {
-			"version": "0.6.2",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/icons/-/icons-0.6.2.tgz",
-			"integrity": "sha512-+INyHScojyrUjiJ7LWwutydFdrxzRK+QRUpT/W1R0nj1TcG4P4ey7xxad2eNt7KNCZ+Hu+AyxOeEHtp8wVEc+w=="
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/icons/-/icons-0.7.0.tgz",
+			"integrity": "sha512-XwTWXn1UGWvet/Rtvk5PzNytjyUSund4gnTAXPvk4Tpi+THUjr2oL4mVvjfK4Um8WsS5SbB/arRkiBajO++WuA=="
 		},
 		"@rocket.chat/livechat": {
 			"version": "1.4.0",
@@ -3024,9 +3024,9 @@
 			}
 		},
 		"@rocket.chat/ui-kit": {
-			"version": "0.6.2",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.6.2.tgz",
-			"integrity": "sha512-rB2a2gnGZp7wZQaV8qwg9Hqn3ltMzP9DwepRs9vLzeTh/swgpwVXY4ZcbWwaeelZNKpUqDsUxoaQqReToMRAZA=="
+			"version": "0.7.0",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.7.0.tgz",
+			"integrity": "sha512-qsBRQlUJhLga30qosHmiVsdLLBi2vjqBhAfKvYPAT0Qe5FzsuTRn6vtOnYk16A4mZ8hV8gWNDleuvG46vOk+LA=="
 		},
 		"@samverschueren/stream-to-observable": {
 			"version": "0.3.0",
diff --git a/package.json b/package.json
index ce8d80ed754b..3cc376a6e0e1 100644
--- a/package.json
+++ b/package.json
@@ -128,13 +128,13 @@
 		"@nivo/heatmap": "^0.61.0",
 		"@nivo/line": "^0.61.1",
 		"@nivo/pie": "^0.61.1",
-		"@rocket.chat/fuselage-polyfills": "^0.6.2",
 		"@rocket.chat/apps-engine": "^1.13.0-beta.3003",
-		"@rocket.chat/fuselage": "^0.6.2",
-		"@rocket.chat/fuselage-hooks": "^0.6.2",
-		"@rocket.chat/fuselage-ui-kit": "^0.6.2",
-		"@rocket.chat/icons": "^0.6.2",
-		"@rocket.chat/ui-kit": "^0.6.2",
+		"@rocket.chat/fuselage": "^0.7.0",
+		"@rocket.chat/fuselage-hooks": "^0.7.0",
+		"@rocket.chat/fuselage-polyfills": "^0.7.0",
+		"@rocket.chat/fuselage-ui-kit": "^0.7.0",
+		"@rocket.chat/icons": "^0.7.0",
+		"@rocket.chat/ui-kit": "^0.7.0",
 		"@slack/client": "^4.8.0",
 		"adm-zip": "RocketChat/adm-zip",
 		"archiver": "^3.0.0",

From bcd110cd327fc7325624bbde11b8990a0d4aa056 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 1 Apr 2020 08:44:50 -0300
Subject: [PATCH 130/223] [NEW] Discussions: Inherit the public status of
 parent channel (#17070)

---
 app/discussion/server/methods/createDiscussion.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/discussion/server/methods/createDiscussion.js b/app/discussion/server/methods/createDiscussion.js
index 78535311ad9d..b15a057adedb 100644
--- a/app/discussion/server/methods/createDiscussion.js
+++ b/app/discussion/server/methods/createDiscussion.js
@@ -86,8 +86,7 @@ const create = ({ prid, pmid, t_name, reply, users }) => {
 	// auto invite the replied message owner
 	const invitedUsers = message ? [message.u.username, ...users] : users;
 
-	// discussions are always created as private groups
-	const discussion = createRoom('p', name, user.username, [...new Set(invitedUsers)], false, {
+	const discussion = createRoom(p_room.t, name, user.username, [...new Set(invitedUsers)], false, {
 		fname: t_name,
 		description: message.msg, // TODO discussions remove
 		topic: p_room.name, // TODO discussions remove

From 9c6723498f480955278ca9d77a5d48e9cafbebad Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Wed, 1 Apr 2020 12:08:35 -0300
Subject: [PATCH 131/223] Regression: Wrong size of Directory search/sort icons
 and Sort Channels menu not showing on production build (#17118)

---
 app/ui-sidenav/client/SortList.js             |  6 +-
 app/ui-sidenav/client/sidebarHeader.js        |  2 +-
 .../components/Directory/DirectoryTable.js    |  4 +-
 .../views/app/components/Directory/index.js   |  2 +-
 .../settings/inputs/StringSettingInput.js     |  2 +-
 package-lock.json                             | 64 +++++++++++--------
 package.json                                  | 12 ++--
 7 files changed, 50 insertions(+), 42 deletions(-)

diff --git a/app/ui-sidenav/client/SortList.js b/app/ui-sidenav/client/SortList.js
index bb9e874e2361..bd089abb2116 100644
--- a/app/ui-sidenav/client/SortList.js
+++ b/app/ui-sidenav/client/SortList.js
@@ -40,7 +40,9 @@ export function SortList() {
 	</>;
 }
 
-export function SortModeList() {
+SortList.displayName = 'SortList';
+
+function SortModeList() {
 	const t = useTranslation();
 	const saveUserPreferences = useMethod('saveUserPreferences');
 	const sidebarSortBy = useUserPreference('sidebarSortby', 'alphabetical');
@@ -127,5 +129,3 @@ function GroupingList() {
 		</ul>
 	</>;
 }
-
-SortList.name = 'SortList';
diff --git a/app/ui-sidenav/client/sidebarHeader.js b/app/ui-sidenav/client/sidebarHeader.js
index a75ce5bd7c81..172abe5ef480 100644
--- a/app/ui-sidenav/client/sidebarHeader.js
+++ b/app/ui-sidenav/client/sidebarHeader.js
@@ -73,7 +73,7 @@ const toolbarButtons = (/* user */) => [{
 			},
 			offsetVertical: e.currentTarget.clientHeight + 10,
 		};
-		const { SortList } = require('./SortList');
+		const { SortList } = await import('./SortList');
 		await createTemplateForComponent(SortList);
 		popover.open(config);
 	},
diff --git a/app/ui/client/views/app/components/Directory/DirectoryTable.js b/app/ui/client/views/app/components/Directory/DirectoryTable.js
index 30382c07205f..4d009fa69279 100644
--- a/app/ui/client/views/app/components/Directory/DirectoryTable.js
+++ b/app/ui/client/views/app/components/Directory/DirectoryTable.js
@@ -5,7 +5,7 @@ import { useTranslation } from '../../../../../../../client/contexts/Translation
 import { useDebounce } from '../hooks';
 
 function SortIcon({ direction }) {
-	return <Box is='svg' width='16' height='16' viewBox='0 0 16 16' fill='none' xmlns='http://www.w3.org/2000/svg'>
+	return <Box is='svg' width='x16' height='x16' viewBox='0 0 16 16' fill='none' xmlns='http://www.w3.org/2000/svg'>
 		<path d='M5.33337 5.99999L8.00004 3.33333L10.6667 5.99999' stroke={direction === 'desc' ? '#9EA2A8' : '#E4E7EA' } strokeWidth='1.33333' strokeLinecap='round' strokeLinejoin='round'/>
 		<path d='M5.33337 10L8.00004 12.6667L10.6667 10' stroke={ direction === 'asc' ? '#9EA2A8' : '#E4E7EA'} strokeWidth='1.33333' strokeLinecap='round' strokeLinejoin='round'/>
 	</Box>;
@@ -79,7 +79,7 @@ export function DirectoryTable({
 		<Flex.Container direction='column'>
 			<Box>
 				<Margins block='x16'>
-					<TextInput placeholder={searchPlaceholder} addon={<Icon name='magnifier' size='20'/>} onChange={handleChange} value={text} />
+					<TextInput placeholder={searchPlaceholder} addon={<Icon name='magnifier' size='x20'/>} onChange={handleChange} value={text} />
 				</Margins>
 				{channels && !channels.length
 					? <Tile textStyle='p1' elevation='0' textColor='info' style={{ textAlign: 'center' }}>
diff --git a/app/ui/client/views/app/components/Directory/index.js b/app/ui/client/views/app/components/Directory/index.js
index 85349d4cf539..5d56e61265a5 100644
--- a/app/ui/client/views/app/components/Directory/index.js
+++ b/app/ui/client/views/app/components/Directory/index.js
@@ -48,4 +48,4 @@ export function DirectoryPage() {
 }
 
 
-DirectoryPage.name = 'DirectoryPage';
+DirectoryPage.displayName = 'DirectoryPage';
diff --git a/client/components/admin/settings/inputs/StringSettingInput.js b/client/components/admin/settings/inputs/StringSettingInput.js
index b5ddaa78672e..8c3ec25306df 100644
--- a/client/components/admin/settings/inputs/StringSettingInput.js
+++ b/client/components/admin/settings/inputs/StringSettingInput.js
@@ -69,4 +69,4 @@ export function StringSettingInput({
 	</>;
 }
 
-Input.name = 'Input';
+Input.displayName = 'Input';
diff --git a/package-lock.json b/package-lock.json
index 3c3deb7a3daa..e7b92f879940 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2870,9 +2870,9 @@
 			}
 		},
 		"@rocket.chat/css-in-js": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/css-in-js/-/css-in-js-0.7.0.tgz",
-			"integrity": "sha512-LlfGPXxwCIDg3iXRWioY9xPdXCGMEbWy7RMxoZPT5CeUmxsMdxBmvjXslaiPFp2Qg8qperQynKCFjMoe3YALSA==",
+			"version": "0.7.1",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/css-in-js/-/css-in-js-0.7.1.tgz",
+			"integrity": "sha512-Qlwhf3i1w7kOpOKSbf/x/2Xl+EYgol4F/nO4F3Pz5SWFf+y/kJCR7GUoUbXq2d7cZNCA2us4/tQ7on/KVNvxWA==",
 			"requires": {
 				"@emotion/hash": "^0.8.0",
 				"@emotion/stylis": "^0.8.5"
@@ -2895,46 +2895,54 @@
 			}
 		},
 		"@rocket.chat/fuselage": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.7.0.tgz",
-			"integrity": "sha512-k+XWd8fbTuyslD+lEqfAt1+RMeuJcMFRDZIpKfjwhJKcZno9XUpNmOZCOamFNlLA9nq0LqA2FBpIS8IZPGOitQ==",
+			"version": "0.7.1",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage/-/fuselage-0.7.1.tgz",
+			"integrity": "sha512-vyziOK0H9P13H+BBWk2q20/TNVVlOD+kpQy6cs4X+qWEIX3evzRUYSTF589AlSEJDCqEoEJSo1ODI6k8P1TwYw==",
 			"requires": {
-				"@rocket.chat/css-in-js": "^0.7.0",
-				"@rocket.chat/fuselage-tokens": "^0.7.0",
-				"@rocket.chat/icons": "^0.7.0"
+				"@rocket.chat/css-in-js": "^0.7.1",
+				"@rocket.chat/fuselage-tokens": "^0.7.1",
+				"@rocket.chat/icons": "^0.7.1"
 			}
 		},
 		"@rocket.chat/fuselage-hooks": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-hooks/-/fuselage-hooks-0.7.0.tgz",
-			"integrity": "sha512-DeBIIPUoZLqPq/kXFQsCSMOroDwEWsqE6hQRkakc25kpmPVyJqsCb8rmSJFon4IpqJ8vbAyHADiWnVjxSEAtnQ=="
+			"version": "0.7.1",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-hooks/-/fuselage-hooks-0.7.1.tgz",
+			"integrity": "sha512-MEl5M1wedMefGKs9wKRCFRzw+7qtpCnzmUzstf2oSLcQyWDybwYQm7OYZuo8x+jThVpSXZPF4oZ8hJGXSlHMjQ=="
 		},
 		"@rocket.chat/fuselage-polyfills": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-polyfills/-/fuselage-polyfills-0.7.0.tgz",
-			"integrity": "sha512-S8IE82RjqCazRDPkL0Mbye7R1dx9Re2iwTjDGW13kWhGjDJFWuieO+twbawLWVRZuGSvxIGVJR468lz2B9krpQ==",
+			"version": "0.7.1",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-polyfills/-/fuselage-polyfills-0.7.1.tgz",
+			"integrity": "sha512-DueoxzoCsQehpoJQt4ej0xVfSnnnYwQSLqK4iqa5sCh0uKgDXcZNHMqgIbBr6abH7SNbXTMG/9SHW8rbNilG9Q==",
 			"requires": {
 				"@juggle/resize-observer": "^3.1.2",
 				"focus-visible": "^5.0.2"
 			}
 		},
 		"@rocket.chat/fuselage-tokens": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-tokens/-/fuselage-tokens-0.7.0.tgz",
-			"integrity": "sha512-vMEwXeYYL8BG9Y+ZXqjMbUXzwS06nvSSMu5aVhNiE1C/RkEAJiYxVzE6dw2MgXMLuLTc+ezyv8T6dBpVN7cPHg=="
+			"version": "0.7.1",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-tokens/-/fuselage-tokens-0.7.1.tgz",
+			"integrity": "sha512-huCqiXeA7VRN6D5xZ7XNdhmrlxqr+gikR9V/eF3WRiB0lXorui8hy46oKphTvZwcO4/6CuK02pe9c43ktTrb/g=="
 		},
 		"@rocket.chat/fuselage-ui-kit": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-ui-kit/-/fuselage-ui-kit-0.7.0.tgz",
-			"integrity": "sha512-eRZxxDBA9+9ZHVXBeVTN0LeweM1qz0fGCTlgvEmmmqCmbQJ2FetxrkRh32tCGO6iwF+Pmwf3410BvNJ0no1LZg==",
+			"version": "0.7.1",
 			"requires": {
-				"@rocket.chat/ui-kit": "^0.7.0"
+				"@rocket.chat/ui-kit": "^0.7.1"
+			},
+			"dependencies": {
+				"@babel/preset-react": {
+					"version": "7.9.4"
+				},
+				"@rocket.chat/ui-kit": {
+					"version": "0.7.0",
+					"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.7.0.tgz",
+					"integrity": "sha512-qsBRQlUJhLga30qosHmiVsdLLBi2vjqBhAfKvYPAT0Qe5FzsuTRn6vtOnYk16A4mZ8hV8gWNDleuvG46vOk+LA=="
+				}
 			}
 		},
 		"@rocket.chat/icons": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/icons/-/icons-0.7.0.tgz",
-			"integrity": "sha512-XwTWXn1UGWvet/Rtvk5PzNytjyUSund4gnTAXPvk4Tpi+THUjr2oL4mVvjfK4Um8WsS5SbB/arRkiBajO++WuA=="
+			"version": "0.7.1",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/icons/-/icons-0.7.1.tgz",
+			"integrity": "sha512-u5Mn5PUskxZmY7S3xUPo7442xbruJ8/Z5Em5CquB1grQ+SwApdnKMP5tL2OfqRFqYHqppJhcl3sFAfKPfxvmKg=="
 		},
 		"@rocket.chat/livechat": {
 			"version": "1.4.0",
@@ -3024,9 +3032,9 @@
 			}
 		},
 		"@rocket.chat/ui-kit": {
-			"version": "0.7.0",
-			"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.7.0.tgz",
-			"integrity": "sha512-qsBRQlUJhLga30qosHmiVsdLLBi2vjqBhAfKvYPAT0Qe5FzsuTRn6vtOnYk16A4mZ8hV8gWNDleuvG46vOk+LA=="
+			"version": "0.7.1",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.7.1.tgz",
+			"integrity": "sha512-CUpJt35zq56n4lBwWs17PRa+GGY+NKILv2ydjlL+dQNbtb9peEEzTVmglLRXUJhIwNKndSAr0eqoeTkRIsWL6A=="
 		},
 		"@samverschueren/stream-to-observable": {
 			"version": "0.3.0",
diff --git a/package.json b/package.json
index 3cc376a6e0e1..4b4b4763b782 100644
--- a/package.json
+++ b/package.json
@@ -129,12 +129,12 @@
 		"@nivo/line": "^0.61.1",
 		"@nivo/pie": "^0.61.1",
 		"@rocket.chat/apps-engine": "^1.13.0-beta.3003",
-		"@rocket.chat/fuselage": "^0.7.0",
-		"@rocket.chat/fuselage-hooks": "^0.7.0",
-		"@rocket.chat/fuselage-polyfills": "^0.7.0",
-		"@rocket.chat/fuselage-ui-kit": "^0.7.0",
-		"@rocket.chat/icons": "^0.7.0",
-		"@rocket.chat/ui-kit": "^0.7.0",
+		"@rocket.chat/fuselage": "^0.7.1",
+		"@rocket.chat/fuselage-hooks": "^0.7.1",
+		"@rocket.chat/fuselage-polyfills": "^0.7.1",
+		"@rocket.chat/fuselage-ui-kit": "^0.7.1",
+		"@rocket.chat/icons": "^0.7.1",
+		"@rocket.chat/ui-kit": "^0.7.1",
 		"@slack/client": "^4.8.0",
 		"adm-zip": "RocketChat/adm-zip",
 		"archiver": "^3.0.0",

From cb780cfdc564836c16501490e60677fcb6b9d87c Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 1 Apr 2020 13:03:34 -0300
Subject: [PATCH 132/223] New Troubleshoot section for disabling features
 (#17114)

Co-Authored-By: Douglas Gubert <d-gubert@users.noreply.github.com>
---
 app/cloud/server/index.js                     | 30 ++++++++++-----
 .../server/lib/sendNotificationsOnMessage.js  | 14 ++++++-
 app/lib/server/startup/settings.js            | 37 ++++++++++++++++++-
 app/livechat/server/startup.js                | 14 ++++++-
 .../LivechatAgentActivityMonitor.js           | 25 ++++++++++++-
 app/statistics/server/lib/SAUMonitor.js       | 21 ++++++++++-
 app/statistics/server/startup/monitor.js      | 13 ++++++-
 .../server/cronProcessDownloads.js            | 20 +++++++---
 imports/users-presence/server/activeUsers.js  | 15 +++++++-
 packages/rocketchat-i18n/i18n/en.i18n.json    | 18 +++++++++
 server/startup/cron.js                        | 26 +++++++++----
 server/stream/streamBroadcast.js              | 14 ++++++-
 12 files changed, 216 insertions(+), 31 deletions(-)

diff --git a/app/cloud/server/index.js b/app/cloud/server/index.js
index 81423b62bbdb..58bd467b4dfd 100644
--- a/app/cloud/server/index.js
+++ b/app/cloud/server/index.js
@@ -8,6 +8,7 @@ import { getUserCloudAccessToken } from './functions/getUserCloudAccessToken';
 import { getWorkspaceKey } from './functions/getWorkspaceKey';
 import { syncWorkspace } from './functions/syncWorkspace';
 import { Permissions } from '../../models';
+import { settings } from '../../settings/server';
 
 if (Permissions) {
 	Permissions.createOrUpdate('manage-cloud', ['admin']);
@@ -17,16 +18,25 @@ const licenseCronName = 'Cloud Workspace Sync';
 
 Meteor.startup(function() {
 	// run token/license sync if registered
-	syncWorkspace();
-
-	SyncedCron.remove(licenseCronName);
-	SyncedCron.add({
-		name: licenseCronName,
-		schedule(parser) {
-			// Every 12 hours
-			return parser.cron('0 */12 * * *');
-		},
-		job: syncWorkspace,
+	let TroubleshootDisableWorkspaceSync;
+	settings.get('Troubleshoot_Disable_Workspace_Sync', (key, value) => {
+		if (TroubleshootDisableWorkspaceSync === value) { return; }
+		TroubleshootDisableWorkspaceSync = value;
+
+		if (value) {
+			return SyncedCron.remove(licenseCronName);
+		}
+
+		syncWorkspace();
+
+		SyncedCron.add({
+			name: licenseCronName,
+			schedule(parser) {
+				// Every 12 hours
+				return parser.cron('0 */12 * * *');
+			},
+			job: syncWorkspace,
+		});
 	});
 });
 
diff --git a/app/lib/server/lib/sendNotificationsOnMessage.js b/app/lib/server/lib/sendNotificationsOnMessage.js
index 21eab1a8535d..04c7c2f06beb 100644
--- a/app/lib/server/lib/sendNotificationsOnMessage.js
+++ b/app/lib/server/lib/sendNotificationsOnMessage.js
@@ -3,7 +3,7 @@ import moment from 'moment';
 
 import { hasPermission } from '../../../authorization';
 import { settings } from '../../../settings';
-import { callbacks } from '../../../callbacks';
+import { callbacks } from '../../../callbacks/server';
 import { Subscriptions, Users } from '../../../models/server';
 import { roomTypes } from '../../../utils';
 import { callJoinRoom, messageContainsHighlight, parseMessageTextPerUser, replaceMentionedUsernamesWithFullNames } from '../functions/notifications';
@@ -353,4 +353,14 @@ export async function sendAllNotifications(message, room) {
 	return message;
 }
 
-callbacks.add('afterSaveMessage', (message, room) => Promise.await(sendAllNotifications(message, room)), callbacks.priority.LOW, 'sendNotificationsOnMessage');
+let TroubleshootDisableNotifications;
+settings.get('Troubleshoot_Disable_Notifications', (key, value) => {
+	if (TroubleshootDisableNotifications === value) { return; }
+	TroubleshootDisableNotifications = value;
+
+	if (value) {
+		return callbacks.remove('afterSaveMessage', 'sendNotificationsOnMessage');
+	}
+
+	callbacks.add('afterSaveMessage', (message, room) => Promise.await(sendAllNotifications(message, room)), callbacks.priority.LOW, 'sendNotificationsOnMessage');
+});
diff --git a/app/lib/server/startup/settings.js b/app/lib/server/startup/settings.js
index 597e9f3efaad..7f42f30ee2dc 100644
--- a/app/lib/server/startup/settings.js
+++ b/app/lib/server/startup/settings.js
@@ -1,6 +1,6 @@
 import { Random } from 'meteor/random';
 
-import { settings } from '../../../settings';
+import { settings } from '../../../settings/server';
 import './email';
 import { MessageTypesValues } from '../../lib/MessageTypes';
 
@@ -2821,4 +2821,39 @@ settings.addGroup('Rate Limiter', function() {
 	});
 });
 
+settings.addGroup('Troubleshoot', function() {
+	this.add('Troubleshoot_Disable_Notifications', false, {
+		type: 'boolean',
+		alert: 'Troubleshoot_Disable_Notifications_Alert',
+	});
+	this.add('Troubleshoot_Disable_Presence_Broadcast', false, {
+		type: 'boolean',
+		alert: 'Troubleshoot_Disable_Presence_Broadcast_Alert',
+	});
+	this.add('Troubleshoot_Disable_Instance_Broadcast', false, {
+		type: 'boolean',
+		alert: 'Troubleshoot_Disable_Instance_Broadcast_Alert',
+	});
+	this.add('Troubleshoot_Disable_Sessions_Monitor', false, {
+		type: 'boolean',
+		alert: 'Troubleshoot_Disable_Sessions_Monitor_Alert',
+	});
+	this.add('Troubleshoot_Disable_Livechat_Activity_Monitor', false, {
+		type: 'boolean',
+		alert: 'Troubleshoot_Disable_Livechat_Activity_Monitor_Alert',
+	});
+	this.add('Troubleshoot_Disable_Statistics_Generator', false, {
+		type: 'boolean',
+		alert: 'Troubleshoot_Disable_Statistics_Generator_Alert',
+	});
+	this.add('Troubleshoot_Disable_Data_Exporter_Processor', false, {
+		type: 'boolean',
+		alert: 'Troubleshoot_Disable_Data_Exporter_Processor_Alert',
+	});
+	this.add('Troubleshoot_Disable_Workspace_Sync', false, {
+		type: 'boolean',
+		alert: 'Troubleshoot_Disable_Workspace_Sync_Alert',
+	});
+});
+
 settings.init();
diff --git a/app/livechat/server/startup.js b/app/livechat/server/startup.js
index 5fc898862d73..8bf9e83e3c3e 100644
--- a/app/livechat/server/startup.js
+++ b/app/livechat/server/startup.js
@@ -70,5 +70,17 @@ Meteor.startup(() => {
 
 	createLivechatQueueView();
 
-	new LivechatAgentActivityMonitor().start();
+	const monitor = new LivechatAgentActivityMonitor();
+
+	let TroubleshootDisableLivechatActivityMonitor;
+	settings.get('Troubleshoot_Disable_Livechat_Activity_Monitor', (key, value) => {
+		if (TroubleshootDisableLivechatActivityMonitor === value) { return; }
+		TroubleshootDisableLivechatActivityMonitor = value;
+
+		if (value) {
+			return monitor.stop();
+		}
+
+		monitor.start();
+	});
 });
diff --git a/app/livechat/server/statistics/LivechatAgentActivityMonitor.js b/app/livechat/server/statistics/LivechatAgentActivityMonitor.js
index 413a36014cb0..36e87baca4a3 100644
--- a/app/livechat/server/statistics/LivechatAgentActivityMonitor.js
+++ b/app/livechat/server/statistics/LivechatAgentActivityMonitor.js
@@ -15,12 +15,23 @@ export class LivechatAgentActivityMonitor {
 		this._handleMeteorConnection = this._handleMeteorConnection.bind(this);
 		this._handleAgentStatusChanged = this._handleAgentStatusChanged.bind(this);
 		this._handleUserStatusLivechatChanged = this._handleUserStatusLivechatChanged.bind(this);
+		this._name = 'Livechat Agent Activity Monitor';
 	}
 
 	start() {
 		this._setupListeners();
 	}
 
+	stop() {
+		if (!this.isRunning()) {
+			return;
+		}
+
+		SyncedCron.remove(this._name);
+
+		this._started = false;
+	}
+
 	isRunning() {
 		return this._started;
 	}
@@ -38,7 +49,7 @@ export class LivechatAgentActivityMonitor {
 
 	_startMonitoring() {
 		SyncedCron.add({
-			name: 'Livechat Agent Activity Monitor',
+			name: this._name,
 			schedule: (parser) => parser.cron('0 0 * * *'),
 			job: () => {
 				this._updateActiveSessions();
@@ -65,6 +76,10 @@ export class LivechatAgentActivityMonitor {
 	}
 
 	_handleMeteorConnection(connection) {
+		if (!this.isRunning()) {
+			return;
+		}
+
 		const session = Sessions.findOne({ sessionId: connection.id });
 		if (!session) {
 			return;
@@ -81,6 +96,10 @@ export class LivechatAgentActivityMonitor {
 	}
 
 	_handleAgentStatusChanged({ userId, status }) {
+		if (!this.isRunning()) {
+			return;
+		}
+
 		const user = Users.findOneById(userId);
 		if (!user || user.statusLivechat !== 'available') {
 			return;
@@ -94,6 +113,10 @@ export class LivechatAgentActivityMonitor {
 	}
 
 	_handleUserStatusLivechatChanged({ userId, status }) {
+		if (!this.isRunning()) {
+			return;
+		}
+
 		const user = Users.findOneById(userId);
 		if (user && user.status === 'offline') {
 			return;
diff --git a/app/statistics/server/lib/SAUMonitor.js b/app/statistics/server/lib/SAUMonitor.js
index 1babe1d52bd3..fdf9725e34f9 100644
--- a/app/statistics/server/lib/SAUMonitor.js
+++ b/app/statistics/server/lib/SAUMonitor.js
@@ -28,6 +28,7 @@ export class SAUMonitorClass {
 		this._timer = null;
 		this._today = getDateObj();
 		this._instanceId = null;
+		this._jobName = 'aggregate-sessions';
 	}
 
 	start(instanceId) {
@@ -59,6 +60,8 @@ export class SAUMonitorClass {
 			Meteor.clearInterval(this._timer);
 		}
 
+		SyncedCron.remove(this._jobName);
+
 		logger.debug(`[stop] - InstanceId: ${ this._instanceId }`);
 	}
 
@@ -101,6 +104,9 @@ export class SAUMonitorClass {
 		}
 
 		Meteor.onConnection((connection) => {
+			if (!this.isRunning()) {
+				return;
+			}
 			// this._handleSession(connection, getDateObj());
 
 			connection.onClose(() => {
@@ -115,6 +121,10 @@ export class SAUMonitorClass {
 		}
 
 		Accounts.onLogin((info) => {
+			if (!this.isRunning()) {
+				return;
+			}
+
 			const userId = info.user._id;
 			const loginAt = new Date();
 			const params = { userId, loginAt, ...getDateObj() };
@@ -123,6 +133,10 @@ export class SAUMonitorClass {
 		});
 
 		Accounts.onLogout((info) => {
+			if (!this.isRunning()) {
+				return;
+			}
+
 			const sessionId = info.connection.id;
 			if (info.user) {
 				const userId = info.user._id;
@@ -311,8 +325,9 @@ export class SAUMonitorClass {
 
 	_startAggregation() {
 		logger.info('[aggregate] - Start Cron.');
+
 		SyncedCron.add({
-			name: 'aggregate-sessions',
+			name: this._jobName,
 			schedule: (parser) => parser.text('at 2:00 am'),
 			job: () => {
 				this.aggregate();
@@ -321,6 +336,10 @@ export class SAUMonitorClass {
 	}
 
 	aggregate() {
+		if (!this.isRunning()) {
+			return;
+		}
+
 		logger.info('[aggregate] - Aggregatting data.');
 
 		const date = new Date();
diff --git a/app/statistics/server/startup/monitor.js b/app/statistics/server/startup/monitor.js
index f86bc7d099c3..70cd64bf5c6c 100644
--- a/app/statistics/server/startup/monitor.js
+++ b/app/statistics/server/startup/monitor.js
@@ -2,9 +2,20 @@ import { Meteor } from 'meteor/meteor';
 import { InstanceStatus } from 'meteor/konecty:multiple-instances-status';
 
 import { SAUMonitorClass } from '../lib/SAUMonitor';
+import { settings } from '../../../settings/server';
 
 const SAUMonitor = new SAUMonitorClass();
 
 Meteor.startup(() => {
-	SAUMonitor.start(InstanceStatus.id());
+	let TroubleshootDisableSessionsMonitor;
+	settings.get('Troubleshoot_Disable_Sessions_Monitor', (key, value) => {
+		if (TroubleshootDisableSessionsMonitor === value) { return; }
+		TroubleshootDisableSessionsMonitor = value;
+
+		if (value) {
+			return SAUMonitor.stop();
+		}
+
+		SAUMonitor.start(InstanceStatus.id());
+	});
 });
diff --git a/app/user-data-download/server/cronProcessDownloads.js b/app/user-data-download/server/cronProcessDownloads.js
index e8388c7a17c0..7e841839f84c 100644
--- a/app/user-data-download/server/cronProcessDownloads.js
+++ b/app/user-data-download/server/cronProcessDownloads.js
@@ -572,14 +572,24 @@ async function processDataDownloads() {
 	}
 }
 
+const name = 'Generate download files for user data';
+
 Meteor.startup(function() {
 	Meteor.defer(function() {
-		processDataDownloads();
+		let TroubleshootDisableDataExporterProcessor;
+		settings.get('Troubleshoot_Disable_Data_Exporter_Processor', (key, value) => {
+			if (TroubleshootDisableDataExporterProcessor === value) { return; }
+			TroubleshootDisableDataExporterProcessor = value;
+
+			if (value) {
+				return SyncedCron.remove(name);
+			}
 
-		SyncedCron.add({
-			name: 'Generate download files for user data',
-			schedule: (parser) => parser.cron(`*/${ processingFrequency } * * * *`),
-			job: processDataDownloads,
+			SyncedCron.add({
+				name,
+				schedule: (parser) => parser.cron(`*/${ processingFrequency } * * * *`),
+				job: processDataDownloads,
+			});
 		});
 	});
 });
diff --git a/imports/users-presence/server/activeUsers.js b/imports/users-presence/server/activeUsers.js
index 8a62c88d4210..1dab7ff4c8bf 100644
--- a/imports/users-presence/server/activeUsers.js
+++ b/imports/users-presence/server/activeUsers.js
@@ -1,6 +1,7 @@
 import { UserPresenceEvents } from 'meteor/konecty:user-presence';
 
 import { Notifications } from '../../../app/notifications/server';
+import { settings } from '../../../app/settings/server';
 
 // mirror of object in /imports/startup/client/listenActiveUsers.js - keep updated
 export const STATUS_MAP = {
@@ -10,7 +11,7 @@ export const STATUS_MAP = {
 	busy: 3,
 };
 
-UserPresenceEvents.on('setUserStatus', (user, status/* , statusConnection*/) => {
+const setUserStatus = (user, status/* , statusConnection*/) => {
 	const {
 		_id,
 		username,
@@ -25,4 +26,16 @@ UserPresenceEvents.on('setUserStatus', (user, status/* , statusConnection*/) =>
 		STATUS_MAP[status],
 		statusText,
 	]);
+};
+
+let TroubleshootDisablePresenceBroadcast;
+settings.get('Troubleshoot_Disable_Presence_Broadcast', (key, value) => {
+	if (TroubleshootDisablePresenceBroadcast === value) { return; }
+	TroubleshootDisablePresenceBroadcast = value;
+
+	if (value) {
+		return UserPresenceEvents.removeListener('setUserStatus', setUserStatus);
+	}
+
+	UserPresenceEvents.on('setUserStatus', setUserStatus);
 });
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index db6b1b166bc8..ce11d6eacdd1 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -3355,6 +3355,24 @@
   "Trigger_Words": "Trigger Words",
   "Triggers": "Triggers",
   "True": "True",
+  "Troubleshoot": "Troubleshoot",
+  "Troubleshoot_Description": "These settings are meant to be enabled only with guidance of the Rocket.Chat Development or Support Teams. Do not touch them if you don't know what your are doing!",
+  "Troubleshoot_Disable_Notifications": "Disable Notifications",
+  "Troubleshoot_Disable_Notifications_Alert": "This setting completely disables the notifications system; sounds, desktop notifications, mobile notifications, and emails will stop!",
+  "Troubleshoot_Disable_Presence_Broadcast": "Disable Presence Broadcast",
+  "Troubleshoot_Disable_Presence_Broadcast_Alert": "This setting prevents all instances form sending the status changes of the users to their clients keeping all the users with their presence status from the first load!",
+  "Troubleshoot_Disable_Instance_Broadcast": "Disable Instance Broadcast",
+  "Troubleshoot_Disable_Instance_Broadcast_Alert": "This setting prevents the Rocket.Chat instances from sending events to the other instances, it may cause syncing problems and misbehavior!",
+  "Troubleshoot_Disable_Sessions_Monitor": "Disable Sessions Monitor",
+  "Troubleshoot_Disable_Sessions_Monitor_Alert": "This setting stops the processing of user sessions causing the statistics to stop working correctly!",
+  "Troubleshoot_Disable_Livechat_Activity_Monitor": "Disable Livechat Activity Monitor",
+  "Troubleshoot_Disable_Livechat_Activity_Monitor_Alert": "This setting stops the processing of livechat visitor sessions causing the statistics to stop working correctly!",
+  "Troubleshoot_Disable_Statistics_Generator": "Disable Statistics Generator",
+  "Troubleshoot_Disable_Statistics_Generator_Alert": "This setting stops the processing all statistics making the info page outdated until someone clicks on the refresh button and may cause other missing information around the system!",
+  "Troubleshoot_Disable_Data_Exporter_Processor": "Disable Data Exporter Processor",
+  "Troubleshoot_Disable_Data_Exporter_Processor_Alert": "This setting stops the processing of all export requests from users, so they will not receive the link to download their data!",
+  "Troubleshoot_Disable_Workspace_Sync": "Disable Workspace Sync",
+  "Troubleshoot_Disable_Workspace_Sync_Alert": "This setting stops the sync of this server with Rocket.Chat's cloud and may cause issues with marketplace and enteprise licenses!",
   "Tuesday": "Tuesday",
   "Turn_OFF": "Turn OFF",
   "Turn_ON": "Turn ON",
diff --git a/server/startup/cron.js b/server/startup/cron.js
index b56fd959ffb6..473682e11f5e 100644
--- a/server/startup/cron.js
+++ b/server/startup/cron.js
@@ -45,16 +45,28 @@ function cleanupOEmbedCache() {
 	return Meteor.call('OEmbedCacheCleanup');
 }
 
+const name = 'Generate and save statistics';
+
 Meteor.startup(function() {
 	return Meteor.defer(function() {
-		generateStatistics();
+		let TroubleshootDisableStatisticsGenerator;
+		settings.get('Troubleshoot_Disable_Statistics_Generator', (key, value) => {
+			if (TroubleshootDisableStatisticsGenerator === value) { return; }
+			TroubleshootDisableStatisticsGenerator = value;
 
-		SyncedCron.add({
-			name: 'Generate and save statistics',
-			schedule(parser) {
-				return parser.cron('12 * * * *');
-			},
-			job: generateStatistics,
+			if (value) {
+				return SyncedCron.remove(name);
+			}
+
+			generateStatistics();
+
+			SyncedCron.add({
+				name,
+				schedule(parser) {
+					return parser.cron('12 * * * *');
+				},
+				job: generateStatistics,
+			});
 		});
 
 		SyncedCron.add({
diff --git a/server/stream/streamBroadcast.js b/server/stream/streamBroadcast.js
index 337d1bde6adb..6e52422725aa 100644
--- a/server/stream/streamBroadcast.js
+++ b/server/stream/streamBroadcast.js
@@ -287,8 +287,20 @@ function startStreamBroadcast() {
 		return results;
 	}
 
-	return Meteor.StreamerCentral.on('broadcast', function(streamName, eventName, args) {
+	const onBroadcast = function(streamName, eventName, args) {
 		return broadcast(streamName, eventName, args);
+	};
+
+	let TroubleshootDisableInstanceBroadcast;
+	settings.get('Troubleshoot_Disable_Instance_Broadcast', (key, value) => {
+		if (TroubleshootDisableInstanceBroadcast === value) { return; }
+		TroubleshootDisableInstanceBroadcast = value;
+
+		if (value) {
+			return Meteor.StreamerCentral.removeListener('broadcast', onBroadcast);
+		}
+
+		Meteor.StreamerCentral.on('broadcast', onBroadcast);
 	});
 }
 

From 5c56dddc3c10f4d2525bb85844388dcfa3e87de4 Mon Sep 17 00:00:00 2001
From: 1rV1N <34376228+1rV1N-git@users.noreply.github.com>
Date: Wed, 1 Apr 2020 19:06:32 +0300
Subject: [PATCH 133/223] [FIX] Federation Event ROOM_ADD_USER not being
 dispatched (#16878)

---
 app/federation/server/endpoints/dispatch.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/federation/server/endpoints/dispatch.js b/app/federation/server/endpoints/dispatch.js
index 6d776db21597..77a405784316 100644
--- a/app/federation/server/endpoints/dispatch.js
+++ b/app/federation/server/endpoints/dispatch.js
@@ -87,7 +87,7 @@ const eventHandlers = {
 	//
 	// ROOM_ADD_USER
 	//
-	async [eventTypes.ROOM_ADD_USER0](event) {
+	async [eventTypes.ROOM_ADD_USER](event) {
 		const eventResult = await FederationRoomEvents.addEvent(event.context, event);
 
 		// If the event was successfully added, handle the event locally

From 5eb8066b5c048cce4a525f7c736ebf9605bd3ae7 Mon Sep 17 00:00:00 2001
From: 1rV1N <34376228+1rV1N-git@users.noreply.github.com>
Date: Wed, 1 Apr 2020 19:09:19 +0300
Subject: [PATCH 134/223] [FIX] Federation delete room event not being
 dispatched (#16861)

---
 app/federation/server/hooks/beforeDeleteRoom.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/federation/server/hooks/beforeDeleteRoom.js b/app/federation/server/hooks/beforeDeleteRoom.js
index b1cf1c8b7c1b..0131e4692806 100644
--- a/app/federation/server/hooks/beforeDeleteRoom.js
+++ b/app/federation/server/hooks/beforeDeleteRoom.js
@@ -2,6 +2,7 @@ import { logger } from '../lib/logger';
 import { FederationRoomEvents, Rooms } from '../../../models/server';
 import { hasExternalDomain } from '../functions/helpers';
 import { getFederationDomain } from '../lib/getFederationDomain';
+import { dispatchEvent } from '../handler';
 
 async function beforeDeleteRoom(roomId) {
 	const room = Rooms.findOneById(roomId, { fields: { federation: 1 } });

From 5348895fc7356574873da80b19a29b1754d27e63 Mon Sep 17 00:00:00 2001
From: 1rV1N <34376228+1rV1N-git@users.noreply.github.com>
Date: Wed, 1 Apr 2020 19:09:19 +0300
Subject: [PATCH 135/223] [FIX] Federation delete room event not being
 dispatched (#16861)

---
 app/federation/server/hooks/beforeDeleteRoom.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/federation/server/hooks/beforeDeleteRoom.js b/app/federation/server/hooks/beforeDeleteRoom.js
index b1cf1c8b7c1b..0131e4692806 100644
--- a/app/federation/server/hooks/beforeDeleteRoom.js
+++ b/app/federation/server/hooks/beforeDeleteRoom.js
@@ -2,6 +2,7 @@ import { logger } from '../lib/logger';
 import { FederationRoomEvents, Rooms } from '../../../models/server';
 import { hasExternalDomain } from '../functions/helpers';
 import { getFederationDomain } from '../lib/getFederationDomain';
+import { dispatchEvent } from '../handler';
 
 async function beforeDeleteRoom(roomId) {
 	const room = Rooms.findOneById(roomId, { fields: { federation: 1 } });

From ccec1027fd223ccdcc8bc1e48fc2e3e90411b461 Mon Sep 17 00:00:00 2001
From: 1rV1N <34376228+1rV1N-git@users.noreply.github.com>
Date: Wed, 1 Apr 2020 19:06:32 +0300
Subject: [PATCH 136/223] [FIX] Federation Event ROOM_ADD_USER not being
 dispatched (#16878)

---
 app/federation/server/endpoints/dispatch.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/federation/server/endpoints/dispatch.js b/app/federation/server/endpoints/dispatch.js
index 6d776db21597..77a405784316 100644
--- a/app/federation/server/endpoints/dispatch.js
+++ b/app/federation/server/endpoints/dispatch.js
@@ -87,7 +87,7 @@ const eventHandlers = {
 	//
 	// ROOM_ADD_USER
 	//
-	async [eventTypes.ROOM_ADD_USER0](event) {
+	async [eventTypes.ROOM_ADD_USER](event) {
 		const eventResult = await FederationRoomEvents.addEvent(event.context, event);
 
 		// If the event was successfully added, handle the event locally

From 1b5cff124bdd816edc6d4808b28ebd341cdbd26f Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 30 Mar 2020 01:17:36 -0300
Subject: [PATCH 137/223] =?UTF-8?q?Add=20User=E2=80=99s=20index=20for=20fi?=
 =?UTF-8?q?eld=20`appId`=20(#17075)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/server/models/Users.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/server/models/Users.js b/app/models/server/models/Users.js
index 0724bb8b2c6b..136c412d4aa2 100644
--- a/app/models/server/models/Users.js
+++ b/app/models/server/models/Users.js
@@ -36,6 +36,7 @@ export class Users extends Base {
 		this.tryEnsureIndex({ statusText: 1 });
 		this.tryEnsureIndex({ active: 1 }, { sparse: 1 });
 		this.tryEnsureIndex({ statusConnection: 1 }, { sparse: 1 });
+		this.tryEnsureIndex({ appId: 1 }, { sparse: 1 });
 		this.tryEnsureIndex({ type: 1 });
 		this.tryEnsureIndex({ 'visitorEmails.address': 1 });
 		this.tryEnsureIndex({ federation: 1 }, { sparse: true });

From b95fd147aebd15b1ca799cac7dd154da25500878 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sat, 28 Mar 2020 01:55:15 -0300
Subject: [PATCH 138/223] Regression: Do not refresh statistics when opening
 the info panel (#17060)

---
 client/components/admin/info/InformationRoute.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/components/admin/info/InformationRoute.js b/client/components/admin/info/InformationRoute.js
index 10c51e94ab0a..455b7c1fd826 100644
--- a/client/components/admin/info/InformationRoute.js
+++ b/client/components/admin/info/InformationRoute.js
@@ -21,7 +21,7 @@ export function InformationRoute() {
 	useEffect(() => {
 		let didCancel = false;
 
-		const fetchStatistics = async () => {
+		const fetchStatistics = async ({ refresh = false } = {}) => {
 			if (!canViewStatistics) {
 				setStatistics(null);
 				setInstances(null);
@@ -32,7 +32,7 @@ export function InformationRoute() {
 
 			try {
 				const [statistics, instances] = await Promise.all([
-					getStatistics({ refresh: true }),
+					getStatistics({ refresh }),
 					getInstances(),
 				]);
 
@@ -62,7 +62,7 @@ export function InformationRoute() {
 			return;
 		}
 
-		fetchStatistics();
+		fetchStatistics({ refresh: true });
 	};
 
 	const handleClickDownloadInfo = () => {

From 4edc566475fc7c5cb89e1b1d46f36af233c2bef0 Mon Sep 17 00:00:00 2001
From: Douglas Gubert <d-gubert@users.noreply.github.com>
Date: Wed, 1 Apr 2020 01:24:42 -0300
Subject: [PATCH 139/223] [IMPROVE] Apps Engine: Reduce some stream calls and
 remove a find user from the app's status changes (#17115)

---
 app/apps/server/bridges/activation.js       | 18 ++--------
 app/apps/server/communication/websockets.js | 38 ++++++++++-----------
 app/models/server/raw/Users.js              | 25 ++++++++++++++
 3 files changed, 47 insertions(+), 34 deletions(-)

diff --git a/app/apps/server/bridges/activation.js b/app/apps/server/bridges/activation.js
index b926061ed506..8f3500de68ae 100644
--- a/app/apps/server/bridges/activation.js
+++ b/app/apps/server/bridges/activation.js
@@ -1,6 +1,4 @@
-import { STATUS_MAP } from '../../../../imports/users-presence/server/activeUsers';
-import { Users } from '../../../models/server';
-import { Notifications } from '../../../notifications/server';
+import { Users } from '../../../models/server/raw';
 
 export class AppActivationBridge {
 	constructor(orch) {
@@ -20,19 +18,9 @@ export class AppActivationBridge {
 	}
 
 	async appStatusChanged(app, status) {
-		const user = Users.findOneByAppId(app.getID(), { fields: { username: 1 } });
+		const userStatus = ['auto_enabled', 'manually_enabled'].includes(status) ? 'online' : 'offline';
 
-		if (user) {
-			const { _id, username } = user;
-			const userStatus = ['auto_enabled', 'manually_enabled'].includes(status) ? 'online' : 'offline';
-
-			Users.updateStatusById(_id, userStatus);
-			Notifications.notifyLogged('user-status', [
-				_id,
-				username,
-				STATUS_MAP[userStatus],
-			]);
-		}
+		await Users.updateStatusByAppId(app.getID(), userStatus);
 
 		await this.orch.getNotifier().appStatusUpdated(app.getID(), status);
 	}
diff --git a/app/apps/server/communication/websockets.js b/app/apps/server/communication/websockets.js
index ec3f54b662a9..e5615c0e2d91 100644
--- a/app/apps/server/communication/websockets.js
+++ b/app/apps/server/communication/websockets.js
@@ -34,7 +34,7 @@ export class AppServerListener {
 
 	async onAppAdded(appId) {
 		await this.orch.getManager().loadOne(appId);
-		this.clientStreamer.emit(AppEvents.APP_ADDED, appId);
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.APP_ADDED, appId);
 	}
 
 
@@ -49,17 +49,17 @@ export class AppServerListener {
 
 		if (AppStatusUtils.isEnabled(status)) {
 			await this.orch.getManager().enable(appId).catch(console.error);
-			this.clientStreamer.emit(AppEvents.APP_STATUS_CHANGE, { appId, status });
+			this.clientStreamer.emitWithoutBroadcast(AppEvents.APP_STATUS_CHANGE, { appId, status });
 		} else if (AppStatusUtils.isDisabled(status)) {
 			await this.orch.getManager().disable(appId, status, true).catch(console.error);
-			this.clientStreamer.emit(AppEvents.APP_STATUS_CHANGE, { appId, status });
+			this.clientStreamer.emitWithoutBroadcast(AppEvents.APP_STATUS_CHANGE, { appId, status });
 		}
 	}
 
 	async onAppSettingUpdated({ appId, setting }) {
 		this.received.set(`${ AppEvents.APP_SETTING_UPDATED }_${ appId }_${ setting.id }`, { appId, setting, when: new Date() });
 		await this.orch.getManager().getSettingsManager().updateAppSetting(appId, setting);
-		this.clientStreamer.emit(AppEvents.APP_SETTING_UPDATED, { appId });
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.APP_SETTING_UPDATED, { appId });
 	}
 
 	async onAppUpdated(appId) {
@@ -68,7 +68,7 @@ export class AppServerListener {
 		const storageItem = await this.orch.getStorage().retrieveOne(appId);
 
 		await this.orch.getManager().update(storageItem.zip);
-		this.clientStreamer.emit(AppEvents.APP_UPDATED, appId);
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.APP_UPDATED, appId);
 	}
 
 	async onAppRemoved(appId) {
@@ -79,23 +79,23 @@ export class AppServerListener {
 		}
 
 		await this.orch.getManager().remove(appId);
-		this.clientStreamer.emit(AppEvents.APP_REMOVED, appId);
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.APP_REMOVED, appId);
 	}
 
 	async onCommandAdded(command) {
-		this.clientStreamer.emit(AppEvents.COMMAND_ADDED, command);
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.COMMAND_ADDED, command);
 	}
 
 	async onCommandDisabled(command) {
-		this.clientStreamer.emit(AppEvents.COMMAND_DISABLED, command);
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.COMMAND_DISABLED, command);
 	}
 
 	async onCommandUpdated(command) {
-		this.clientStreamer.emit(AppEvents.COMMAND_UPDATED, command);
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.COMMAND_UPDATED, command);
 	}
 
 	async onCommandRemoved(command) {
-		this.clientStreamer.emit(AppEvents.COMMAND_REMOVED, command);
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.COMMAND_REMOVED, command);
 	}
 }
 
@@ -120,12 +120,12 @@ export class AppServerNotifier {
 
 	async appAdded(appId) {
 		this.engineStreamer.emit(AppEvents.APP_ADDED, appId);
-		this.clientStreamer.emit(AppEvents.APP_ADDED, appId);
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.APP_ADDED, appId);
 	}
 
 	async appRemoved(appId) {
 		this.engineStreamer.emit(AppEvents.APP_REMOVED, appId);
-		this.clientStreamer.emit(AppEvents.APP_REMOVED, appId);
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.APP_REMOVED, appId);
 	}
 
 	async appUpdated(appId) {
@@ -135,7 +135,7 @@ export class AppServerNotifier {
 		}
 
 		this.engineStreamer.emit(AppEvents.APP_UPDATED, appId);
-		this.clientStreamer.emit(AppEvents.APP_UPDATED, appId);
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.APP_UPDATED, appId);
 	}
 
 	async appStatusUpdated(appId, status) {
@@ -148,7 +148,7 @@ export class AppServerNotifier {
 		}
 
 		this.engineStreamer.emit(AppEvents.APP_STATUS_CHANGE, { appId, status });
-		this.clientStreamer.emit(AppEvents.APP_STATUS_CHANGE, { appId, status });
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.APP_STATUS_CHANGE, { appId, status });
 	}
 
 	async appSettingsChange(appId, setting) {
@@ -158,26 +158,26 @@ export class AppServerNotifier {
 		}
 
 		this.engineStreamer.emit(AppEvents.APP_SETTING_UPDATED, { appId, setting });
-		this.clientStreamer.emit(AppEvents.APP_SETTING_UPDATED, { appId });
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.APP_SETTING_UPDATED, { appId });
 	}
 
 	async commandAdded(command) {
 		this.engineStreamer.emit(AppEvents.COMMAND_ADDED, command);
-		this.clientStreamer.emit(AppEvents.COMMAND_ADDED, command);
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.COMMAND_ADDED, command);
 	}
 
 	async commandDisabled(command) {
 		this.engineStreamer.emit(AppEvents.COMMAND_DISABLED, command);
-		this.clientStreamer.emit(AppEvents.COMMAND_DISABLED, command);
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.COMMAND_DISABLED, command);
 	}
 
 	async commandUpdated(command) {
 		this.engineStreamer.emit(AppEvents.COMMAND_UPDATED, command);
-		this.clientStreamer.emit(AppEvents.COMMAND_UPDATED, command);
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.COMMAND_UPDATED, command);
 	}
 
 	async commandRemoved(command) {
 		this.engineStreamer.emit(AppEvents.COMMAND_REMOVED, command);
-		this.clientStreamer.emit(AppEvents.COMMAND_REMOVED, command);
+		this.clientStreamer.emitWithoutBroadcast(AppEvents.COMMAND_REMOVED, command);
 	}
 }
diff --git a/app/models/server/raw/Users.js b/app/models/server/raw/Users.js
index 1dad38cb27b1..4a1bfbbf3d19 100644
--- a/app/models/server/raw/Users.js
+++ b/app/models/server/raw/Users.js
@@ -377,4 +377,29 @@ export class UsersRaw extends BaseRaw {
 		params.push(group);
 		return this.col.aggregate(params).toArray();
 	}
+
+	updateStatusText(_id, statusText) {
+		const update = {
+			$set: {
+				statusText,
+			},
+		};
+
+		return this.update({ _id }, update);
+	}
+
+	updateStatusByAppId(appId, status) {
+		const query = {
+			appId,
+			status: { $ne: status },
+		};
+
+		const update = {
+			$set: {
+				status,
+			},
+		};
+
+		return this.update(query, update, { multi: true });
+	}
 }

From 50652d16066d673f00c5c56f5a370957be3a6dca Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 1 Apr 2020 13:03:34 -0300
Subject: [PATCH 140/223] New Troubleshoot section for disabling features
 (#17114)

Co-Authored-By: Douglas Gubert <d-gubert@users.noreply.github.com>
---
 app/cloud/server/index.js                     | 30 ++++++++++-----
 .../server/lib/sendNotificationsOnMessage.js  | 14 ++++++-
 app/lib/server/startup/settings.js            | 37 ++++++++++++++++++-
 app/livechat/server/startup.js                | 14 ++++++-
 .../LivechatAgentActivityMonitor.js           | 25 ++++++++++++-
 app/statistics/server/lib/SAUMonitor.js       | 21 ++++++++++-
 app/statistics/server/startup/monitor.js      | 13 ++++++-
 .../server/cronProcessDownloads.js            | 20 +++++++---
 imports/users-presence/server/activeUsers.js  | 15 +++++++-
 packages/rocketchat-i18n/i18n/en.i18n.json    | 18 +++++++++
 server/startup/cron.js                        | 26 +++++++++----
 server/stream/streamBroadcast.js              | 14 ++++++-
 12 files changed, 216 insertions(+), 31 deletions(-)

diff --git a/app/cloud/server/index.js b/app/cloud/server/index.js
index 81423b62bbdb..58bd467b4dfd 100644
--- a/app/cloud/server/index.js
+++ b/app/cloud/server/index.js
@@ -8,6 +8,7 @@ import { getUserCloudAccessToken } from './functions/getUserCloudAccessToken';
 import { getWorkspaceKey } from './functions/getWorkspaceKey';
 import { syncWorkspace } from './functions/syncWorkspace';
 import { Permissions } from '../../models';
+import { settings } from '../../settings/server';
 
 if (Permissions) {
 	Permissions.createOrUpdate('manage-cloud', ['admin']);
@@ -17,16 +18,25 @@ const licenseCronName = 'Cloud Workspace Sync';
 
 Meteor.startup(function() {
 	// run token/license sync if registered
-	syncWorkspace();
-
-	SyncedCron.remove(licenseCronName);
-	SyncedCron.add({
-		name: licenseCronName,
-		schedule(parser) {
-			// Every 12 hours
-			return parser.cron('0 */12 * * *');
-		},
-		job: syncWorkspace,
+	let TroubleshootDisableWorkspaceSync;
+	settings.get('Troubleshoot_Disable_Workspace_Sync', (key, value) => {
+		if (TroubleshootDisableWorkspaceSync === value) { return; }
+		TroubleshootDisableWorkspaceSync = value;
+
+		if (value) {
+			return SyncedCron.remove(licenseCronName);
+		}
+
+		syncWorkspace();
+
+		SyncedCron.add({
+			name: licenseCronName,
+			schedule(parser) {
+				// Every 12 hours
+				return parser.cron('0 */12 * * *');
+			},
+			job: syncWorkspace,
+		});
 	});
 });
 
diff --git a/app/lib/server/lib/sendNotificationsOnMessage.js b/app/lib/server/lib/sendNotificationsOnMessage.js
index 21eab1a8535d..04c7c2f06beb 100644
--- a/app/lib/server/lib/sendNotificationsOnMessage.js
+++ b/app/lib/server/lib/sendNotificationsOnMessage.js
@@ -3,7 +3,7 @@ import moment from 'moment';
 
 import { hasPermission } from '../../../authorization';
 import { settings } from '../../../settings';
-import { callbacks } from '../../../callbacks';
+import { callbacks } from '../../../callbacks/server';
 import { Subscriptions, Users } from '../../../models/server';
 import { roomTypes } from '../../../utils';
 import { callJoinRoom, messageContainsHighlight, parseMessageTextPerUser, replaceMentionedUsernamesWithFullNames } from '../functions/notifications';
@@ -353,4 +353,14 @@ export async function sendAllNotifications(message, room) {
 	return message;
 }
 
-callbacks.add('afterSaveMessage', (message, room) => Promise.await(sendAllNotifications(message, room)), callbacks.priority.LOW, 'sendNotificationsOnMessage');
+let TroubleshootDisableNotifications;
+settings.get('Troubleshoot_Disable_Notifications', (key, value) => {
+	if (TroubleshootDisableNotifications === value) { return; }
+	TroubleshootDisableNotifications = value;
+
+	if (value) {
+		return callbacks.remove('afterSaveMessage', 'sendNotificationsOnMessage');
+	}
+
+	callbacks.add('afterSaveMessage', (message, room) => Promise.await(sendAllNotifications(message, room)), callbacks.priority.LOW, 'sendNotificationsOnMessage');
+});
diff --git a/app/lib/server/startup/settings.js b/app/lib/server/startup/settings.js
index 8bd5252c2978..a38bb86b11ba 100644
--- a/app/lib/server/startup/settings.js
+++ b/app/lib/server/startup/settings.js
@@ -1,6 +1,6 @@
 import { Random } from 'meteor/random';
 
-import { settings } from '../../../settings';
+import { settings } from '../../../settings/server';
 import './email';
 import { MessageTypesValues } from '../../lib/MessageTypes';
 
@@ -2804,4 +2804,39 @@ settings.addGroup('Rate Limiter', function() {
 	});
 });
 
+settings.addGroup('Troubleshoot', function() {
+	this.add('Troubleshoot_Disable_Notifications', false, {
+		type: 'boolean',
+		alert: 'Troubleshoot_Disable_Notifications_Alert',
+	});
+	this.add('Troubleshoot_Disable_Presence_Broadcast', false, {
+		type: 'boolean',
+		alert: 'Troubleshoot_Disable_Presence_Broadcast_Alert',
+	});
+	this.add('Troubleshoot_Disable_Instance_Broadcast', false, {
+		type: 'boolean',
+		alert: 'Troubleshoot_Disable_Instance_Broadcast_Alert',
+	});
+	this.add('Troubleshoot_Disable_Sessions_Monitor', false, {
+		type: 'boolean',
+		alert: 'Troubleshoot_Disable_Sessions_Monitor_Alert',
+	});
+	this.add('Troubleshoot_Disable_Livechat_Activity_Monitor', false, {
+		type: 'boolean',
+		alert: 'Troubleshoot_Disable_Livechat_Activity_Monitor_Alert',
+	});
+	this.add('Troubleshoot_Disable_Statistics_Generator', false, {
+		type: 'boolean',
+		alert: 'Troubleshoot_Disable_Statistics_Generator_Alert',
+	});
+	this.add('Troubleshoot_Disable_Data_Exporter_Processor', false, {
+		type: 'boolean',
+		alert: 'Troubleshoot_Disable_Data_Exporter_Processor_Alert',
+	});
+	this.add('Troubleshoot_Disable_Workspace_Sync', false, {
+		type: 'boolean',
+		alert: 'Troubleshoot_Disable_Workspace_Sync_Alert',
+	});
+});
+
 settings.init();
diff --git a/app/livechat/server/startup.js b/app/livechat/server/startup.js
index 5fc898862d73..8bf9e83e3c3e 100644
--- a/app/livechat/server/startup.js
+++ b/app/livechat/server/startup.js
@@ -70,5 +70,17 @@ Meteor.startup(() => {
 
 	createLivechatQueueView();
 
-	new LivechatAgentActivityMonitor().start();
+	const monitor = new LivechatAgentActivityMonitor();
+
+	let TroubleshootDisableLivechatActivityMonitor;
+	settings.get('Troubleshoot_Disable_Livechat_Activity_Monitor', (key, value) => {
+		if (TroubleshootDisableLivechatActivityMonitor === value) { return; }
+		TroubleshootDisableLivechatActivityMonitor = value;
+
+		if (value) {
+			return monitor.stop();
+		}
+
+		monitor.start();
+	});
 });
diff --git a/app/livechat/server/statistics/LivechatAgentActivityMonitor.js b/app/livechat/server/statistics/LivechatAgentActivityMonitor.js
index 2f0dd987bfbd..1ee4c7b2a874 100644
--- a/app/livechat/server/statistics/LivechatAgentActivityMonitor.js
+++ b/app/livechat/server/statistics/LivechatAgentActivityMonitor.js
@@ -15,12 +15,23 @@ export class LivechatAgentActivityMonitor {
 		this._handleMeteorConnection = this._handleMeteorConnection.bind(this);
 		this._handleAgentStatusChanged = this._handleAgentStatusChanged.bind(this);
 		this._handleUserStatusLivechatChanged = this._handleUserStatusLivechatChanged.bind(this);
+		this._name = 'Livechat Agent Activity Monitor';
 	}
 
 	start() {
 		this._setupListeners();
 	}
 
+	stop() {
+		if (!this.isRunning()) {
+			return;
+		}
+
+		SyncedCron.remove(this._name);
+
+		this._started = false;
+	}
+
 	isRunning() {
 		return this._started;
 	}
@@ -38,7 +49,7 @@ export class LivechatAgentActivityMonitor {
 
 	_startMonitoring() {
 		SyncedCron.add({
-			name: 'Livechat Agent Activity Monitor',
+			name: this._name,
 			schedule: (parser) => parser.cron('0 0 * * *'),
 			job: () => {
 				this._updateActiveSessions();
@@ -65,6 +76,10 @@ export class LivechatAgentActivityMonitor {
 	}
 
 	_handleMeteorConnection(connection) {
+		if (!this.isRunning()) {
+			return;
+		}
+
 		const session = Sessions.findOne({ sessionId: connection.id });
 		if (!session) {
 			return;
@@ -81,6 +96,10 @@ export class LivechatAgentActivityMonitor {
 	}
 
 	_handleAgentStatusChanged({ userId, status }) {
+		if (!this.isRunning()) {
+			return;
+		}
+
 		const user = Users.findOneById(userId);
 		if (!user || user.statusLivechat !== 'available') {
 			return;
@@ -94,6 +113,10 @@ export class LivechatAgentActivityMonitor {
 	}
 
 	_handleUserStatusLivechatChanged({ userId, status }) {
+		if (!this.isRunning()) {
+			return;
+		}
+
 		const user = Users.findOneById(userId);
 		if (user && user.status === 'offline') {
 			return;
diff --git a/app/statistics/server/lib/SAUMonitor.js b/app/statistics/server/lib/SAUMonitor.js
index 1babe1d52bd3..fdf9725e34f9 100644
--- a/app/statistics/server/lib/SAUMonitor.js
+++ b/app/statistics/server/lib/SAUMonitor.js
@@ -28,6 +28,7 @@ export class SAUMonitorClass {
 		this._timer = null;
 		this._today = getDateObj();
 		this._instanceId = null;
+		this._jobName = 'aggregate-sessions';
 	}
 
 	start(instanceId) {
@@ -59,6 +60,8 @@ export class SAUMonitorClass {
 			Meteor.clearInterval(this._timer);
 		}
 
+		SyncedCron.remove(this._jobName);
+
 		logger.debug(`[stop] - InstanceId: ${ this._instanceId }`);
 	}
 
@@ -101,6 +104,9 @@ export class SAUMonitorClass {
 		}
 
 		Meteor.onConnection((connection) => {
+			if (!this.isRunning()) {
+				return;
+			}
 			// this._handleSession(connection, getDateObj());
 
 			connection.onClose(() => {
@@ -115,6 +121,10 @@ export class SAUMonitorClass {
 		}
 
 		Accounts.onLogin((info) => {
+			if (!this.isRunning()) {
+				return;
+			}
+
 			const userId = info.user._id;
 			const loginAt = new Date();
 			const params = { userId, loginAt, ...getDateObj() };
@@ -123,6 +133,10 @@ export class SAUMonitorClass {
 		});
 
 		Accounts.onLogout((info) => {
+			if (!this.isRunning()) {
+				return;
+			}
+
 			const sessionId = info.connection.id;
 			if (info.user) {
 				const userId = info.user._id;
@@ -311,8 +325,9 @@ export class SAUMonitorClass {
 
 	_startAggregation() {
 		logger.info('[aggregate] - Start Cron.');
+
 		SyncedCron.add({
-			name: 'aggregate-sessions',
+			name: this._jobName,
 			schedule: (parser) => parser.text('at 2:00 am'),
 			job: () => {
 				this.aggregate();
@@ -321,6 +336,10 @@ export class SAUMonitorClass {
 	}
 
 	aggregate() {
+		if (!this.isRunning()) {
+			return;
+		}
+
 		logger.info('[aggregate] - Aggregatting data.');
 
 		const date = new Date();
diff --git a/app/statistics/server/startup/monitor.js b/app/statistics/server/startup/monitor.js
index f86bc7d099c3..70cd64bf5c6c 100644
--- a/app/statistics/server/startup/monitor.js
+++ b/app/statistics/server/startup/monitor.js
@@ -2,9 +2,20 @@ import { Meteor } from 'meteor/meteor';
 import { InstanceStatus } from 'meteor/konecty:multiple-instances-status';
 
 import { SAUMonitorClass } from '../lib/SAUMonitor';
+import { settings } from '../../../settings/server';
 
 const SAUMonitor = new SAUMonitorClass();
 
 Meteor.startup(() => {
-	SAUMonitor.start(InstanceStatus.id());
+	let TroubleshootDisableSessionsMonitor;
+	settings.get('Troubleshoot_Disable_Sessions_Monitor', (key, value) => {
+		if (TroubleshootDisableSessionsMonitor === value) { return; }
+		TroubleshootDisableSessionsMonitor = value;
+
+		if (value) {
+			return SAUMonitor.stop();
+		}
+
+		SAUMonitor.start(InstanceStatus.id());
+	});
 });
diff --git a/app/user-data-download/server/cronProcessDownloads.js b/app/user-data-download/server/cronProcessDownloads.js
index 552c420dd230..866b2cb66688 100644
--- a/app/user-data-download/server/cronProcessDownloads.js
+++ b/app/user-data-download/server/cronProcessDownloads.js
@@ -572,14 +572,24 @@ async function processDataDownloads() {
 	}
 }
 
+const name = 'Generate download files for user data';
+
 Meteor.startup(function() {
 	Meteor.defer(function() {
-		processDataDownloads();
+		let TroubleshootDisableDataExporterProcessor;
+		settings.get('Troubleshoot_Disable_Data_Exporter_Processor', (key, value) => {
+			if (TroubleshootDisableDataExporterProcessor === value) { return; }
+			TroubleshootDisableDataExporterProcessor = value;
+
+			if (value) {
+				return SyncedCron.remove(name);
+			}
 
-		SyncedCron.add({
-			name: 'Generate download files for user data',
-			schedule: (parser) => parser.cron(`*/${ processingFrequency } * * * *`),
-			job: processDataDownloads,
+			SyncedCron.add({
+				name,
+				schedule: (parser) => parser.cron(`*/${ processingFrequency } * * * *`),
+				job: processDataDownloads,
+			});
 		});
 	});
 });
diff --git a/imports/users-presence/server/activeUsers.js b/imports/users-presence/server/activeUsers.js
index 8a62c88d4210..1dab7ff4c8bf 100644
--- a/imports/users-presence/server/activeUsers.js
+++ b/imports/users-presence/server/activeUsers.js
@@ -1,6 +1,7 @@
 import { UserPresenceEvents } from 'meteor/konecty:user-presence';
 
 import { Notifications } from '../../../app/notifications/server';
+import { settings } from '../../../app/settings/server';
 
 // mirror of object in /imports/startup/client/listenActiveUsers.js - keep updated
 export const STATUS_MAP = {
@@ -10,7 +11,7 @@ export const STATUS_MAP = {
 	busy: 3,
 };
 
-UserPresenceEvents.on('setUserStatus', (user, status/* , statusConnection*/) => {
+const setUserStatus = (user, status/* , statusConnection*/) => {
 	const {
 		_id,
 		username,
@@ -25,4 +26,16 @@ UserPresenceEvents.on('setUserStatus', (user, status/* , statusConnection*/) =>
 		STATUS_MAP[status],
 		statusText,
 	]);
+};
+
+let TroubleshootDisablePresenceBroadcast;
+settings.get('Troubleshoot_Disable_Presence_Broadcast', (key, value) => {
+	if (TroubleshootDisablePresenceBroadcast === value) { return; }
+	TroubleshootDisablePresenceBroadcast = value;
+
+	if (value) {
+		return UserPresenceEvents.removeListener('setUserStatus', setUserStatus);
+	}
+
+	UserPresenceEvents.on('setUserStatus', setUserStatus);
 });
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 5044a004a72e..c2ad083a44f0 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -3263,6 +3263,24 @@
   "Trigger_Words": "Trigger Words",
   "Triggers": "Triggers",
   "True": "True",
+  "Troubleshoot": "Troubleshoot",
+  "Troubleshoot_Description": "These settings are meant to be enabled only with guidance of the Rocket.Chat Development or Support Teams. Do not touch them if you don't know what your are doing!",
+  "Troubleshoot_Disable_Notifications": "Disable Notifications",
+  "Troubleshoot_Disable_Notifications_Alert": "This setting completely disables the notifications system; sounds, desktop notifications, mobile notifications, and emails will stop!",
+  "Troubleshoot_Disable_Presence_Broadcast": "Disable Presence Broadcast",
+  "Troubleshoot_Disable_Presence_Broadcast_Alert": "This setting prevents all instances form sending the status changes of the users to their clients keeping all the users with their presence status from the first load!",
+  "Troubleshoot_Disable_Instance_Broadcast": "Disable Instance Broadcast",
+  "Troubleshoot_Disable_Instance_Broadcast_Alert": "This setting prevents the Rocket.Chat instances from sending events to the other instances, it may cause syncing problems and misbehavior!",
+  "Troubleshoot_Disable_Sessions_Monitor": "Disable Sessions Monitor",
+  "Troubleshoot_Disable_Sessions_Monitor_Alert": "This setting stops the processing of user sessions causing the statistics to stop working correctly!",
+  "Troubleshoot_Disable_Livechat_Activity_Monitor": "Disable Livechat Activity Monitor",
+  "Troubleshoot_Disable_Livechat_Activity_Monitor_Alert": "This setting stops the processing of livechat visitor sessions causing the statistics to stop working correctly!",
+  "Troubleshoot_Disable_Statistics_Generator": "Disable Statistics Generator",
+  "Troubleshoot_Disable_Statistics_Generator_Alert": "This setting stops the processing all statistics making the info page outdated until someone clicks on the refresh button and may cause other missing information around the system!",
+  "Troubleshoot_Disable_Data_Exporter_Processor": "Disable Data Exporter Processor",
+  "Troubleshoot_Disable_Data_Exporter_Processor_Alert": "This setting stops the processing of all export requests from users, so they will not receive the link to download their data!",
+  "Troubleshoot_Disable_Workspace_Sync": "Disable Workspace Sync",
+  "Troubleshoot_Disable_Workspace_Sync_Alert": "This setting stops the sync of this server with Rocket.Chat's cloud and may cause issues with marketplace and enteprise licenses!",
   "Tuesday": "Tuesday",
   "Turn_OFF": "Turn OFF",
   "Turn_ON": "Turn ON",
diff --git a/server/startup/cron.js b/server/startup/cron.js
index b56fd959ffb6..473682e11f5e 100644
--- a/server/startup/cron.js
+++ b/server/startup/cron.js
@@ -45,16 +45,28 @@ function cleanupOEmbedCache() {
 	return Meteor.call('OEmbedCacheCleanup');
 }
 
+const name = 'Generate and save statistics';
+
 Meteor.startup(function() {
 	return Meteor.defer(function() {
-		generateStatistics();
+		let TroubleshootDisableStatisticsGenerator;
+		settings.get('Troubleshoot_Disable_Statistics_Generator', (key, value) => {
+			if (TroubleshootDisableStatisticsGenerator === value) { return; }
+			TroubleshootDisableStatisticsGenerator = value;
 
-		SyncedCron.add({
-			name: 'Generate and save statistics',
-			schedule(parser) {
-				return parser.cron('12 * * * *');
-			},
-			job: generateStatistics,
+			if (value) {
+				return SyncedCron.remove(name);
+			}
+
+			generateStatistics();
+
+			SyncedCron.add({
+				name,
+				schedule(parser) {
+					return parser.cron('12 * * * *');
+				},
+				job: generateStatistics,
+			});
 		});
 
 		SyncedCron.add({
diff --git a/server/stream/streamBroadcast.js b/server/stream/streamBroadcast.js
index 983b351f1874..bdf10878ad3e 100644
--- a/server/stream/streamBroadcast.js
+++ b/server/stream/streamBroadcast.js
@@ -286,8 +286,20 @@ function startStreamBroadcast() {
 		return results;
 	}
 
-	return Meteor.StreamerCentral.on('broadcast', function(streamName, eventName, args) {
+	const onBroadcast = function(streamName, eventName, args) {
 		return broadcast(streamName, eventName, args);
+	};
+
+	let TroubleshootDisableInstanceBroadcast;
+	settings.get('Troubleshoot_Disable_Instance_Broadcast', (key, value) => {
+		if (TroubleshootDisableInstanceBroadcast === value) { return; }
+		TroubleshootDisableInstanceBroadcast = value;
+
+		if (value) {
+			return Meteor.StreamerCentral.removeListener('broadcast', onBroadcast);
+		}
+
+		Meteor.StreamerCentral.on('broadcast', onBroadcast);
 	});
 }
 

From 9fbef4372da99e42ad0a00af11b523b660d0b755 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Wed, 1 Apr 2020 13:42:32 -0300
Subject: [PATCH 141/223] Bump version to 3.0.10

---
 .docker/Dockerfile.rhel   |    2 +-
 .github/history.json      |   69 ++
 HISTORY.md                | 1707 +++++++++++++++++++++++++++++--------
 app/utils/rocketchat.info |    2 +-
 package.json              |    2 +-
 5 files changed, 1432 insertions(+), 350 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 4c1e89dd7881..98316250b658 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.0.9
+ENV RC_VERSION 3.0.10
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index cdc2a0f28905..d3b105596dc7 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -40136,6 +40136,75 @@
           ]
         }
       ]
+    },
+    "3.0.10": {
+      "node_version": "12.14.0",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "17114",
+          "title": "New Troubleshoot section for disabling features",
+          "userLogin": "rodrigok",
+          "milestone": "3.0.10",
+          "contributors": [
+            "rodrigok",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "17115",
+          "title": "[IMPROVE] Apps Engine: Reduce some stream calls and remove a find user from the app's status changes",
+          "userLogin": "d-gubert",
+          "milestone": "3.0.10",
+          "contributors": [
+            "d-gubert",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "17060",
+          "title": "Regression: Do not refresh statistics when opening the info panel",
+          "userLogin": "rodrigok",
+          "milestone": "3.0.10",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "17075",
+          "title": "Add User’s index for field `appId`",
+          "userLogin": "rodrigok",
+          "milestone": "3.0.10",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "16878",
+          "title": "[FIX] Federation Event ROOM_ADD_USER not being dispatched",
+          "userLogin": "1rV1N-git",
+          "milestone": "3.0.10",
+          "contributors": [
+            "1rV1N-git",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16861",
+          "title": "[FIX] Federation delete room event not being dispatched",
+          "userLogin": "1rV1N-git",
+          "milestone": "3.0.10",
+          "contributors": [
+            "1rV1N-git",
+            "web-flow"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/HISTORY.md b/HISTORY.md
index cfd87f2017fb..5aa6cf8613c2 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,45 @@
 
+# 3.0.10
+`2020-04-01  ·  1 🚀  ·  2 🐛  ·  3 🔍  ·  3 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `12.14.0`
+- NPM: `6.13.4`
+- MongoDB: `3.4, 3.6, 4.0`
+
+### 🚀 Improvements
+
+
+- Apps Engine: Reduce some stream calls and remove a find user from the app's status changes ([#17115](https://github.com/RocketChat/Rocket.Chat/pull/17115))
+
+### 🐛 Bug fixes
+
+
+- Federation Event ROOM_ADD_USER not being dispatched ([#16878](https://github.com/RocketChat/Rocket.Chat/pull/16878) by [@1rV1N-git](https://github.com/1rV1N-git))
+
+- Federation delete room event not being dispatched ([#16861](https://github.com/RocketChat/Rocket.Chat/pull/16861) by [@1rV1N-git](https://github.com/1rV1N-git))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- New Troubleshoot section for disabling features ([#17114](https://github.com/RocketChat/Rocket.Chat/pull/17114))
+
+- Regression: Do not refresh statistics when opening the info panel ([#17060](https://github.com/RocketChat/Rocket.Chat/pull/17060))
+
+- Add User’s index for field `appId` ([#17075](https://github.com/RocketChat/Rocket.Chat/pull/17075))
+
+</details>
+
+### 👩‍💻👨‍💻 Contributors 😍
+
+- [@1rV1N-git](https://github.com/1rV1N-git)
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@d-gubert](https://github.com/d-gubert)
+- [@rodrigok](https://github.com/rodrigok)
+
 # 3.0.9
 `2020-03-31  ·  1 🐛  ·  1 👩‍💻👨‍💻`
 
@@ -166,7 +207,7 @@
 - [@rodrigok](https://github.com/rodrigok)
 
 # 3.0.2
-`2020-02-21  ·  3 🐛  ·  3 👩‍💻👨‍💻`
+`2020-02-21  ·  4 🐛  ·  5 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `12.14.0`
@@ -180,13 +221,17 @@
 
 - Omnichannel Inquiry queues when removing chats ([#16603](https://github.com/RocketChat/Rocket.Chat/pull/16603))
 
+- users.info endpoint not handling the error if the user does not exist ([#16495](https://github.com/RocketChat/Rocket.Chat/pull/16495))
+
 - Clear unread red line when the ESC key is pressed  ([#16668](https://github.com/RocketChat/Rocket.Chat/pull/16668))
 
 ### 👩‍💻👨‍💻 Core Team 🤓
 
+- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
 - [@gabriellsh](https://github.com/gabriellsh)
 - [@ggazzo](https://github.com/ggazzo)
 - [@renatobecker](https://github.com/renatobecker)
+- [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 3.0.1
 `2020-02-19  ·  7 🐛  ·  4 👩‍💻👨‍💻`
@@ -221,7 +266,7 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 3.0.0
-`2020-02-14  ·  7 ️️️⚠️  ·  10 🎉  ·  11 🚀  ·  32 🐛  ·  43 🔍  ·  21 👩‍💻👨‍💻`
+`2020-02-14  ·  7 ️️️⚠️  ·  10 🎉  ·  11 🚀  ·  41 🐛  ·  49 🔍  ·  21 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `12.14.0`
@@ -298,6 +343,10 @@
 
 - Result of get avatar from url can be null ([#16123](https://github.com/RocketChat/Rocket.Chat/pull/16123))
 
+- `stdout` streamer infinite loop ([#16452](https://github.com/RocketChat/Rocket.Chat/pull/16452))
+
+- Option to make a channel default ([#16433](https://github.com/RocketChat/Rocket.Chat/pull/16433))
+
 - Rooms not being marked as read sometimes ([#16397](https://github.com/RocketChat/Rocket.Chat/pull/16397))
 
 - Container heights ([#16388](https://github.com/RocketChat/Rocket.Chat/pull/16388))
@@ -308,16 +357,30 @@
 
 - Adding 'lang' tag ([#16375](https://github.com/RocketChat/Rocket.Chat/pull/16375))
 
+- App removal was moving logs to the trash collection ([#16362](https://github.com/RocketChat/Rocket.Chat/pull/16362))
+
 - Role tags missing - Description field explanation ([#16356](https://github.com/RocketChat/Rocket.Chat/pull/16356))
 
+- Invite links usage by channel owners/moderators ([#16176](https://github.com/RocketChat/Rocket.Chat/pull/16176))
+
+- Unknown error when sending message if 'Set a User Name to Alias in Message' setting is enabled ([#16347](https://github.com/RocketChat/Rocket.Chat/pull/16347))
+
+- Slack CSV User Importer ([#16253](https://github.com/RocketChat/Rocket.Chat/pull/16253))
+
 - The "click to load" text is hard-coded and not translated. ([#16142](https://github.com/RocketChat/Rocket.Chat/pull/16142) by [@ashwaniYDV](https://github.com/ashwaniYDV))
 
+- Integrations list without pagination and outgoing integration creation ([#16233](https://github.com/RocketChat/Rocket.Chat/pull/16233))
+
+- Setup Wizard inputs and Admin Settings ([#16147](https://github.com/RocketChat/Rocket.Chat/pull/16147))
+
 - FileUpload.getBuffer was not working through the Apps-Engine ([#16234](https://github.com/RocketChat/Rocket.Chat/pull/16234))
 
 - Integrations admin page ([#16183](https://github.com/RocketChat/Rocket.Chat/pull/16183))
 
 - Readme Help wanted section ([#16197](https://github.com/RocketChat/Rocket.Chat/pull/16197))
 
+- User stuck after reset password ([#16184](https://github.com/RocketChat/Rocket.Chat/pull/16184))
+
 - auto translate cache ([#15768](https://github.com/RocketChat/Rocket.Chat/pull/15768) by [@vickyokrm](https://github.com/vickyokrm))
 
 - Save password without confirmation ([#16060](https://github.com/RocketChat/Rocket.Chat/pull/16060) by [@ashwaniYDV](https://github.com/ashwaniYDV))
@@ -380,6 +443,10 @@
 
 - Regression: Fix status bar margins ([#16438](https://github.com/RocketChat/Rocket.Chat/pull/16438))
 
+- Fix index creation for apps_logs collection ([#16401](https://github.com/RocketChat/Rocket.Chat/pull/16401))
+
+- Revert message properties validation ([#16395](https://github.com/RocketChat/Rocket.Chat/pull/16395))
+
 - Update apps engine to 1.12.0-beta.2496 ([#16398](https://github.com/RocketChat/Rocket.Chat/pull/16398))
 
 - Regression: App deletion wasn’t returning the correct information ([#16360](https://github.com/RocketChat/Rocket.Chat/pull/16360))
@@ -388,6 +455,8 @@
 
 - Fix Preview Docker image build ([#16379](https://github.com/RocketChat/Rocket.Chat/pull/16379))
 
+- Regression: Rate limiter was not working due to Meteor internal changes ([#16361](https://github.com/RocketChat/Rocket.Chat/pull/16361))
+
 - Fix assets download on CI ([#16352](https://github.com/RocketChat/Rocket.Chat/pull/16352))
 
 - Send build artifacts to S3 ([#16237](https://github.com/RocketChat/Rocket.Chat/pull/16237))
@@ -400,10 +469,14 @@
 
 - Merge master into develop & Set version to 2.5.0-develop ([#16107](https://github.com/RocketChat/Rocket.Chat/pull/16107))
 
+- Release 2.4.7 ([#16444](https://github.com/RocketChat/Rocket.Chat/pull/16444))
+
 - Fix tests ([#16469](https://github.com/RocketChat/Rocket.Chat/pull/16469))
 
 - Regression: prevent submit modal ([#16488](https://github.com/RocketChat/Rocket.Chat/pull/16488))
 
+- Update presence package to 2.6.1 ([#16486](https://github.com/RocketChat/Rocket.Chat/pull/16486))
+
 - Regression: allow private channels to hide system messages ([#16483](https://github.com/RocketChat/Rocket.Chat/pull/16483))
 
 - Regression: Fix uikit modal closing on click ([#16475](https://github.com/RocketChat/Rocket.Chat/pull/16475))
@@ -436,6 +509,8 @@
 
 - Regression: UIKit missing select states: error/disabled ([#16540](https://github.com/RocketChat/Rocket.Chat/pull/16540))
 
+- Release 2.4.9 ([#16544](https://github.com/RocketChat/Rocket.Chat/pull/16544))
+
 - Regression: fix read unread messages ([#16562](https://github.com/RocketChat/Rocket.Chat/pull/16562))
 
 - Regression: UIKit update modal actions ([#16570](https://github.com/RocketChat/Rocket.Chat/pull/16570))
@@ -707,7 +782,7 @@
 - [@tassoevan](https://github.com/tassoevan)
 
 # 2.4.1
-`2020-01-10  ·  2 🐛  ·  1 🔍  ·  4 👩‍💻👨‍💻`
+`2020-01-10  ·  3 🐛  ·  1 🔍  ·  4 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.17.0`
@@ -719,6 +794,8 @@
 
 - Enable apps change properties of the sender on the message as before ([#16189](https://github.com/RocketChat/Rocket.Chat/pull/16189))
 
+- Add missing password field back to administration area ([#16171](https://github.com/RocketChat/Rocket.Chat/pull/16171))
+
 - JS errors on Administration page ([#16139](https://github.com/RocketChat/Rocket.Chat/pull/16139))
 
 <details>
@@ -737,7 +814,7 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 2.4.0
-`2019-12-27  ·  4 🎉  ·  28 🚀  ·  21 🐛  ·  19 🔍  ·  21 👩‍💻👨‍💻`
+`2019-12-27  ·  4 🎉  ·  28 🚀  ·  29 🐛  ·  19 🔍  ·  22 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.17.0`
@@ -849,12 +926,28 @@
 
 - Incorrect translation key on Livechat Appearance template ([#15975](https://github.com/RocketChat/Rocket.Chat/pull/15975) by [@ritwizsinha](https://github.com/ritwizsinha))
 
+- Livechat Widget version 1.3.0 ([#15966](https://github.com/RocketChat/Rocket.Chat/pull/15966))
+
+- Invalid Redirect URI on Custom OAuth ([#15957](https://github.com/RocketChat/Rocket.Chat/pull/15957))
+
 - Livechat build without NodeJS installed ([#15903](https://github.com/RocketChat/Rocket.Chat/pull/15903) by [@localguru](https://github.com/localguru))
 
+- Admin menu not showing after renamed integration permissions ([#15937](https://github.com/RocketChat/Rocket.Chat/pull/15937) by [@n-se](https://github.com/n-se))
+
+- Administration UI issues ([#15934](https://github.com/RocketChat/Rocket.Chat/pull/15934))
+
 - Server crash on sync with no response ([#15919](https://github.com/RocketChat/Rocket.Chat/pull/15919))
 
+- Livechat permissions being overwrite on server restart ([#15915](https://github.com/RocketChat/Rocket.Chat/pull/15915))
+
+- Livechat triggers not firing ([#15897](https://github.com/RocketChat/Rocket.Chat/pull/15897))
+
+- Auto load image user preference ([#15895](https://github.com/RocketChat/Rocket.Chat/pull/15895))
+
 - Don't throw an error when a message is prevented from apps engine ([#15850](https://github.com/RocketChat/Rocket.Chat/pull/15850) by [@wreiske](https://github.com/wreiske))
 
+- Default value of the Livechat WebhookUrl setting ([#15898](https://github.com/RocketChat/Rocket.Chat/pull/15898))
+
 - Thread Replies in Search ([#15841](https://github.com/RocketChat/Rocket.Chat/pull/15841))
 
 - Registration form was hidden when login form was disabled ([#16062](https://github.com/RocketChat/Rocket.Chat/pull/16062))
@@ -910,6 +1003,7 @@
 - [@breaking-let](https://github.com/breaking-let)
 - [@iannuzzelli](https://github.com/iannuzzelli)
 - [@localguru](https://github.com/localguru)
+- [@n-se](https://github.com/n-se)
 - [@ritwizsinha](https://github.com/ritwizsinha)
 - [@wreiske](https://github.com/wreiske)
 - [@zdumitru](https://github.com/zdumitru)
@@ -1002,7 +1096,7 @@
 - [@tassoevan](https://github.com/tassoevan)
 
 # 2.3.0
-`2019-11-27  ·  13 🎉  ·  17 🚀  ·  26 🐛  ·  19 🔍  ·  25 👩‍💻👨‍💻`
+`2019-11-27  ·  13 🎉  ·  17 🚀  ·  26 🐛  ·  17 🔍  ·  17 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.15.1`
@@ -1134,8 +1228,6 @@
 <summary>🔍 Minor changes</summary>
 
 
-- Release 2.2.0 ([#15681](https://github.com/RocketChat/Rocket.Chat/pull/15681) by [@Montel](https://github.com/Montel) & [@antkaz](https://github.com/antkaz) & [@hmagarotto](https://github.com/hmagarotto) & [@nstseek](https://github.com/nstseek) & [@oguhpereira](https://github.com/oguhpereira) & [@rodrigokamada](https://github.com/rodrigokamada) & [@yusukeh0710](https://github.com/yusukeh0710))
-
 - LingoHub based on develop ([#15822](https://github.com/RocketChat/Rocket.Chat/pull/15822))
 
 - [REGRESSION] Add livechat room type to the room's file list ([#15795](https://github.com/RocketChat/Rocket.Chat/pull/15795))
@@ -1162,8 +1254,6 @@
 
 - Merge master into develop & Set version to 2.3.0-develop ([#15683](https://github.com/RocketChat/Rocket.Chat/pull/15683))
 
-- Release 2.2.0 ([#15681](https://github.com/RocketChat/Rocket.Chat/pull/15681) by [@Montel](https://github.com/Montel) & [@antkaz](https://github.com/antkaz) & [@hmagarotto](https://github.com/hmagarotto) & [@nstseek](https://github.com/nstseek) & [@oguhpereira](https://github.com/oguhpereira) & [@rodrigokamada](https://github.com/rodrigokamada) & [@yusukeh0710](https://github.com/yusukeh0710))
-
 - Fix Livechat duplicated templates error ([#15869](https://github.com/RocketChat/Rocket.Chat/pull/15869))
 
 - Improvements to random password field on user edit/creation ([#15870](https://github.com/RocketChat/Rocket.Chat/pull/15870))
@@ -1177,27 +1267,19 @@
 ### 👩‍💻👨‍💻 Contributors 😍
 
 - [@Exordian](https://github.com/Exordian)
-- [@Montel](https://github.com/Montel)
-- [@antkaz](https://github.com/antkaz)
-- [@hmagarotto](https://github.com/hmagarotto)
 - [@mpdbl](https://github.com/mpdbl)
 - [@nstseek](https://github.com/nstseek)
-- [@oguhpereira](https://github.com/oguhpereira)
 - [@rajvaibhavdubey](https://github.com/rajvaibhavdubey)
-- [@rodrigokamada](https://github.com/rodrigokamada)
 - [@tatosjb](https://github.com/tatosjb)
-- [@yusukeh0710](https://github.com/yusukeh0710)
 
 ### 👩‍💻👨‍💻 Core Team 🤓
 
 - [@MarcosSpessatto](https://github.com/MarcosSpessatto)
 - [@MartinSchoeler](https://github.com/MartinSchoeler)
 - [@d-gubert](https://github.com/d-gubert)
-- [@engelgabriel](https://github.com/engelgabriel)
 - [@gabriellsh](https://github.com/gabriellsh)
 - [@geekgonecrazy](https://github.com/geekgonecrazy)
 - [@ggazzo](https://github.com/ggazzo)
-- [@mar-v](https://github.com/mar-v)
 - [@mariaeduardacunha](https://github.com/mariaeduardacunha)
 - [@pierre-lehnen-rc](https://github.com/pierre-lehnen-rc)
 - [@renatobecker](https://github.com/renatobecker)
@@ -1206,15 +1288,27 @@
 - [@tassoevan](https://github.com/tassoevan)
 
 # 2.2.1
-`2019-11-19`
+`2019-11-19  ·  2 🐛  ·  2 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.15.1`
 - NPM: `6.9.0`
 - MongoDB: `3.4, 3.6, 4.0`
 
+### 🐛 Bug fixes
+
+
+- Markdown link parser ([#15794](https://github.com/RocketChat/Rocket.Chat/pull/15794))
+
+- Updating an app via "Update" button errors out with "App already exists" ([#15814](https://github.com/RocketChat/Rocket.Chat/pull/15814))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@d-gubert](https://github.com/d-gubert)
+- [@ggazzo](https://github.com/ggazzo)
+
 # 2.2.0
-`2019-10-27  ·  14 🎉  ·  16 🚀  ·  22 🐛  ·  27 🔍  ·  27 👩‍💻👨‍💻`
+`2019-10-27  ·  14 🎉  ·  16 🚀  ·  24 🐛  ·  28 🔍  ·  27 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.15.1`
@@ -1298,6 +1392,10 @@
 
 - adjustments for tooltips to show room name instead of id ([#14084](https://github.com/RocketChat/Rocket.Chat/pull/14084) by [@mohamedar97](https://github.com/mohamedar97))
 
+- Read Recepts was not working ([#15603](https://github.com/RocketChat/Rocket.Chat/pull/15603))
+
+- Dynamic import of JS files were not working correctly ([#15598](https://github.com/RocketChat/Rocket.Chat/pull/15598))
+
 - Deny editing visitor's phone number in SMS conversations ([#15602](https://github.com/RocketChat/Rocket.Chat/pull/15602))
 
 - Incorrect display of the button "Invite users" ([#15594](https://github.com/RocketChat/Rocket.Chat/pull/15594))
@@ -1392,6 +1490,8 @@
 
 - Merge master into develop ([#15680](https://github.com/RocketChat/Rocket.Chat/pull/15680) by [@knrt10](https://github.com/knrt10))
 
+- Release 2.1.2 ([#15667](https://github.com/RocketChat/Rocket.Chat/pull/15667) by [@knrt10](https://github.com/knrt10))
+
 </details>
 
 ### 👩‍💻👨‍💻 Contributors 😍
@@ -1428,13 +1528,25 @@
 - [@tassoevan](https://github.com/tassoevan)
 
 # 2.1.3
-`2019-11-19`
+`2019-11-19  ·  2 🐛  ·  2 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.15.1`
 - NPM: `6.9.0`
 - MongoDB: `3.4, 3.6, 4.0`
 
+### 🐛 Bug fixes
+
+
+- Markdown link parser ([#15794](https://github.com/RocketChat/Rocket.Chat/pull/15794))
+
+- Updating an app via "Update" button errors out with "App already exists" ([#15814](https://github.com/RocketChat/Rocket.Chat/pull/15814))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@d-gubert](https://github.com/d-gubert)
+- [@ggazzo](https://github.com/ggazzo)
+
 # 2.1.2
 `2019-10-25  ·  3 🐛  ·  1 🔍  ·  4 👩‍💻👨‍💻`
 
@@ -1683,15 +1795,27 @@
 - [@tassoevan](https://github.com/tassoevan)
 
 # 2.0.1
-`2019-11-19`
+`2019-11-19  ·  2 🐛  ·  2 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.4`
 - NPM: `6.4.1`
 - MongoDB: `3.4, 3.6, 4.0`
 
+### 🐛 Bug fixes
+
+
+- Markdown link parser ([#15794](https://github.com/RocketChat/Rocket.Chat/pull/15794))
+
+- Updating an app via "Update" button errors out with "App already exists" ([#15814](https://github.com/RocketChat/Rocket.Chat/pull/15814))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@d-gubert](https://github.com/d-gubert)
+- [@ggazzo](https://github.com/ggazzo)
+
 # 2.0.0
-`2019-09-12  ·  7 ️️️⚠️  ·  14 🎉  ·  6 🚀  ·  16 🐛  ·  36 🔍  ·  26 👩‍💻👨‍💻`
+`2019-09-12  ·  7 ️️️⚠️  ·  14 🎉  ·  6 🚀  ·  19 🐛  ·  39 🔍  ·  26 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.4`
@@ -1784,6 +1908,12 @@
 
 - TabBar not loading template titles ([#15177](https://github.com/RocketChat/Rocket.Chat/pull/15177) by [@Hudell](https://github.com/Hudell))
 
+- Attachment download button behavior ([#15172](https://github.com/RocketChat/Rocket.Chat/pull/15172))
+
+- Messages search scroll ([#15175](https://github.com/RocketChat/Rocket.Chat/pull/15175))
+
+- IE11 -  callback createTreeWalker doesnt accept acceptNode ([#15157](https://github.com/RocketChat/Rocket.Chat/pull/15157))
+
 - Threads contextual bar button visible even with threads disabled ([#14956](https://github.com/RocketChat/Rocket.Chat/pull/14956) by [@cesarmal](https://github.com/cesarmal))
 
 - Prevent to create discussion with empty name ([#14507](https://github.com/RocketChat/Rocket.Chat/pull/14507))
@@ -1800,6 +1930,8 @@
 <summary>🔍 Minor changes</summary>
 
 
+- Release 1.3.2 ([#15176](https://github.com/RocketChat/Rocket.Chat/pull/15176))
+
 - LingoHub based on develop ([#15218](https://github.com/RocketChat/Rocket.Chat/pull/15218))
 
 - Regression: fix typo permisson to permission ([#15217](https://github.com/RocketChat/Rocket.Chat/pull/15217))
@@ -1814,6 +1946,10 @@
 
 - Update presence package ([#15178](https://github.com/RocketChat/Rocket.Chat/pull/15178))
 
+- Update latest Livechat widget version to 1.1.4 ([#15173](https://github.com/RocketChat/Rocket.Chat/pull/15173))
+
+- Update latest Livechat widget version(1.1.3) ([#15154](https://github.com/RocketChat/Rocket.Chat/pull/15154))
+
 - LingoHub based on develop ([#15166](https://github.com/RocketChat/Rocket.Chat/pull/15166))
 
 - Switch outdated roadmap to point to milestones ([#15156](https://github.com/RocketChat/Rocket.Chat/pull/15156))
@@ -1963,7 +2099,7 @@
 - [@tassoevan](https://github.com/tassoevan)
 
 # 1.3.1
-`2019-08-08  ·  2 🐛  ·  1 🔍  ·  3 👩‍💻👨‍💻`
+`2019-08-08  ·  2 🐛  ·  2 🔍  ·  3 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.4`
@@ -1983,6 +2119,8 @@
 
 - Release 1.3.1 ([#15148](https://github.com/RocketChat/Rocket.Chat/pull/15148))
 
+- Fix custom auth ([#15141](https://github.com/RocketChat/Rocket.Chat/pull/15141))
+
 </details>
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -1992,7 +2130,7 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 1.3.0
-`2019-08-02  ·  9 🎉  ·  6 🚀  ·  31 🐛  ·  31 🔍  ·  29 👩‍💻👨‍💻`
+`2019-08-02  ·  9 🎉  ·  6 🚀  ·  32 🐛  ·  32 🔍  ·  29 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.4`
@@ -2100,10 +2238,14 @@
 
 - setupWizard calling multiple getSetupWizardParameters ([#15060](https://github.com/RocketChat/Rocket.Chat/pull/15060))
 
+- Not sanitized message types ([#15054](https://github.com/RocketChat/Rocket.Chat/pull/15054))
+
 <details>
 <summary>🔍 Minor changes</summary>
 
 
+- Release 1.2.1 ([#14898](https://github.com/RocketChat/Rocket.Chat/pull/14898))
+
 - Wrong text when reporting a message ([#14515](https://github.com/RocketChat/Rocket.Chat/pull/14515) by [@zdumitru](https://github.com/zdumitru))
 
 - Add missing French translation ([#15013](https://github.com/RocketChat/Rocket.Chat/pull/15013) by [@commiaI](https://github.com/commiaI))
@@ -2204,21 +2346,42 @@
 - [@tassoevan](https://github.com/tassoevan)
 
 # 1.2.4
-`2019-08-08`
+`2019-08-08  ·  1 🔍  ·  1 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.4`
 - NPM: `6.4.1`
 - MongoDB: `3.2, 3.4, 3.6, 4.0`
 
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Fix custom auth ([#15141](https://github.com/RocketChat/Rocket.Chat/pull/15141))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+
 # 1.2.2
-`2019-07-29`
+`2019-07-29  ·  1 🐛  ·  1 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.4`
 - NPM: `6.4.1`
 - MongoDB: `3.2, 3.4, 3.6, 4.0`
 
+### 🐛 Bug fixes
+
+
+- Not sanitized message types ([#15054](https://github.com/RocketChat/Rocket.Chat/pull/15054))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@ggazzo](https://github.com/ggazzo)
+
 # 1.2.1
 `2019-06-28  ·  1 🐛  ·  1 🔍  ·  2 👩‍💻👨‍💻`
 
@@ -2246,7 +2409,7 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 1.2.0
-`2019-06-27  ·  8 🎉  ·  4 🚀  ·  12 🐛  ·  8 🔍  ·  21 👩‍💻👨‍💻`
+`2019-06-27  ·  8 🎉  ·  4 🚀  ·  13 🐛  ·  9 🔍  ·  21 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.4`
@@ -2290,6 +2453,8 @@
 
 - Removes E2E action button, icon and banner when E2E is disabled. ([#14810](https://github.com/RocketChat/Rocket.Chat/pull/14810))
 
+- Gap of messages when loading history when using threads ([#14837](https://github.com/RocketChat/Rocket.Chat/pull/14837))
+
 - Assume microphone is available ([#14710](https://github.com/RocketChat/Rocket.Chat/pull/14710))
 
 - Move the set Avatar call on user creation to make sure the user has username ([#14665](https://github.com/RocketChat/Rocket.Chat/pull/14665))
@@ -2314,6 +2479,8 @@
 <summary>🔍 Minor changes</summary>
 
 
+- Regression: thread loading parent msg if is not loaded ([#14839](https://github.com/RocketChat/Rocket.Chat/pull/14839))
+
 - Fix not fully extracted pieces ([#14805](https://github.com/RocketChat/Rocket.Chat/pull/14805))
 
 - Regression: Fix file upload ([#14804](https://github.com/RocketChat/Rocket.Chat/pull/14804))
@@ -2360,21 +2527,42 @@
 - [@tassoevan](https://github.com/tassoevan)
 
 # 1.1.5
-`2019-08-08`
+`2019-08-08  ·  1 🔍  ·  1 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.4`
 - NPM: `6.4.1`
 - MongoDB: `3.2, 3.4, 3.6, 4.0`
 
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Fix custom auth ([#15141](https://github.com/RocketChat/Rocket.Chat/pull/15141))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+
 # 1.1.4
-`2019-07-29`
+`2019-07-29  ·  1 🐛  ·  1 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.4`
 - NPM: `6.4.1`
 - MongoDB: `3.2, 3.4, 3.6, 4.0`
 
+### 🐛 Bug fixes
+
+
+- Not sanitized message types ([#15054](https://github.com/RocketChat/Rocket.Chat/pull/15054))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@ggazzo](https://github.com/ggazzo)
+
 # 1.1.3
 `2019-06-21  ·  1 🐛  ·  2 🔍  ·  2 👩‍💻👨‍💻`
 
@@ -2471,7 +2659,7 @@
 - [@ggazzo](https://github.com/ggazzo)
 
 # 1.1.0
-`2019-05-27  ·  5 🎉  ·  10 🚀  ·  52 🐛  ·  35 🔍  ·  27 👩‍💻👨‍💻`
+`2019-05-27  ·  5 🎉  ·  10 🚀  ·  59 🐛  ·  35 🔍  ·  28 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.4`
@@ -2607,6 +2795,20 @@
 
 - New day separator overlapping above system message ([#14362](https://github.com/RocketChat/Rocket.Chat/pull/14362))
 
+- Popup cloud console in new window ([#14296](https://github.com/RocketChat/Rocket.Chat/pull/14296))
+
+- Switch oplog required doc link to more accurate link ([#14288](https://github.com/RocketChat/Rocket.Chat/pull/14288))
+
+- Optional exit on Unhandled Promise Rejection ([#14291](https://github.com/RocketChat/Rocket.Chat/pull/14291))
+
+- Error when accessing avatar with no token ([#14293](https://github.com/RocketChat/Rocket.Chat/pull/14293))
+
+- Startup error in registration check ([#14286](https://github.com/RocketChat/Rocket.Chat/pull/14286))
+
+- Wrong header at Apps admin section ([#14290](https://github.com/RocketChat/Rocket.Chat/pull/14290))
+
+- Error when accessing an invalid file upload url ([#14282](https://github.com/RocketChat/Rocket.Chat/pull/14282) by [@wreiske](https://github.com/wreiske))
+
 - E2E messages not decrypting in message threads ([#14580](https://github.com/RocketChat/Rocket.Chat/pull/14580))
 
 - Send replyTo for livechat offline messages ([#14568](https://github.com/RocketChat/Rocket.Chat/pull/14568))
@@ -2722,6 +2924,7 @@
 
 - [@MarcosSpessatto](https://github.com/MarcosSpessatto)
 - [@alansikora](https://github.com/alansikora)
+- [@d-gubert](https://github.com/d-gubert)
 - [@engelgabriel](https://github.com/engelgabriel)
 - [@geekgonecrazy](https://github.com/geekgonecrazy)
 - [@ggazzo](https://github.com/ggazzo)
@@ -2901,7 +3104,7 @@
 - [@rodrigok](https://github.com/rodrigok)
 
 # 1.0.0
-`2019-04-28  ·  4 ️️️⚠️  ·  30 🎉  ·  32 🚀  ·  97 🐛  ·  173 🔍  ·  60 👩‍💻👨‍💻`
+`2019-04-28  ·  4 ️️️⚠️  ·  34 🎉  ·  33 🚀  ·  107 🐛  ·  174 🔍  ·  60 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.4`
@@ -2954,6 +3157,14 @@
 
 - User avatars from external source ([#7929](https://github.com/RocketChat/Rocket.Chat/pull/7929) by [@mjovanovic0](https://github.com/mjovanovic0))
 
+- Limit all DDP/Websocket requests (configurable via admin panel) ([#13311](https://github.com/RocketChat/Rocket.Chat/pull/13311))
+
+- REST endpoint to forward livechat rooms ([#13308](https://github.com/RocketChat/Rocket.Chat/pull/13308))
+
+- Collect data for Monthly/Daily Active Users for a future dashboard ([#11525](https://github.com/RocketChat/Rocket.Chat/pull/11525))
+
+- Add parseUrls field to the apps message converter ([#13248](https://github.com/RocketChat/Rocket.Chat/pull/13248))
+
 - Add an option to delete file in files list ([#13815](https://github.com/RocketChat/Rocket.Chat/pull/13815))
 
 - Threads V 1.0 ([#13996](https://github.com/RocketChat/Rocket.Chat/pull/13996))
@@ -3023,6 +3234,8 @@
 
 - Update deleteUser errors to be more semantic ([#12380](https://github.com/RocketChat/Rocket.Chat/pull/12380) by [@timkinnane](https://github.com/timkinnane))
 
+- Send `uniqueID` to all clients so Jitsi rooms can be created correctly ([#13342](https://github.com/RocketChat/Rocket.Chat/pull/13342))
+
 - Line height on static content pages ([#11673](https://github.com/RocketChat/Rocket.Chat/pull/11673) by [@timkinnane](https://github.com/timkinnane))
 
 - new icons ([#13289](https://github.com/RocketChat/Rocket.Chat/pull/13289))
@@ -3176,6 +3389,26 @@
 
 - Fixed text for "bulk-register-user" ([#11558](https://github.com/RocketChat/Rocket.Chat/pull/11558) by [@the4ndy](https://github.com/the4ndy))
 
+- Pass token for cloud register ([#13350](https://github.com/RocketChat/Rocket.Chat/pull/13350))
+
+- Setup wizard calling 'saveSetting' for each field/setting ([#13349](https://github.com/RocketChat/Rocket.Chat/pull/13349))
+
+- Rate Limiter was limiting communication between instances ([#13326](https://github.com/RocketChat/Rocket.Chat/pull/13326))
+
+- Mobile view and re-enable E2E tests ([#13322](https://github.com/RocketChat/Rocket.Chat/pull/13322))
+
+- Hipchat Enterprise Importer not generating subscriptions ([#13293](https://github.com/RocketChat/Rocket.Chat/pull/13293) by [@Hudell](https://github.com/Hudell))
+
+- Message updating by Apps ([#13294](https://github.com/RocketChat/Rocket.Chat/pull/13294))
+
+- REST endpoint for creating custom emojis ([#13306](https://github.com/RocketChat/Rocket.Chat/pull/13306))
+
+- Preview of image uploads were not working when apps framework is enable ([#13303](https://github.com/RocketChat/Rocket.Chat/pull/13303))
+
+- HipChat Enterprise importer fails when importing a large amount of messages (millions) ([#13221](https://github.com/RocketChat/Rocket.Chat/pull/13221) by [@Hudell](https://github.com/Hudell))
+
+- Fix bug when user try recreate channel or group with same name and remove room from cache when user leaves room ([#12341](https://github.com/RocketChat/Rocket.Chat/pull/12341))
+
 - Closing sidebar when room menu is clicked. ([#13842](https://github.com/RocketChat/Rocket.Chat/pull/13842) by [@Kailash0311](https://github.com/Kailash0311))
 
 - Check settings for name requirement before validating ([#14021](https://github.com/RocketChat/Rocket.Chat/pull/14021))
@@ -3448,6 +3681,8 @@
 
 - Removed old templates ([#13406](https://github.com/RocketChat/Rocket.Chat/pull/13406))
 
+- Fix: Missing export in cloud package ([#13282](https://github.com/RocketChat/Rocket.Chat/pull/13282))
+
 - Add pagination to getUsersOfRoom ([#12834](https://github.com/RocketChat/Rocket.Chat/pull/12834) by [@Hudell](https://github.com/Hudell))
 
 - OpenShift custom OAuth support ([#13925](https://github.com/RocketChat/Rocket.Chat/pull/13925) by [@bsharrow](https://github.com/bsharrow))
@@ -3821,7 +4056,7 @@
 - [@tassoevan](https://github.com/tassoevan)
 
 # 0.74.0
-`2019-01-28  ·  10 🎉  ·  11 🚀  ·  17 🐛  ·  38 🔍  ·  24 👩‍💻👨‍💻`
+`2019-01-28  ·  11 🎉  ·  11 🚀  ·  15 🐛  ·  36 🔍  ·  22 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.4`
@@ -3851,7 +4086,9 @@
 
 - Add Allow Methods directive to CORS ([#13073](https://github.com/RocketChat/Rocket.Chat/pull/13073))
 
-### 🚀 Improvements
+- Cloud Integration ([#13013](https://github.com/RocketChat/Rocket.Chat/pull/13013))
+
+### 🚀 Improvements
 
 
 - Dutch translations ([#12294](https://github.com/RocketChat/Rocket.Chat/pull/12294) by [@Jeroeny](https://github.com/Jeroeny))
@@ -3879,10 +4116,6 @@
 ### 🐛 Bug fixes
 
 
-- Few polish translating ([#13112](https://github.com/RocketChat/Rocket.Chat/pull/13112) by [@theundefined](https://github.com/theundefined))
-
-- Few polish translating ([#13112](https://github.com/RocketChat/Rocket.Chat/pull/13112) by [@theundefined](https://github.com/theundefined))
-
 - Update Message: Does not show edited when message was not edited. ([#13053](https://github.com/RocketChat/Rocket.Chat/pull/13053) by [@Kailash0311](https://github.com/Kailash0311))
 
 - Notifications for mentions not working on large rooms and don't emit desktop notifications for offline users ([#13067](https://github.com/RocketChat/Rocket.Chat/pull/13067))
@@ -3919,8 +4152,6 @@
 
 - Release 0.74.0 ([#13270](https://github.com/RocketChat/Rocket.Chat/pull/13270) by [@Xuhao](https://github.com/Xuhao) & [@supra08](https://github.com/supra08))
 
-- Regression: Fix message pinning ([#13213](https://github.com/RocketChat/Rocket.Chat/pull/13213) by [@TkTech](https://github.com/TkTech))
-
 - LingoHub based on develop ([#13201](https://github.com/RocketChat/Rocket.Chat/pull/13201))
 
 - Language: Edit typo "Обновлить" ([#13177](https://github.com/RocketChat/Rocket.Chat/pull/13177) by [@zpavlig](https://github.com/zpavlig))
@@ -3987,8 +4218,6 @@
 
 - Regression: Fix audio message upload ([#13224](https://github.com/RocketChat/Rocket.Chat/pull/13224))
 
-- Regression: Fix message pinning ([#13213](https://github.com/RocketChat/Rocket.Chat/pull/13213) by [@TkTech](https://github.com/TkTech))
-
 - Regression: Fix emoji search ([#13207](https://github.com/RocketChat/Rocket.Chat/pull/13207))
 
 - Change apps engine persistence bridge method to updateByAssociations ([#13239](https://github.com/RocketChat/Rocket.Chat/pull/13239))
@@ -4000,7 +4229,6 @@
 - [@Hudell](https://github.com/Hudell)
 - [@Jeroeny](https://github.com/Jeroeny)
 - [@Kailash0311](https://github.com/Kailash0311)
-- [@TkTech](https://github.com/TkTech)
 - [@Xuhao](https://github.com/Xuhao)
 - [@alexbartsch](https://github.com/alexbartsch)
 - [@behnejad](https://github.com/behnejad)
@@ -4008,7 +4236,6 @@
 - [@ohmonster](https://github.com/ohmonster)
 - [@piotrkochan](https://github.com/piotrkochan)
 - [@supra08](https://github.com/supra08)
-- [@theundefined](https://github.com/theundefined)
 - [@zpavlig](https://github.com/zpavlig)
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -4083,12 +4310,17 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 0.73.0
-`2018-12-28  ·  10 🎉  ·  9 🚀  ·  34 🐛  ·  84 🔍  ·  26 👩‍💻👨‍💻`
+`2018-12-28  ·  1 ️️️⚠️  ·  16 🎉  ·  25 🚀  ·  60 🐛  ·  165 🔍  ·  39 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.4`
 - NPM: `6.4.1`
 
+### ⚠️ BREAKING CHANGES
+
+
+- Update to Meteor to 1.8 ([#12468](https://github.com/RocketChat/Rocket.Chat/pull/12468))
+
 ### 🎉 New features
 
 
@@ -4112,6 +4344,18 @@
 
 - Include message type & id in push notification payload ([#12771](https://github.com/RocketChat/Rocket.Chat/pull/12771) by [@cardoso](https://github.com/cardoso))
 
+- Add permission to enable personal access token to specific roles ([#12309](https://github.com/RocketChat/Rocket.Chat/pull/12309))
+
+- Option to reset e2e key ([#12483](https://github.com/RocketChat/Rocket.Chat/pull/12483) by [@Hudell](https://github.com/Hudell))
+
+- /api/v1/spotlight: return joinCodeRequired field for rooms ([#12651](https://github.com/RocketChat/Rocket.Chat/pull/12651) by [@cardoso](https://github.com/cardoso))
+
+- New API Endpoints for the new version of JS SDK ([#12623](https://github.com/RocketChat/Rocket.Chat/pull/12623))
+
+- Setting to configure robots.txt content ([#12547](https://github.com/RocketChat/Rocket.Chat/pull/12547) by [@Hudell](https://github.com/Hudell))
+
+- Make Livechat's widget draggable ([#12378](https://github.com/RocketChat/Rocket.Chat/pull/12378))
+
 ### 🚀 Improvements
 
 
@@ -4133,6 +4377,38 @@
 
 - Username suggestion logic ([#12779](https://github.com/RocketChat/Rocket.Chat/pull/12779))
 
+- Allow apps to update persistence by association ([#12714](https://github.com/RocketChat/Rocket.Chat/pull/12714))
+
+- Add more methods to deal with rooms via Rocket.Chat.Apps ([#12680](https://github.com/RocketChat/Rocket.Chat/pull/12680))
+
+- Better query for finding subscriptions that need a new E2E Key ([#12692](https://github.com/RocketChat/Rocket.Chat/pull/12692) by [@Hudell](https://github.com/Hudell))
+
+- Improve unreads and unreadsFrom response, prevent it to be equal null ([#12563](https://github.com/RocketChat/Rocket.Chat/pull/12563))
+
+- Add rooms property in user object, if the user has the permission, with rooms roles ([#12105](https://github.com/RocketChat/Rocket.Chat/pull/12105))
+
+- border-radius to use --border-radius ([#12675](https://github.com/RocketChat/Rocket.Chat/pull/12675))
+
+- Update the 'keyboard shortcuts' documentation ([#12564](https://github.com/RocketChat/Rocket.Chat/pull/12564) by [@nicolasbock](https://github.com/nicolasbock))
+
+- Add new acceptable header for Livechat REST requests ([#12561](https://github.com/RocketChat/Rocket.Chat/pull/12561))
+
+- Atlassian Crowd settings and option to sync user data ([#12616](https://github.com/RocketChat/Rocket.Chat/pull/12616))
+
+- CircleCI to use MongoDB 4.0 for testing ([#12618](https://github.com/RocketChat/Rocket.Chat/pull/12618))
+
+- Japanese translations ([#12382](https://github.com/RocketChat/Rocket.Chat/pull/12382) by [@ura14h](https://github.com/ura14h))
+
+- Add CTRL modifier for keyboard shortcut ([#12525](https://github.com/RocketChat/Rocket.Chat/pull/12525) by [@nicolasbock](https://github.com/nicolasbock))
+
+- Ignore non-existent Livechat custom fields on Livechat API ([#12522](https://github.com/RocketChat/Rocket.Chat/pull/12522))
+
+- Emoji search on messageBox behaving like emojiPicker's search (#9607) ([#12452](https://github.com/RocketChat/Rocket.Chat/pull/12452) by [@vinade](https://github.com/vinade))
+
+- German translations ([#12471](https://github.com/RocketChat/Rocket.Chat/pull/12471) by [@mrsimpson](https://github.com/mrsimpson))
+
+- Limit the number of typing users shown (#8722) ([#12400](https://github.com/RocketChat/Rocket.Chat/pull/12400) by [@vinade](https://github.com/vinade))
+
 ### 🐛 Bug fixes
 
 
@@ -4194,6 +4470,12 @@
 
 - Version check update notification ([#12905](https://github.com/RocketChat/Rocket.Chat/pull/12905))
 
+- line-height for unread bar buttons (jump to first and mark as read) ([#12900](https://github.com/RocketChat/Rocket.Chat/pull/12900))
+
+- PDF view loading indicator ([#12882](https://github.com/RocketChat/Rocket.Chat/pull/12882))
+
+- Reset password email ([#12898](https://github.com/RocketChat/Rocket.Chat/pull/12898))
+
 - Data Import not working ([#12866](https://github.com/RocketChat/Rocket.Chat/pull/12866) by [@Hudell](https://github.com/Hudell))
 
 - Incorrect parameter name in Livechat stream ([#12851](https://github.com/RocketChat/Rocket.Chat/pull/12851))
@@ -4202,12 +4484,62 @@
 
 - Google Cloud Storage storage provider ([#12843](https://github.com/RocketChat/Rocket.Chat/pull/12843))
 
+- Update caret position on insert a new line in message box ([#12713](https://github.com/RocketChat/Rocket.Chat/pull/12713))
+
+- DE translation for idle-time-limit ([#12637](https://github.com/RocketChat/Rocket.Chat/pull/12637) by [@pfuender](https://github.com/pfuender))
+
+- Fixed Anonymous Registration ([#12633](https://github.com/RocketChat/Rocket.Chat/pull/12633) by [@wreiske](https://github.com/wreiske))
+
+- high cpu usage ~ svg icon ([#12677](https://github.com/RocketChat/Rocket.Chat/pull/12677) by [@ph1p](https://github.com/ph1p))
+
+- Fix favico error ([#12643](https://github.com/RocketChat/Rocket.Chat/pull/12643))
+
+- Condition to not render PDF preview ([#12632](https://github.com/RocketChat/Rocket.Chat/pull/12632))
+
+- Admin styles ([#12614](https://github.com/RocketChat/Rocket.Chat/pull/12614))
+
+- Admin styles ([#12602](https://github.com/RocketChat/Rocket.Chat/pull/12602))
+
+- Change registration message when user need to confirm email ([#9336](https://github.com/RocketChat/Rocket.Chat/pull/9336) by [@karlprieb](https://github.com/karlprieb))
+
+- Import missed file in rocketchat-authorization ([#12570](https://github.com/RocketChat/Rocket.Chat/pull/12570))
+
+- Prevent subscriptions and calls to rooms events that the user is not participating ([#12558](https://github.com/RocketChat/Rocket.Chat/pull/12558))
+
+- Wrong test case for `users.setAvatar` endpoint ([#12539](https://github.com/RocketChat/Rocket.Chat/pull/12539))
+
+- Spotlight method being called multiple times ([#12536](https://github.com/RocketChat/Rocket.Chat/pull/12536))
+
+- German translation for for API_EmbedIgnoredHosts label ([#12518](https://github.com/RocketChat/Rocket.Chat/pull/12518) by [@mbrodala](https://github.com/mbrodala))
+
+- Handle all events for enter key in message box ([#12507](https://github.com/RocketChat/Rocket.Chat/pull/12507))
+
+- Fix wrong parameter in chat.delete endpoint and add some test cases ([#12408](https://github.com/RocketChat/Rocket.Chat/pull/12408))
+
+- Email sending with GDPR user data ([#12487](https://github.com/RocketChat/Rocket.Chat/pull/12487))
+
+- Manage own integrations permissions check ([#12397](https://github.com/RocketChat/Rocket.Chat/pull/12397))
+
+- stream room-changed ([#12411](https://github.com/RocketChat/Rocket.Chat/pull/12411))
+
+- Emoji picker is not in viewport on small screens ([#12457](https://github.com/RocketChat/Rocket.Chat/pull/12457) by [@ramrami](https://github.com/ramrami))
+
+- `Disabled` word translation to Spanish ([#12406](https://github.com/RocketChat/Rocket.Chat/pull/12406) by [@Ismaw34](https://github.com/Ismaw34))
+
+- `Disabled` word translation to Chinese ([#12260](https://github.com/RocketChat/Rocket.Chat/pull/12260) by [@AndreamApp](https://github.com/AndreamApp))
+
+- Correct roomName value in Mail Messages (#12363) ([#12453](https://github.com/RocketChat/Rocket.Chat/pull/12453) by [@vinade](https://github.com/vinade))
+
 - Download files without extension wasn't possible ([#13033](https://github.com/RocketChat/Rocket.Chat/pull/13033))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
 
+- Release 0.72.3 ([#12932](https://github.com/RocketChat/Rocket.Chat/pull/12932) by [@Hudell](https://github.com/Hudell) & [@piotrkochan](https://github.com/piotrkochan))
+
+- Release 0.72.2 ([#12901](https://github.com/RocketChat/Rocket.Chat/pull/12901))
+
 - LingoHub based on develop ([#13014](https://github.com/RocketChat/Rocket.Chat/pull/13014))
 
 - Move isFirefox and isChrome functions to rocketchat-utils ([#13011](https://github.com/RocketChat/Rocket.Chat/pull/13011))
@@ -4370,149 +4702,322 @@
 
 - Merge master into develop & Set version to 0.73.0-develop ([#12776](https://github.com/RocketChat/Rocket.Chat/pull/12776))
 
-- Change `chat.getDeletedMessages` to get messages after informed date and return only message's _id ([#13021](https://github.com/RocketChat/Rocket.Chat/pull/13021))
+- Update Apps Engine to 1.3.1 ([#12741](https://github.com/RocketChat/Rocket.Chat/pull/12741))
 
-- Improve Importer code quality ([#13020](https://github.com/RocketChat/Rocket.Chat/pull/13020) by [@Hudell](https://github.com/Hudell))
+- Regression: Expand Administration sections by toggling section title ([#12736](https://github.com/RocketChat/Rocket.Chat/pull/12736))
 
-- Regression: List of custom emojis wasn't working ([#13031](https://github.com/RocketChat/Rocket.Chat/pull/13031))
+- Regression: Fix Safari detection in PDF previewing ([#12737](https://github.com/RocketChat/Rocket.Chat/pull/12737))
 
-</details>
+- Regression: Account pages layout ([#12735](https://github.com/RocketChat/Rocket.Chat/pull/12735))
 
-### 👩‍💻👨‍💻 Contributors 😍
+- Regression: Inherit font-family for message box ([#12729](https://github.com/RocketChat/Rocket.Chat/pull/12729))
 
-- [@Hudell](https://github.com/Hudell)
-- [@alexbartsch](https://github.com/alexbartsch)
-- [@cardoso](https://github.com/cardoso)
-- [@cyberb](https://github.com/cyberb)
-- [@hypery2k](https://github.com/hypery2k)
-- [@karakayasemi](https://github.com/karakayasemi)
-- [@karlprieb](https://github.com/karlprieb)
-- [@localguru](https://github.com/localguru)
-- [@lvyue](https://github.com/lvyue)
-- [@mathysie](https://github.com/mathysie)
-- [@piotrkochan](https://github.com/piotrkochan)
-- [@rssilva](https://github.com/rssilva)
-- [@sanketsingh24](https://github.com/sanketsingh24)
-- [@tsukiRep](https://github.com/tsukiRep)
-- [@ura14h](https://github.com/ura14h)
+- Fix some Ukrainian translations ([#12712](https://github.com/RocketChat/Rocket.Chat/pull/12712) by [@zdumitru](https://github.com/zdumitru))
 
-### 👩‍💻👨‍💻 Core Team 🤓
+- Improve: Add missing translation keys. ([#12708](https://github.com/RocketChat/Rocket.Chat/pull/12708) by [@ura14h](https://github.com/ura14h))
 
-- [@LuluGO](https://github.com/LuluGO)
-- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
-- [@d-gubert](https://github.com/d-gubert)
-- [@engelgabriel](https://github.com/engelgabriel)
-- [@geekgonecrazy](https://github.com/geekgonecrazy)
-- [@ggazzo](https://github.com/ggazzo)
-- [@marceloschmidt](https://github.com/marceloschmidt)
-- [@renatobecker](https://github.com/renatobecker)
-- [@rodrigok](https://github.com/rodrigok)
-- [@sampaiodiego](https://github.com/sampaiodiego)
-- [@tassoevan](https://github.com/tassoevan)
+- Bump Apps Engine to 1.3.0 ([#12705](https://github.com/RocketChat/Rocket.Chat/pull/12705))
 
-# 0.72.3
-`2018-12-12  ·  1 🔍  ·  5 👩‍💻👨‍💻`
+- Fix: Exception when registering a user with gravatar ([#12699](https://github.com/RocketChat/Rocket.Chat/pull/12699))
 
-<details>
-<summary>🔍 Minor changes</summary>
+- Fix: Fix tests by increasing window size ([#12707](https://github.com/RocketChat/Rocket.Chat/pull/12707))
 
+- LingoHub based on develop ([#12684](https://github.com/RocketChat/Rocket.Chat/pull/12684))
 
-- Release 0.72.3 ([#12932](https://github.com/RocketChat/Rocket.Chat/pull/12932) by [@Hudell](https://github.com/Hudell) & [@piotrkochan](https://github.com/piotrkochan))
+- Convert rocketchat-mail-messages to main module structure ([#12682](https://github.com/RocketChat/Rocket.Chat/pull/12682))
 
-</details>
+-  Convert rocketchat-livestream to main module structure ([#12679](https://github.com/RocketChat/Rocket.Chat/pull/12679))
 
-### 👩‍💻👨‍💻 Contributors 😍
+- Added "npm install" to quick start for developers ([#12374](https://github.com/RocketChat/Rocket.Chat/pull/12374) by [@wreiske](https://github.com/wreiske))
 
-- [@Hudell](https://github.com/Hudell)
-- [@piotrkochan](https://github.com/piotrkochan)
+- Convert rocketchat-ldap to main module structure ([#12678](https://github.com/RocketChat/Rocket.Chat/pull/12678))
 
-### 👩‍💻👨‍💻 Core Team 🤓
+- Convert rocketchat-issuelinks to main module structure ([#12674](https://github.com/RocketChat/Rocket.Chat/pull/12674))
 
-- [@ggazzo](https://github.com/ggazzo)
-- [@rodrigok](https://github.com/rodrigok)
-- [@tassoevan](https://github.com/tassoevan)
+- Convert rocketchat-integrations to main module structure ([#12670](https://github.com/RocketChat/Rocket.Chat/pull/12670))
 
-# 0.72.2
-`2018-12-10  ·  2 🐛  ·  1 🔍  ·  2 👩‍💻👨‍💻`
+- Convert rocketchat-irc to main module structure ([#12672](https://github.com/RocketChat/Rocket.Chat/pull/12672))
 
-### 🐛 Bug fixes
+- Convert rocketchat-internal-hubot to main module structure ([#12671](https://github.com/RocketChat/Rocket.Chat/pull/12671))
 
+- Convert rocketchat-importer-hipchat-enterprise to main module structure ([#12665](https://github.com/RocketChat/Rocket.Chat/pull/12665))
 
-- line-height for unread bar buttons (jump to first and mark as read) ([#12900](https://github.com/RocketChat/Rocket.Chat/pull/12900))
+- Convert rocketchat-importer-slack-users to main module structure ([#12669](https://github.com/RocketChat/Rocket.Chat/pull/12669))
 
-- PDF view loading indicator ([#12882](https://github.com/RocketChat/Rocket.Chat/pull/12882))
+-  Convert rocketchat-importer-slack to main module structure ([#12666](https://github.com/RocketChat/Rocket.Chat/pull/12666))
 
-<details>
-<summary>🔍 Minor changes</summary>
+- Convert rocketchat-iframe-login to main module structure ([#12661](https://github.com/RocketChat/Rocket.Chat/pull/12661))
 
+- Convert rocketchat-importer to main module structure ([#12662](https://github.com/RocketChat/Rocket.Chat/pull/12662))
 
-- Release 0.72.2 ([#12901](https://github.com/RocketChat/Rocket.Chat/pull/12901))
+- Convert rocketchat-importer-csv to main module structure ([#12663](https://github.com/RocketChat/Rocket.Chat/pull/12663))
 
-</details>
+- Convert rocketchat-importer-hipchat to main module structure ([#12664](https://github.com/RocketChat/Rocket.Chat/pull/12664))
 
-### 👩‍💻👨‍💻 Core Team 🤓
+- Convert rocketchat-highlight-words to main module structure ([#12659](https://github.com/RocketChat/Rocket.Chat/pull/12659))
 
-- [@sampaiodiego](https://github.com/sampaiodiego)
-- [@tassoevan](https://github.com/tassoevan)
+- Convert rocketchat-grant to main module structure ([#12657](https://github.com/RocketChat/Rocket.Chat/pull/12657))
 
-# 0.72.1
-`2018-12-05  ·  4 🐛  ·  3 🔍  ·  8 👩‍💻👨‍💻`
+- Convert rocketchat-graphql to main module structure ([#12658](https://github.com/RocketChat/Rocket.Chat/pull/12658))
 
-### 🐛 Bug fixes
+- Convert rocketchat-google-vision to main module structure ([#12649](https://github.com/RocketChat/Rocket.Chat/pull/12649))
 
+- Removed RocketChatFile from globals ([#12650](https://github.com/RocketChat/Rocket.Chat/pull/12650))
 
-- Change spread operator to Array.from for Edge browser ([#12818](https://github.com/RocketChat/Rocket.Chat/pull/12818) by [@ohmonster](https://github.com/ohmonster))
+- Added imports for global variables in rocketchat-google-natural-language package ([#12647](https://github.com/RocketChat/Rocket.Chat/pull/12647))
 
-- API users.info returns caller rooms and not requested user ones ([#12727](https://github.com/RocketChat/Rocket.Chat/pull/12727) by [@piotrkochan](https://github.com/piotrkochan))
+- Convert rocketchat-gitlab to main module structure ([#12646](https://github.com/RocketChat/Rocket.Chat/pull/12646))
 
-- Missing HipChat Enterprise Importer ([#12847](https://github.com/RocketChat/Rocket.Chat/pull/12847) by [@Hudell](https://github.com/Hudell))
+- Convert rocketchat-file to main module structure ([#12644](https://github.com/RocketChat/Rocket.Chat/pull/12644))
 
-- Emoji as avatar ([#12805](https://github.com/RocketChat/Rocket.Chat/pull/12805))
+- Convert rocketchat-github-enterprise to main module structure ([#12642](https://github.com/RocketChat/Rocket.Chat/pull/12642))
 
-<details>
-<summary>🔍 Minor changes</summary>
+- Fix: Add email dependency in package.js ([#12645](https://github.com/RocketChat/Rocket.Chat/pull/12645))
 
+- Convert rocketchat-custom-sounds to main module structure ([#12599](https://github.com/RocketChat/Rocket.Chat/pull/12599))
 
-- Release 0.72.1 ([#12850](https://github.com/RocketChat/Rocket.Chat/pull/12850) by [@Hudell](https://github.com/Hudell) & [@ohmonster](https://github.com/ohmonster) & [@piotrkochan](https://github.com/piotrkochan))
+- Fix crowd error with import of SyncedCron ([#12641](https://github.com/RocketChat/Rocket.Chat/pull/12641))
 
-- Bump Apps-Engine version ([#12848](https://github.com/RocketChat/Rocket.Chat/pull/12848))
+- Convert emoji-emojione to main module structure ([#12605](https://github.com/RocketChat/Rocket.Chat/pull/12605))
 
-- Change file order in rocketchat-cors ([#12804](https://github.com/RocketChat/Rocket.Chat/pull/12804))
+- Convert rocketchat-favico to main module structure ([#12607](https://github.com/RocketChat/Rocket.Chat/pull/12607))
 
-</details>
+-  Convert rocketchat-emoji-custom to main module structure ([#12604](https://github.com/RocketChat/Rocket.Chat/pull/12604))
 
-### 👩‍💻👨‍💻 Contributors 😍
+- Convert rocketchat-error-handler to main module structure ([#12606](https://github.com/RocketChat/Rocket.Chat/pull/12606))
 
-- [@Hudell](https://github.com/Hudell)
-- [@ohmonster](https://github.com/ohmonster)
-- [@piotrkochan](https://github.com/piotrkochan)
+- Convert rocketchat-drupal to main module structure ([#12601](https://github.com/RocketChat/Rocket.Chat/pull/12601))
 
-### 👩‍💻👨‍💻 Core Team 🤓
+- Convert rocketchat-crowd to main module structure ([#12596](https://github.com/RocketChat/Rocket.Chat/pull/12596))
 
-- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
-- [@d-gubert](https://github.com/d-gubert)
-- [@rodrigok](https://github.com/rodrigok)
-- [@sampaiodiego](https://github.com/sampaiodiego)
-- [@tassoevan](https://github.com/tassoevan)
+- Convert rocketchat-emoji to main module structure ([#12603](https://github.com/RocketChat/Rocket.Chat/pull/12603))
 
-# 0.72.0
-`2018-11-28  ·  2 ️️️⚠️  ·  6 🎉  ·  16 🚀  ·  22 🐛  ·  79 🔍  ·  25 👩‍💻👨‍💻`
+- Fix users.setAvatar endpoint tests and logic ([#12625](https://github.com/RocketChat/Rocket.Chat/pull/12625))
 
-### ⚠️ BREAKING CHANGES
+- [DOCS] Remove Cordova links, include F-Droid download button and few other adjustments ([#12583](https://github.com/RocketChat/Rocket.Chat/pull/12583) by [@rafaelks](https://github.com/rafaelks))
 
+- Convert rocketchat-dolphin to main module structure ([#12600](https://github.com/RocketChat/Rocket.Chat/pull/12600))
 
-- Support for Cordova (Rocket.Chat Legacy app) has reached End-of-life, support has been discontinued
+-  Convert rocketchat-channel-settings to main module structure ([#12594](https://github.com/RocketChat/Rocket.Chat/pull/12594))
 
-- Update to Meteor to 1.8 ([#12468](https://github.com/RocketChat/Rocket.Chat/pull/12468))
+- Convert rocketchat-cors to main module structure ([#12595](https://github.com/RocketChat/Rocket.Chat/pull/12595))
 
-### 🎉 New features
+- Convert rocketchat-autotranslate to main module structure ([#12530](https://github.com/RocketChat/Rocket.Chat/pull/12530))
 
+- Convert rocketchat-channel-settings-mail-messages to main module structure ([#12537](https://github.com/RocketChat/Rocket.Chat/pull/12537))
 
-- Add permission to enable personal access token to specific roles ([#12309](https://github.com/RocketChat/Rocket.Chat/pull/12309))
+- Convert rocketchat-colors to main module structure ([#12538](https://github.com/RocketChat/Rocket.Chat/pull/12538))
 
-- Option to reset e2e key ([#12483](https://github.com/RocketChat/Rocket.Chat/pull/12483) by [@Hudell](https://github.com/Hudell))
+- Convert rocketchat-cas to main module structure ([#12532](https://github.com/RocketChat/Rocket.Chat/pull/12532))
 
-- /api/v1/spotlight: return joinCodeRequired field for rooms ([#12651](https://github.com/RocketChat/Rocket.Chat/pull/12651) by [@cardoso](https://github.com/cardoso))
+- Convert rocketchat-bot-helpers to main module structure ([#12531](https://github.com/RocketChat/Rocket.Chat/pull/12531))
+
+- Convert rocketchat-autolinker to main module structure ([#12529](https://github.com/RocketChat/Rocket.Chat/pull/12529))
+
+- Convert rocketchat-authorization to main module structure ([#12523](https://github.com/RocketChat/Rocket.Chat/pull/12523))
+
+- Fix CSS import order ([#12524](https://github.com/RocketChat/Rocket.Chat/pull/12524))
+
+- Remove template for feature requests as issues ([#12426](https://github.com/RocketChat/Rocket.Chat/pull/12426))
+
+- Fix punctuation, spelling, and grammar ([#12451](https://github.com/RocketChat/Rocket.Chat/pull/12451) by [@imronras](https://github.com/imronras))
+
+- Convert rocketchat-assets to main module structure ([#12521](https://github.com/RocketChat/Rocket.Chat/pull/12521))
+
+- Convert rocketchat-api to main module structure ([#12510](https://github.com/RocketChat/Rocket.Chat/pull/12510))
+
+- Convert rocketchat-analytics to main module structure ([#12506](https://github.com/RocketChat/Rocket.Chat/pull/12506))
+
+- Convert rocketchat-action-links to main module structure ([#12503](https://github.com/RocketChat/Rocket.Chat/pull/12503))
+
+- Convert rocketchat-2fa to main module structure ([#12501](https://github.com/RocketChat/Rocket.Chat/pull/12501))
+
+- Convert meteor-timesync to main module structure ([#12495](https://github.com/RocketChat/Rocket.Chat/pull/12495))
+
+- Convert meteor-autocomplete package to main module structure ([#12491](https://github.com/RocketChat/Rocket.Chat/pull/12491))
+
+- Convert meteor-accounts-saml to main module structure ([#12486](https://github.com/RocketChat/Rocket.Chat/pull/12486))
+
+- Convert chatpal search package to modular structure ([#12485](https://github.com/RocketChat/Rocket.Chat/pull/12485))
+
+- Removal of TAPi18n and TAPi18next global variables ([#12467](https://github.com/RocketChat/Rocket.Chat/pull/12467))
+
+- Removal of Template, Blaze, BlazeLayout, FlowRouter, DDPRateLimiter, Session, UAParser, Promise, Reload and CryptoJS global variables ([#12433](https://github.com/RocketChat/Rocket.Chat/pull/12433))
+
+- Removal of Match, check, moment, Tracker and Mongo global variables ([#12410](https://github.com/RocketChat/Rocket.Chat/pull/12410))
+
+- Removal of EJSON, Accounts, Email, HTTP, Random, ReactiveDict, ReactiveVar, SHA256 and WebApp global variables ([#12377](https://github.com/RocketChat/Rocket.Chat/pull/12377))
+
+- Removal of Meteor global variable ([#12371](https://github.com/RocketChat/Rocket.Chat/pull/12371))
+
+- Fix ES translation ([#12509](https://github.com/RocketChat/Rocket.Chat/pull/12509))
+
+- LingoHub based on develop ([#12470](https://github.com/RocketChat/Rocket.Chat/pull/12470))
+
+- Update npm dependencies ([#12465](https://github.com/RocketChat/Rocket.Chat/pull/12465))
+
+- Fix: Developers not being able to debug root files in VSCode ([#12440](https://github.com/RocketChat/Rocket.Chat/pull/12440) by [@mrsimpson](https://github.com/mrsimpson))
+
+- Merge master into develop & Set version to 0.72.0-develop ([#12460](https://github.com/RocketChat/Rocket.Chat/pull/12460) by [@Hudell](https://github.com/Hudell))
+
+- Change `chat.getDeletedMessages` to get messages after informed date and return only message's _id ([#13021](https://github.com/RocketChat/Rocket.Chat/pull/13021))
+
+- Improve Importer code quality ([#13020](https://github.com/RocketChat/Rocket.Chat/pull/13020) by [@Hudell](https://github.com/Hudell))
+
+- Regression: List of custom emojis wasn't working ([#13031](https://github.com/RocketChat/Rocket.Chat/pull/13031))
+
+</details>
+
+### 👩‍💻👨‍💻 Contributors 😍
+
+- [@AndreamApp](https://github.com/AndreamApp)
+- [@Hudell](https://github.com/Hudell)
+- [@Ismaw34](https://github.com/Ismaw34)
+- [@alexbartsch](https://github.com/alexbartsch)
+- [@cardoso](https://github.com/cardoso)
+- [@cyberb](https://github.com/cyberb)
+- [@hypery2k](https://github.com/hypery2k)
+- [@imronras](https://github.com/imronras)
+- [@karakayasemi](https://github.com/karakayasemi)
+- [@karlprieb](https://github.com/karlprieb)
+- [@localguru](https://github.com/localguru)
+- [@lvyue](https://github.com/lvyue)
+- [@mathysie](https://github.com/mathysie)
+- [@mbrodala](https://github.com/mbrodala)
+- [@mrsimpson](https://github.com/mrsimpson)
+- [@nicolasbock](https://github.com/nicolasbock)
+- [@pfuender](https://github.com/pfuender)
+- [@ph1p](https://github.com/ph1p)
+- [@piotrkochan](https://github.com/piotrkochan)
+- [@rafaelks](https://github.com/rafaelks)
+- [@ramrami](https://github.com/ramrami)
+- [@rssilva](https://github.com/rssilva)
+- [@sanketsingh24](https://github.com/sanketsingh24)
+- [@tsukiRep](https://github.com/tsukiRep)
+- [@ura14h](https://github.com/ura14h)
+- [@vinade](https://github.com/vinade)
+- [@wreiske](https://github.com/wreiske)
+- [@zdumitru](https://github.com/zdumitru)
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@LuluGO](https://github.com/LuluGO)
+- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+- [@d-gubert](https://github.com/d-gubert)
+- [@engelgabriel](https://github.com/engelgabriel)
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@ggazzo](https://github.com/ggazzo)
+- [@marceloschmidt](https://github.com/marceloschmidt)
+- [@renatobecker](https://github.com/renatobecker)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+- [@tassoevan](https://github.com/tassoevan)
+
+# 0.72.3
+`2018-12-12  ·  1 🔍  ·  5 👩‍💻👨‍💻`
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Release 0.72.3 ([#12932](https://github.com/RocketChat/Rocket.Chat/pull/12932) by [@Hudell](https://github.com/Hudell) & [@piotrkochan](https://github.com/piotrkochan))
+
+</details>
+
+### 👩‍💻👨‍💻 Contributors 😍
+
+- [@Hudell](https://github.com/Hudell)
+- [@piotrkochan](https://github.com/piotrkochan)
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@ggazzo](https://github.com/ggazzo)
+- [@rodrigok](https://github.com/rodrigok)
+- [@tassoevan](https://github.com/tassoevan)
+
+# 0.72.2
+`2018-12-10  ·  3 🐛  ·  1 🔍  ·  2 👩‍💻👨‍💻`
+
+### 🐛 Bug fixes
+
+
+- line-height for unread bar buttons (jump to first and mark as read) ([#12900](https://github.com/RocketChat/Rocket.Chat/pull/12900))
+
+- Reset password email ([#12898](https://github.com/RocketChat/Rocket.Chat/pull/12898))
+
+- PDF view loading indicator ([#12882](https://github.com/RocketChat/Rocket.Chat/pull/12882))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Release 0.72.2 ([#12901](https://github.com/RocketChat/Rocket.Chat/pull/12901))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@sampaiodiego](https://github.com/sampaiodiego)
+- [@tassoevan](https://github.com/tassoevan)
+
+# 0.72.1
+`2018-12-05  ·  4 🐛  ·  3 🔍  ·  8 👩‍💻👨‍💻`
+
+### 🐛 Bug fixes
+
+
+- Change spread operator to Array.from for Edge browser ([#12818](https://github.com/RocketChat/Rocket.Chat/pull/12818) by [@ohmonster](https://github.com/ohmonster))
+
+- API users.info returns caller rooms and not requested user ones ([#12727](https://github.com/RocketChat/Rocket.Chat/pull/12727) by [@piotrkochan](https://github.com/piotrkochan))
+
+- Missing HipChat Enterprise Importer ([#12847](https://github.com/RocketChat/Rocket.Chat/pull/12847) by [@Hudell](https://github.com/Hudell))
+
+- Emoji as avatar ([#12805](https://github.com/RocketChat/Rocket.Chat/pull/12805))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Release 0.72.1 ([#12850](https://github.com/RocketChat/Rocket.Chat/pull/12850) by [@Hudell](https://github.com/Hudell) & [@ohmonster](https://github.com/ohmonster) & [@piotrkochan](https://github.com/piotrkochan))
+
+- Bump Apps-Engine version ([#12848](https://github.com/RocketChat/Rocket.Chat/pull/12848))
+
+- Change file order in rocketchat-cors ([#12804](https://github.com/RocketChat/Rocket.Chat/pull/12804))
+
+</details>
+
+### 👩‍💻👨‍💻 Contributors 😍
+
+- [@Hudell](https://github.com/Hudell)
+- [@ohmonster](https://github.com/ohmonster)
+- [@piotrkochan](https://github.com/piotrkochan)
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+- [@d-gubert](https://github.com/d-gubert)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+- [@tassoevan](https://github.com/tassoevan)
+
+# 0.72.0
+`2018-11-28  ·  2 ️️️⚠️  ·  6 🎉  ·  16 🚀  ·  22 🐛  ·  79 🔍  ·  25 👩‍💻👨‍💻`
+
+### ⚠️ BREAKING CHANGES
+
+
+- Support for Cordova (Rocket.Chat Legacy app) has reached End-of-life, support has been discontinued
+
+- Update to Meteor to 1.8 ([#12468](https://github.com/RocketChat/Rocket.Chat/pull/12468))
+
+### 🎉 New features
+
+
+- Add permission to enable personal access token to specific roles ([#12309](https://github.com/RocketChat/Rocket.Chat/pull/12309))
+
+- Option to reset e2e key ([#12483](https://github.com/RocketChat/Rocket.Chat/pull/12483) by [@Hudell](https://github.com/Hudell))
+
+- /api/v1/spotlight: return joinCodeRequired field for rooms ([#12651](https://github.com/RocketChat/Rocket.Chat/pull/12651) by [@cardoso](https://github.com/cardoso))
 
 - New API Endpoints for the new version of JS SDK ([#12623](https://github.com/RocketChat/Rocket.Chat/pull/12623))
 
@@ -4798,12 +5303,21 @@
 - [@tassoevan](https://github.com/tassoevan)
 
 # 0.71.2
-`2018-12-10`
+`2018-12-10  ·  1 🐛  ·  1 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.3`
 - NPM: `5.6.0`
 
+### 🐛 Bug fixes
+
+
+- Reset password email ([#12898](https://github.com/RocketChat/Rocket.Chat/pull/12898))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 0.71.1
 `2018-10-31  ·  1 🐛  ·  1 🔍  ·  1 👩‍💻👨‍💻`
 
@@ -4829,7 +5343,7 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 0.71.0
-`2018-10-27  ·  2 ️️️⚠️  ·  5 🎉  ·  5 🚀  ·  21 🐛  ·  8 🔍  ·  20 👩‍💻👨‍💻`
+`2018-10-27  ·  2 ️️️⚠️  ·  5 🎉  ·  5 🚀  ·  23 🐛  ·  9 🔍  ·  20 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.3`
@@ -4903,6 +5417,10 @@
 
 - Invalid destructuring on Livechat API endpoint ([#12354](https://github.com/RocketChat/Rocket.Chat/pull/12354))
 
+- Modal confirm on enter ([#12283](https://github.com/RocketChat/Rocket.Chat/pull/12283))
+
+- E2E alert shows up when encryption is disabled ([#12272](https://github.com/RocketChat/Rocket.Chat/pull/12272) by [@Hudell](https://github.com/Hudell))
+
 - E2E: Decrypting UTF-8 encoded messages ([#12398](https://github.com/RocketChat/Rocket.Chat/pull/12398) by [@pmmaga](https://github.com/pmmaga))
 
 - Ignore errors when creating image preview for uploads ([#12424](https://github.com/RocketChat/Rocket.Chat/pull/12424))
@@ -4925,6 +5443,8 @@
 
 - Fix: update check on err.details ([#12346](https://github.com/RocketChat/Rocket.Chat/pull/12346) by [@teresy](https://github.com/teresy))
 
+- Fix: Add wizard opt-in fields ([#12298](https://github.com/RocketChat/Rocket.Chat/pull/12298))
+
 - Update Apps Framework to version 1.2.1 ([#12442](https://github.com/RocketChat/Rocket.Chat/pull/12442))
 
 - Regression: Change `starred` message property from object to array ([#12405](https://github.com/RocketChat/Rocket.Chat/pull/12405))
@@ -5093,7 +5613,7 @@
 - [@theorenck](https://github.com/theorenck)
 
 # 0.70.0
-`2018-09-28  ·  2 ️️️⚠️  ·  18 🎉  ·  3 🚀  ·  31 🐛  ·  21 🔍  ·  33 👩‍💻👨‍💻`
+`2018-09-28  ·  2 ️️️⚠️  ·  18 🎉  ·  3 🚀  ·  35 🐛  ·  19 🔍  ·  32 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.3`
@@ -5195,6 +5715,14 @@
 
 - Typo in a configuration key for SlackBridge excluded bot names ([#11872](https://github.com/RocketChat/Rocket.Chat/pull/11872) by [@TobiasKappe](https://github.com/TobiasKappe))
 
+- Duplicated message buttons ([#11853](https://github.com/RocketChat/Rocket.Chat/pull/11853) by [@ubarsaiyan](https://github.com/ubarsaiyan))
+
+- App updates were not being shown correctly ([#11893](https://github.com/RocketChat/Rocket.Chat/pull/11893))
+
+- Hipchat importer was not importing users without emails and uploaded files ([#11910](https://github.com/RocketChat/Rocket.Chat/pull/11910))
+
+- Hipchat import was failing when importing messages from a non existent user ([#11892](https://github.com/RocketChat/Rocket.Chat/pull/11892))
+
 - Real Name on Direct Messages  ([#12154](https://github.com/RocketChat/Rocket.Chat/pull/12154))
 
 - Position of popover component on mobile ([#12038](https://github.com/RocketChat/Rocket.Chat/pull/12038))
@@ -5223,8 +5751,6 @@
 <summary>🔍 Minor changes</summary>
 
 
-- Release 0.69.2 ([#12026](https://github.com/RocketChat/Rocket.Chat/pull/12026) by [@cardoso](https://github.com/cardoso) & [@kaiiiiiiiii](https://github.com/kaiiiiiiiii) & [@timkinnane](https://github.com/timkinnane))
-
 - LingoHub based on develop ([#11936](https://github.com/RocketChat/Rocket.Chat/pull/11936))
 
 - Better organize package.json ([#12115](https://github.com/RocketChat/Rocket.Chat/pull/12115))
@@ -5235,8 +5761,6 @@
 
 - Merge master into develop & Set version to 0.70.0-develop ([#11921](https://github.com/RocketChat/Rocket.Chat/pull/11921) by [@Hudell](https://github.com/Hudell) & [@c0dzilla](https://github.com/c0dzilla) & [@rndmh3ro](https://github.com/rndmh3ro) & [@ubarsaiyan](https://github.com/ubarsaiyan) & [@vynmera](https://github.com/vynmera))
 
-- Release 0.69.2 ([#12026](https://github.com/RocketChat/Rocket.Chat/pull/12026) by [@cardoso](https://github.com/cardoso) & [@kaiiiiiiiii](https://github.com/kaiiiiiiiii) & [@timkinnane](https://github.com/timkinnane))
-
 - Regression: fix message box autogrow ([#12138](https://github.com/RocketChat/Rocket.Chat/pull/12138))
 
 - Regression: Modal height ([#12122](https://github.com/RocketChat/Rocket.Chat/pull/12122))
@@ -5279,7 +5803,6 @@
 - [@crazy-max](https://github.com/crazy-max)
 - [@edzluhan](https://github.com/edzluhan)
 - [@flaviogrossi](https://github.com/flaviogrossi)
-- [@kaiiiiiiiii](https://github.com/kaiiiiiiiii)
 - [@karakayasemi](https://github.com/karakayasemi)
 - [@mrinaldhar](https://github.com/mrinaldhar)
 - [@mrsimpson](https://github.com/mrsimpson)
@@ -5368,7 +5891,7 @@
 - [@rodrigok](https://github.com/rodrigok)
 
 # 0.69.0
-`2018-08-28  ·  10 🎉  ·  8 🚀  ·  35 🐛  ·  13 🔍  ·  25 👩‍💻👨‍💻`
+`2018-08-28  ·  10 🎉  ·  8 🚀  ·  45 🐛  ·  12 🔍  ·  27 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.3`
@@ -5445,6 +5968,8 @@
 
 - Fix links in `onTableItemClick` of the directroy page ([#11543](https://github.com/RocketChat/Rocket.Chat/pull/11543) by [@ura14h](https://github.com/ura14h))
 
+- Livechat open room method ([#11830](https://github.com/RocketChat/Rocket.Chat/pull/11830))
+
 - App's i18nAlert is only being displayed as "i18nAlert" ([#11802](https://github.com/RocketChat/Rocket.Chat/pull/11802))
 
 - Removed hardcoded values. ([#11627](https://github.com/RocketChat/Rocket.Chat/pull/11627) by [@Hudell](https://github.com/Hudell))
@@ -5481,22 +6006,36 @@
 
 - Message attachments was not respecting sort and lost spacing ([#11740](https://github.com/RocketChat/Rocket.Chat/pull/11740))
 
+- Default server language not being applied ([#11719](https://github.com/RocketChat/Rocket.Chat/pull/11719))
+
 - Closed connections being storing on db ([#11709](https://github.com/RocketChat/Rocket.Chat/pull/11709))
 
+- Broken logo on setup wizard ([#11708](https://github.com/RocketChat/Rocket.Chat/pull/11708))
+
+- Regression in prune by user, and update lastMessage ([#11646](https://github.com/RocketChat/Rocket.Chat/pull/11646) by [@vynmera](https://github.com/vynmera))
+
 - Login logo now centered on small screens ([#11626](https://github.com/RocketChat/Rocket.Chat/pull/11626) by [@wreiske](https://github.com/wreiske))
 
 - Push notifications stuck after db failure ([#11667](https://github.com/RocketChat/Rocket.Chat/pull/11667))
 
+- SAML login not working when user has multiple emails ([#11642](https://github.com/RocketChat/Rocket.Chat/pull/11642) by [@Hudell](https://github.com/Hudell))
+
+- Prune translation on room info panel ([#11635](https://github.com/RocketChat/Rocket.Chat/pull/11635))
+
+- Prune translations in German ([#11631](https://github.com/RocketChat/Rocket.Chat/pull/11631) by [@rndmh3ro](https://github.com/rndmh3ro))
+
+- User info APIs not returning customFields correctly ([#11625](https://github.com/RocketChat/Rocket.Chat/pull/11625))
+
+- Missing chat history for users without permission `preview-c-room` ([#11639](https://github.com/RocketChat/Rocket.Chat/pull/11639) by [@Hudell](https://github.com/Hudell))
+
+- Incorrect migration version in v130.js ([#11544](https://github.com/RocketChat/Rocket.Chat/pull/11544) by [@c0dzilla](https://github.com/c0dzilla))
+
 - Translations were not unique per app allowing conflicts among apps ([#11878](https://github.com/RocketChat/Rocket.Chat/pull/11878))
 
 <details>
 <summary>🔍 Minor changes</summary>
 
 
-- Release 0.68.5 ([#11852](https://github.com/RocketChat/Rocket.Chat/pull/11852))
-
-- Release 0.68.5 ([#11852](https://github.com/RocketChat/Rocket.Chat/pull/11852))
-
 - Fixed deutsch message pruning translations ([#11691](https://github.com/RocketChat/Rocket.Chat/pull/11691) by [@TheReal1604](https://github.com/TheReal1604))
 
 - Fixed the Finnish translation and removed some profanities ([#11794](https://github.com/RocketChat/Rocket.Chat/pull/11794) by [@jukper](https://github.com/jukper))
@@ -5515,6 +6054,8 @@
 
 - Merge master into develop & Set version to 0.69.0-develop ([#11606](https://github.com/RocketChat/Rocket.Chat/pull/11606))
 
+- Regression: Fix purge message's translations ([#11590](https://github.com/RocketChat/Rocket.Chat/pull/11590))
+
 - App engine merge ([#11835](https://github.com/RocketChat/Rocket.Chat/pull/11835))
 
 - Regression: role tag background, unread item font and message box autogrow ([#11861](https://github.com/RocketChat/Rocket.Chat/pull/11861))
@@ -5527,12 +6068,14 @@
 - [@Hudell](https://github.com/Hudell)
 - [@TheReal1604](https://github.com/TheReal1604)
 - [@ausminternet](https://github.com/ausminternet)
+- [@c0dzilla](https://github.com/c0dzilla)
 - [@crazy-max](https://github.com/crazy-max)
 - [@gdelavald](https://github.com/gdelavald)
 - [@glstewart17](https://github.com/glstewart17)
 - [@gsperezb](https://github.com/gsperezb)
 - [@jukper](https://github.com/jukper)
 - [@kable-wilmoth](https://github.com/kable-wilmoth)
+- [@rndmh3ro](https://github.com/rndmh3ro)
 - [@rssilva](https://github.com/rssilva)
 - [@timkinnane](https://github.com/timkinnane)
 - [@ubarsaiyan](https://github.com/ubarsaiyan)
@@ -5843,7 +6386,7 @@
 - [@tassoevan](https://github.com/tassoevan)
 
 # 0.67.0
-`2018-07-20  ·  1 ️️️⚠️  ·  1 🎉  ·  1 🚀  ·  6 🐛  ·  5 🔍  ·  11 👩‍💻👨‍💻`
+`2018-07-20  ·  1 ️️️⚠️  ·  1 🎉  ·  2 🚀  ·  15 🐛  ·  7 🔍  ·  11 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.3`
@@ -5864,13 +6407,23 @@
 
 - Stop sort callbacks on run ([#11330](https://github.com/RocketChat/Rocket.Chat/pull/11330))
 
+- Setup Wizard username validation, step progress and optin/optout ([#11254](https://github.com/RocketChat/Rocket.Chat/pull/11254))
+
 ### 🐛 Bug fixes
 
 
+- Livechat taking inquiry leading to 404 page ([#11406](https://github.com/RocketChat/Rocket.Chat/pull/11406))
+
+- All messages notifications via email were sent as mention alert ([#11398](https://github.com/RocketChat/Rocket.Chat/pull/11398))
+
 - sort fname sidenav ([#11358](https://github.com/RocketChat/Rocket.Chat/pull/11358))
 
+- Livechat not sending desktop notifications ([#11266](https://github.com/RocketChat/Rocket.Chat/pull/11266))
+
 - SVG icons code ([#11319](https://github.com/RocketChat/Rocket.Chat/pull/11319))
 
+- Remove file snap store doesn't like ([#11365](https://github.com/RocketChat/Rocket.Chat/pull/11365))
+
 - Message popup responsiveness in slash commands ([#11313](https://github.com/RocketChat/Rocket.Chat/pull/11313))
 
 - web app manifest errors as reported by Chrome DevTools ([#9991](https://github.com/RocketChat/Rocket.Chat/pull/9991) by [@justinribeiro](https://github.com/justinribeiro))
@@ -5879,6 +6432,16 @@
 
 - Parse inline code without space before initial backtick ([#9754](https://github.com/RocketChat/Rocket.Chat/pull/9754) by [@c0dzilla](https://github.com/c0dzilla) & [@gdelavald](https://github.com/gdelavald))
 
+- Some updates were returning errors when based on queries with position operators ([#11335](https://github.com/RocketChat/Rocket.Chat/pull/11335))
+
+- SAML attributes with periods are not properly read. ([#11315](https://github.com/RocketChat/Rocket.Chat/pull/11315) by [@Hudell](https://github.com/Hudell))
+
+- Outgoing integrations were stopping the oplog tailing sometimes ([#11333](https://github.com/RocketChat/Rocket.Chat/pull/11333))
+
+- Livestream muted when audio only option was enabled ([#11267](https://github.com/RocketChat/Rocket.Chat/pull/11267) by [@gdelavald](https://github.com/gdelavald))
+
+- Notification preferences being lost when switching view mode ([#11295](https://github.com/RocketChat/Rocket.Chat/pull/11295))
+
 <details>
 <summary>🔍 Minor changes</summary>
 
@@ -5889,6 +6452,10 @@
 
 - Merge master into develop & Set version to 0.67.0-develop ([#11399](https://github.com/RocketChat/Rocket.Chat/pull/11399))
 
+- Regression: Fix migration 125 checking for settings field ([#11364](https://github.com/RocketChat/Rocket.Chat/pull/11364))
+
+- Send setting Allow_Marketing_Emails to statistics collector ([#11359](https://github.com/RocketChat/Rocket.Chat/pull/11359))
+
 - Merge master into develop & Set version to 0.67.0-develop ([#11348](https://github.com/RocketChat/Rocket.Chat/pull/11348) by [@Hudell](https://github.com/Hudell) & [@gdelavald](https://github.com/gdelavald))
 
 - Merge master into develop & Set version to 0.67.0-develop ([#11290](https://github.com/RocketChat/Rocket.Chat/pull/11290))
@@ -6000,7 +6567,7 @@
 - [@tassoevan](https://github.com/tassoevan)
 
 # 0.66.0
-`2018-06-27  ·  1 ️️️⚠️  ·  23 🎉  ·  3 🚀  ·  55 🐛  ·  47 🔍  ·  45 👩‍💻👨‍💻`
+`2018-06-27  ·  1 ️️️⚠️  ·  23 🎉  ·  3 🚀  ·  59 🐛  ·  47 🔍  ·  45 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.3`
@@ -6162,6 +6729,14 @@
 
 - Icons svg xml structure ([#10771](https://github.com/RocketChat/Rocket.Chat/pull/10771) by [@timkinnane](https://github.com/timkinnane))
 
+- Leave room wasn't working as expected ([#10851](https://github.com/RocketChat/Rocket.Chat/pull/10851))
+
+- Application crashing on startup when trying to log errors to `exceptions` channel ([#10934](https://github.com/RocketChat/Rocket.Chat/pull/10934))
+
+- Image lazy load was breaking attachments ([#10904](https://github.com/RocketChat/Rocket.Chat/pull/10904))
+
+- Incomplete email notification link ([#10928](https://github.com/RocketChat/Rocket.Chat/pull/10928))
+
 - Remove outdated 2FA warning for mobile clients ([#10916](https://github.com/RocketChat/Rocket.Chat/pull/10916) by [@cardoso](https://github.com/cardoso))
 
 - Update Sandstorm build config ([#10867](https://github.com/RocketChat/Rocket.Chat/pull/10867) by [@ocdtrekkie](https://github.com/ocdtrekkie))
@@ -6390,7 +6965,7 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 0.65.0
-`2018-05-28  ·  13 🎉  ·  16 🐛  ·  15 🔍  ·  25 👩‍💻👨‍💻`
+`2018-05-28  ·  17 🎉  ·  24 🐛  ·  30 🔍  ·  25 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.1`
@@ -6423,6 +6998,14 @@
 
 - Add REST API endpoints `channels.setCustomFields` and `groups.setCustomFields` ([#9733](https://github.com/RocketChat/Rocket.Chat/pull/9733) by [@xbolshe](https://github.com/xbolshe))
 
+- Add REST endpoints `channels.roles` & `groups.roles` ([#10607](https://github.com/RocketChat/Rocket.Chat/pull/10607) by [@cardoso](https://github.com/cardoso) & [@rafaelks](https://github.com/rafaelks))
+
+- Add more options for Wordpress OAuth configuration ([#10724](https://github.com/RocketChat/Rocket.Chat/pull/10724) by [@Hudell](https://github.com/Hudell))
+
+- Setup Wizard ([#10523](https://github.com/RocketChat/Rocket.Chat/pull/10523) by [@karlprieb](https://github.com/karlprieb))
+
+- Improvements to notifications logic ([#10686](https://github.com/RocketChat/Rocket.Chat/pull/10686))
+
 - Add permission `view-broadcast-member-list` ([#10753](https://github.com/RocketChat/Rocket.Chat/pull/10753) by [@cardoso](https://github.com/cardoso))
 
 ### 🐛 Bug fixes
@@ -6442,6 +7025,22 @@
 
 - Private settings were not being cleared from client cache in some cases ([#10625](https://github.com/RocketChat/Rocket.Chat/pull/10625) by [@Hudell](https://github.com/Hudell))
 
+- Not escaping special chars on mentions ([#10793](https://github.com/RocketChat/Rocket.Chat/pull/10793) by [@erhan-](https://github.com/erhan-))
+
+- Send a message when muted returns inconsistent result in chat.sendMessage ([#10720](https://github.com/RocketChat/Rocket.Chat/pull/10720))
+
+- Regression: Empty content on announcement modal ([#10733](https://github.com/RocketChat/Rocket.Chat/pull/10733) by [@gdelavald](https://github.com/gdelavald))
+
+- Missing attachment description when Rocket.Chat Apps were enabled ([#10705](https://github.com/RocketChat/Rocket.Chat/pull/10705) by [@Hudell](https://github.com/Hudell))
+
+- Improve desktop notification formatting ([#10445](https://github.com/RocketChat/Rocket.Chat/pull/10445) by [@Sameesunkaria](https://github.com/Sameesunkaria))
+
+- Message box emoji icon was flickering when typing a text ([#10678](https://github.com/RocketChat/Rocket.Chat/pull/10678) by [@gdelavald](https://github.com/gdelavald))
+
+- Channel owner was being set as muted when creating a read-only channel ([#10665](https://github.com/RocketChat/Rocket.Chat/pull/10665))
+
+- SAML wasn't working correctly when running multiple instances ([#10681](https://github.com/RocketChat/Rocket.Chat/pull/10681) by [@Hudell](https://github.com/Hudell))
+
 - Internal Error when requesting user data download ([#10837](https://github.com/RocketChat/Rocket.Chat/pull/10837) by [@Hudell](https://github.com/Hudell))
 
 - Broadcast channels were showing reply button for deleted messages and generating wrong reply links some times ([#10835](https://github.com/RocketChat/Rocket.Chat/pull/10835))
@@ -6474,6 +7073,36 @@
 
 - Prevent setup wizard redirects ([#10811](https://github.com/RocketChat/Rocket.Chat/pull/10811))
 
+- Prometheus: Add metric to track hooks time ([#10798](https://github.com/RocketChat/Rocket.Chat/pull/10798))
+
+- Regression: Autorun of wizard was not destroyed after completion ([#10802](https://github.com/RocketChat/Rocket.Chat/pull/10802))
+
+- Prometheus: Fix notification metric ([#10803](https://github.com/RocketChat/Rocket.Chat/pull/10803))
+
+- Regression: Fix wrong wizard field name ([#10804](https://github.com/RocketChat/Rocket.Chat/pull/10804))
+
+- Prometheus: Improve metric names ([#10789](https://github.com/RocketChat/Rocket.Chat/pull/10789))
+
+- Improvement to push notifications on direct messages ([#10788](https://github.com/RocketChat/Rocket.Chat/pull/10788))
+
+- Better metric for notifications ([#10786](https://github.com/RocketChat/Rocket.Chat/pull/10786))
+
+- Add badge back to push notifications ([#10779](https://github.com/RocketChat/Rocket.Chat/pull/10779))
+
+- Wizard improvements ([#10776](https://github.com/RocketChat/Rocket.Chat/pull/10776))
+
+- Add setting and expose prometheus on port 9100 ([#10766](https://github.com/RocketChat/Rocket.Chat/pull/10766))
+
+- Regression: Fix notifications for direct messages ([#10760](https://github.com/RocketChat/Rocket.Chat/pull/10760))
+
+- More improvements on send notifications logic ([#10736](https://github.com/RocketChat/Rocket.Chat/pull/10736))
+
+- LingoHub based on develop ([#10691](https://github.com/RocketChat/Rocket.Chat/pull/10691))
+
+- Add `npm run postinstall` into example build script ([#10524](https://github.com/RocketChat/Rocket.Chat/pull/10524) by [@peccu](https://github.com/peccu))
+
+- Correct links in README file ([#10674](https://github.com/RocketChat/Rocket.Chat/pull/10674) by [@winterstefan](https://github.com/winterstefan))
+
 - Fix: Regression in REST API endpoint `/me`  ([#10833](https://github.com/RocketChat/Rocket.Chat/pull/10833))
 
 - Regression: Fix email notification preference not showing correct selected value ([#10847](https://github.com/RocketChat/Rocket.Chat/pull/10847))
@@ -6528,132 +7157,18 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 0.64.2
-`2018-05-18  ·  8 🎉  ·  16 🐛  ·  31 🔍  ·  13 👩‍💻👨‍💻`
+`2018-05-18  ·  1 🔍  ·  12 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.1`
 - NPM: `5.6.0`
 
-### 🎉 New features
-
-
-- Add REST endpoints `channels.roles` & `groups.roles` ([#10607](https://github.com/RocketChat/Rocket.Chat/pull/10607) by [@cardoso](https://github.com/cardoso) & [@rafaelks](https://github.com/rafaelks))
-
-- Add more options for Wordpress OAuth configuration ([#10724](https://github.com/RocketChat/Rocket.Chat/pull/10724) by [@Hudell](https://github.com/Hudell))
-
-- Setup Wizard ([#10523](https://github.com/RocketChat/Rocket.Chat/pull/10523) by [@karlprieb](https://github.com/karlprieb))
-
-- Improvements to notifications logic ([#10686](https://github.com/RocketChat/Rocket.Chat/pull/10686))
-
-- Add REST endpoints `channels.roles` & `groups.roles` ([#10607](https://github.com/RocketChat/Rocket.Chat/pull/10607) by [@cardoso](https://github.com/cardoso) & [@rafaelks](https://github.com/rafaelks))
-
-- Add more options for Wordpress OAuth configuration ([#10724](https://github.com/RocketChat/Rocket.Chat/pull/10724) by [@Hudell](https://github.com/Hudell))
-
-- Setup Wizard ([#10523](https://github.com/RocketChat/Rocket.Chat/pull/10523) by [@karlprieb](https://github.com/karlprieb))
-
-- Improvements to notifications logic ([#10686](https://github.com/RocketChat/Rocket.Chat/pull/10686))
-
-### 🐛 Bug fixes
-
-
-- Not escaping special chars on mentions ([#10793](https://github.com/RocketChat/Rocket.Chat/pull/10793) by [@erhan-](https://github.com/erhan-))
-
-- Send a message when muted returns inconsistent result in chat.sendMessage ([#10720](https://github.com/RocketChat/Rocket.Chat/pull/10720))
-
-- Regression: Empty content on announcement modal ([#10733](https://github.com/RocketChat/Rocket.Chat/pull/10733) by [@gdelavald](https://github.com/gdelavald))
-
-- Missing attachment description when Rocket.Chat Apps were enabled ([#10705](https://github.com/RocketChat/Rocket.Chat/pull/10705) by [@Hudell](https://github.com/Hudell))
-
-- Improve desktop notification formatting ([#10445](https://github.com/RocketChat/Rocket.Chat/pull/10445) by [@Sameesunkaria](https://github.com/Sameesunkaria))
-
-- Message box emoji icon was flickering when typing a text ([#10678](https://github.com/RocketChat/Rocket.Chat/pull/10678) by [@gdelavald](https://github.com/gdelavald))
-
-- Channel owner was being set as muted when creating a read-only channel ([#10665](https://github.com/RocketChat/Rocket.Chat/pull/10665))
-
-- SAML wasn't working correctly when running multiple instances ([#10681](https://github.com/RocketChat/Rocket.Chat/pull/10681) by [@Hudell](https://github.com/Hudell))
-
-- Send a message when muted returns inconsistent result in chat.sendMessage ([#10720](https://github.com/RocketChat/Rocket.Chat/pull/10720))
-
-- Regression: Empty content on announcement modal ([#10733](https://github.com/RocketChat/Rocket.Chat/pull/10733) by [@gdelavald](https://github.com/gdelavald))
-
-- Missing attachment description when Rocket.Chat Apps were enabled ([#10705](https://github.com/RocketChat/Rocket.Chat/pull/10705) by [@Hudell](https://github.com/Hudell))
-
-- Improve desktop notification formatting ([#10445](https://github.com/RocketChat/Rocket.Chat/pull/10445) by [@Sameesunkaria](https://github.com/Sameesunkaria))
-
-- Message box emoji icon was flickering when typing a text ([#10678](https://github.com/RocketChat/Rocket.Chat/pull/10678) by [@gdelavald](https://github.com/gdelavald))
-
-- Channel owner was being set as muted when creating a read-only channel ([#10665](https://github.com/RocketChat/Rocket.Chat/pull/10665))
-
-- SAML wasn't working correctly when running multiple instances ([#10681](https://github.com/RocketChat/Rocket.Chat/pull/10681) by [@Hudell](https://github.com/Hudell))
-
-- Not escaping special chars on mentions ([#10793](https://github.com/RocketChat/Rocket.Chat/pull/10793) by [@erhan-](https://github.com/erhan-))
-
 <details>
 <summary>🔍 Minor changes</summary>
 
 
 - Release 0.64.2 ([#10812](https://github.com/RocketChat/Rocket.Chat/pull/10812) by [@Hudell](https://github.com/Hudell) & [@Sameesunkaria](https://github.com/Sameesunkaria) & [@cardoso](https://github.com/cardoso) & [@erhan-](https://github.com/erhan-) & [@gdelavald](https://github.com/gdelavald) & [@karlprieb](https://github.com/karlprieb) & [@peccu](https://github.com/peccu) & [@winterstefan](https://github.com/winterstefan))
 
-- Prometheus: Add metric to track hooks time ([#10798](https://github.com/RocketChat/Rocket.Chat/pull/10798))
-
-- Regression: Autorun of wizard was not destroyed after completion ([#10802](https://github.com/RocketChat/Rocket.Chat/pull/10802))
-
-- Prometheus: Fix notification metric ([#10803](https://github.com/RocketChat/Rocket.Chat/pull/10803))
-
-- Regression: Fix wrong wizard field name ([#10804](https://github.com/RocketChat/Rocket.Chat/pull/10804))
-
-- Prometheus: Improve metric names ([#10789](https://github.com/RocketChat/Rocket.Chat/pull/10789))
-
-- Improvement to push notifications on direct messages ([#10788](https://github.com/RocketChat/Rocket.Chat/pull/10788))
-
-- Better metric for notifications ([#10786](https://github.com/RocketChat/Rocket.Chat/pull/10786))
-
-- Add badge back to push notifications ([#10779](https://github.com/RocketChat/Rocket.Chat/pull/10779))
-
-- Wizard improvements ([#10776](https://github.com/RocketChat/Rocket.Chat/pull/10776))
-
-- Add setting and expose prometheus on port 9100 ([#10766](https://github.com/RocketChat/Rocket.Chat/pull/10766))
-
-- Regression: Fix notifications for direct messages ([#10760](https://github.com/RocketChat/Rocket.Chat/pull/10760))
-
-- More improvements on send notifications logic ([#10736](https://github.com/RocketChat/Rocket.Chat/pull/10736))
-
-- LingoHub based on develop ([#10691](https://github.com/RocketChat/Rocket.Chat/pull/10691))
-
-- Add `npm run postinstall` into example build script ([#10524](https://github.com/RocketChat/Rocket.Chat/pull/10524) by [@peccu](https://github.com/peccu))
-
-- Correct links in README file ([#10674](https://github.com/RocketChat/Rocket.Chat/pull/10674) by [@winterstefan](https://github.com/winterstefan))
-
-- More improvements on send notifications logic ([#10736](https://github.com/RocketChat/Rocket.Chat/pull/10736))
-
-- LingoHub based on develop ([#10691](https://github.com/RocketChat/Rocket.Chat/pull/10691))
-
-- Add `npm run postinstall` into example build script ([#10524](https://github.com/RocketChat/Rocket.Chat/pull/10524) by [@peccu](https://github.com/peccu))
-
-- Correct links in README file ([#10674](https://github.com/RocketChat/Rocket.Chat/pull/10674) by [@winterstefan](https://github.com/winterstefan))
-
-- Prometheus: Improve metric names ([#10789](https://github.com/RocketChat/Rocket.Chat/pull/10789))
-
-- Improvement to push notifications on direct messages ([#10788](https://github.com/RocketChat/Rocket.Chat/pull/10788))
-
-- Better metric for notifications ([#10786](https://github.com/RocketChat/Rocket.Chat/pull/10786))
-
-- Add badge back to push notifications ([#10779](https://github.com/RocketChat/Rocket.Chat/pull/10779))
-
-- Wizard improvements ([#10776](https://github.com/RocketChat/Rocket.Chat/pull/10776))
-
-- Add setting and expose prometheus on port 9100 ([#10766](https://github.com/RocketChat/Rocket.Chat/pull/10766))
-
-- Regression: Fix notifications for direct messages ([#10760](https://github.com/RocketChat/Rocket.Chat/pull/10760))
-
-- Prometheus: Add metric to track hooks time ([#10798](https://github.com/RocketChat/Rocket.Chat/pull/10798))
-
-- Regression: Autorun of wizard was not destroyed after completion ([#10802](https://github.com/RocketChat/Rocket.Chat/pull/10802))
-
-- Prometheus: Fix notification metric ([#10803](https://github.com/RocketChat/Rocket.Chat/pull/10803))
-
-- Regression: Fix wrong wizard field name ([#10804](https://github.com/RocketChat/Rocket.Chat/pull/10804))
-
 </details>
 
 ### 👩‍💻👨‍💻 Contributors 😍
@@ -6665,7 +7180,6 @@
 - [@gdelavald](https://github.com/gdelavald)
 - [@karlprieb](https://github.com/karlprieb)
 - [@peccu](https://github.com/peccu)
-- [@rafaelks](https://github.com/rafaelks)
 - [@winterstefan](https://github.com/winterstefan)
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -7041,7 +7555,7 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 0.63.0
-`2018-04-04  ·  1 ️️️⚠️  ·  18 🎉  ·  30 🐛  ·  20 🔍  ·  24 👩‍💻👨‍💻`
+`2018-04-04  ·  1 ️️️⚠️  ·  18 🎉  ·  36 🐛  ·  20 🔍  ·  25 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.11.1`
@@ -7130,6 +7644,18 @@
 
 - Able to react with invalid emoji ([#8667](https://github.com/RocketChat/Rocket.Chat/pull/8667) by [@mutdmour](https://github.com/mutdmour))
 
+- Slack Import reports `invalid import file type` due to a call to BSON.native() which is now doesn't exist ([#10071](https://github.com/RocketChat/Rocket.Chat/pull/10071) by [@trongthanh](https://github.com/trongthanh))
+
+- Verified property of user is always set to false if not supplied ([#9719](https://github.com/RocketChat/Rocket.Chat/pull/9719))
+
+- Update preferences of users with settings: null was crashing the server ([#10076](https://github.com/RocketChat/Rocket.Chat/pull/10076))
+
+- REST API: Can't list all public channels when user has permission `view-joined-room` ([#10009](https://github.com/RocketChat/Rocket.Chat/pull/10009))
+
+- Message editing is crashing the server when read receipts are enabled ([#10061](https://github.com/RocketChat/Rocket.Chat/pull/10061))
+
+- Download links was duplicating Sub Paths ([#10029](https://github.com/RocketChat/Rocket.Chat/pull/10029))
+
 - User preferences can't be saved when roles are hidden in admin settings ([#10051](https://github.com/RocketChat/Rocket.Chat/pull/10051) by [@Hudell](https://github.com/Hudell))
 
 - Browser was auto-filling values when editing another user profile ([#9932](https://github.com/RocketChat/Rocket.Chat/pull/9932) by [@kaiiiiiiiii](https://github.com/kaiiiiiiiii))
@@ -7217,6 +7743,7 @@
 - [@mutdmour](https://github.com/mutdmour)
 - [@pierreozoux](https://github.com/pierreozoux)
 - [@ramrami](https://github.com/ramrami)
+- [@trongthanh](https://github.com/trongthanh)
 - [@ubarsaiyan](https://github.com/ubarsaiyan)
 
 ### 👩‍💻👨‍💻 Core Team 🤓
@@ -7307,7 +7834,7 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 0.62.0
-`2018-02-27  ·  1 ️️️⚠️  ·  24 🎉  ·  29 🐛  ·  26 🔍  ·  39 👩‍💻👨‍💻`
+`2018-02-27  ·  1 ️️️⚠️  ·  24 🎉  ·  32 🐛  ·  26 🔍  ·  39 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.9.4`
@@ -7378,6 +7905,10 @@
 
 - Close button on file upload bar was not working ([#9662](https://github.com/RocketChat/Rocket.Chat/pull/9662) by [@karlprieb](https://github.com/karlprieb))
 
+- Livechat conversation not receiving messages when start without form ([#9772](https://github.com/RocketChat/Rocket.Chat/pull/9772))
+
+- Emoji rendering on last message ([#9776](https://github.com/RocketChat/Rocket.Chat/pull/9776))
+
 - Chrome 64 breaks jitsi-meet iframe ([#9560](https://github.com/RocketChat/Rocket.Chat/pull/9560) by [@speedy01](https://github.com/speedy01))
 
 - Harmonize channel-related actions ([#9697](https://github.com/RocketChat/Rocket.Chat/pull/9697) by [@mrsimpson](https://github.com/mrsimpson))
@@ -7388,6 +7919,8 @@
 
 - 'Query' support for channels.list.joined, groups.list, groups.listAll, im.list ([#9424](https://github.com/RocketChat/Rocket.Chat/pull/9424) by [@xbolshe](https://github.com/xbolshe))
 
+- Livechat issues on external queue and lead capture ([#9750](https://github.com/RocketChat/Rocket.Chat/pull/9750))
+
 - DeprecationWarning: prom-client ... when starting Rocket Chat server ([#9747](https://github.com/RocketChat/Rocket.Chat/pull/9747) by [@jgtoriginal](https://github.com/jgtoriginal))
 
 - API to retrive rooms was returning empty objects ([#9737](https://github.com/RocketChat/Rocket.Chat/pull/9737))
@@ -7583,7 +8116,7 @@
 - [@rodrigok](https://github.com/rodrigok)
 
 # 0.61.0
-`2018-01-27  ·  1 ️️️⚠️  ·  11 🎉  ·  13 🐛  ·  8 🔍  ·  15 👩‍💻👨‍💻`
+`2018-01-27  ·  1 ️️️⚠️  ·  12 🎉  ·  44 🐛  ·  39 🔍  ·  23 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.9.3`
@@ -7617,6 +8150,8 @@
 
 - Add support to external livechat queue service provider ([#9053](https://github.com/RocketChat/Rocket.Chat/pull/9053))
 
+- Make Custom oauth accept nested usernameField ([#9066](https://github.com/RocketChat/Rocket.Chat/pull/9066) by [@pierreozoux](https://github.com/pierreozoux))
+
 - Contextual bar mail messages ([#9510](https://github.com/RocketChat/Rocket.Chat/pull/9510) by [@karlprieb](https://github.com/karlprieb))
 
 ### 🐛 Bug fixes
@@ -7638,48 +8173,179 @@
 
 - Highlight setting not working correctly ([#9364](https://github.com/RocketChat/Rocket.Chat/pull/9364) by [@cyclops24](https://github.com/cyclops24))
 
-- File access not working when passing credentials via querystring ([#9264](https://github.com/RocketChat/Rocket.Chat/pull/9264))
+- announcement hyperlink color ([#9330](https://github.com/RocketChat/Rocket.Chat/pull/9330) by [@karlprieb](https://github.com/karlprieb))
 
-- Contextual bar redesign ([#9481](https://github.com/RocketChat/Rocket.Chat/pull/9481) by [@gdelavald](https://github.com/gdelavald) & [@karlprieb](https://github.com/karlprieb))
+- popover on safari for iOS ([#9328](https://github.com/RocketChat/Rocket.Chat/pull/9328) by [@karlprieb](https://github.com/karlprieb))
 
-- mention-here is missing i18n text #9455 ([#9456](https://github.com/RocketChat/Rocket.Chat/pull/9456) by [@ryjones](https://github.com/ryjones))
+- last message cutting on bottom ([#9345](https://github.com/RocketChat/Rocket.Chat/pull/9345) by [@karlprieb](https://github.com/karlprieb))
 
-- Fix livechat visitor edit ([#9506](https://github.com/RocketChat/Rocket.Chat/pull/9506))
+- Deleting message with store last message not removing ([#9335](https://github.com/RocketChat/Rocket.Chat/pull/9335))
 
-- large names on userinfo, and admin user bug on users with no usernames ([#9493](https://github.com/RocketChat/Rocket.Chat/pull/9493) by [@gdelavald](https://github.com/gdelavald))
+- custom emoji size on sidebar item ([#9314](https://github.com/RocketChat/Rocket.Chat/pull/9314) by [@karlprieb](https://github.com/karlprieb))
 
-<details>
-<summary>🔍 Minor changes</summary>
+- svg render on firefox ([#9311](https://github.com/RocketChat/Rocket.Chat/pull/9311) by [@karlprieb](https://github.com/karlprieb))
 
+- sidebar footer padding ([#9249](https://github.com/RocketChat/Rocket.Chat/pull/9249) by [@karlprieb](https://github.com/karlprieb))
 
-- Release 0.61.0 ([#9533](https://github.com/RocketChat/Rocket.Chat/pull/9533) by [@karlprieb](https://github.com/karlprieb) & [@ryjones](https://github.com/ryjones))
+- LDAP/AD is not importing all users ([#9309](https://github.com/RocketChat/Rocket.Chat/pull/9309))
 
-- Add community bot ([#9439](https://github.com/RocketChat/Rocket.Chat/pull/9439))
+- Wrong position of notifications alert in accounts preference page ([#9289](https://github.com/RocketChat/Rocket.Chat/pull/9289) by [@HammyHavoc](https://github.com/HammyHavoc))
 
-- Use correct version of Mailparser module ([#9356](https://github.com/RocketChat/Rocket.Chat/pull/9356))
+- English Typos ([#9285](https://github.com/RocketChat/Rocket.Chat/pull/9285) by [@HammyHavoc](https://github.com/HammyHavoc))
 
-- Develop sync - Bump version to 0.61.0-develop ([#9260](https://github.com/RocketChat/Rocket.Chat/pull/9260) by [@cpitman](https://github.com/cpitman) & [@karlprieb](https://github.com/karlprieb))
+- File access not working when passing credentials via querystring ([#9264](https://github.com/RocketChat/Rocket.Chat/pull/9264))
 
-- [Fix] oauth not working because of email array ([#9173](https://github.com/RocketChat/Rocket.Chat/pull/9173))
+- Move emojipicker css to theme package ([#9243](https://github.com/RocketChat/Rocket.Chat/pull/9243) by [@karlprieb](https://github.com/karlprieb))
 
-- [DOCS] Update the links of our Mobile Apps in Features topic ([#9469](https://github.com/RocketChat/Rocket.Chat/pull/9469) by [@rafaelks](https://github.com/rafaelks))
+- Show modal with announcement ([#9241](https://github.com/RocketChat/Rocket.Chat/pull/9241) by [@karlprieb](https://github.com/karlprieb))
 
-- Update license ([#9490](https://github.com/RocketChat/Rocket.Chat/pull/9490))
+- "Enter usernames" placeholder is cutting in "create channel" view ([#9194](https://github.com/RocketChat/Rocket.Chat/pull/9194) by [@TheReal1604](https://github.com/TheReal1604))
 
-- Prevent NPM package-lock inside livechat ([#9504](https://github.com/RocketChat/Rocket.Chat/pull/9504))
+- File upload not working on IE and weird on Chrome ([#9206](https://github.com/RocketChat/Rocket.Chat/pull/9206) by [@karlprieb](https://github.com/karlprieb))
+
+- make the cross icon on user selection at channel creation page work ([#9176](https://github.com/RocketChat/Rocket.Chat/pull/9176) by [@karlprieb](https://github.com/karlprieb) & [@vitor-nagao](https://github.com/vitor-nagao))
+
+- Made welcome emails more readable ([#9193](https://github.com/RocketChat/Rocket.Chat/pull/9193) by [@HammyHavoc](https://github.com/HammyHavoc))
+
+- Cursor position when reply on safari ([#9185](https://github.com/RocketChat/Rocket.Chat/pull/9185) by [@karlprieb](https://github.com/karlprieb))
+
+- Emoji size on last message preview ([#9186](https://github.com/RocketChat/Rocket.Chat/pull/9186) by [@karlprieb](https://github.com/karlprieb))
+
+- Unread bar position when room have announcement ([#9188](https://github.com/RocketChat/Rocket.Chat/pull/9188) by [@karlprieb](https://github.com/karlprieb))
+
+- Error when user roles is missing or is invalid ([#9040](https://github.com/RocketChat/Rocket.Chat/pull/9040) by [@paulovitin](https://github.com/paulovitin))
+
+- Make mentions and menu icons color darker ([#8922](https://github.com/RocketChat/Rocket.Chat/pull/8922) by [@karlprieb](https://github.com/karlprieb))
+
+- "Use Emoji" preference not working ([#9182](https://github.com/RocketChat/Rocket.Chat/pull/9182) by [@karlprieb](https://github.com/karlprieb))
+
+- channel create scroll on small screens ([#9168](https://github.com/RocketChat/Rocket.Chat/pull/9168) by [@karlprieb](https://github.com/karlprieb))
+
+- go to replied message ([#9172](https://github.com/RocketChat/Rocket.Chat/pull/9172) by [@karlprieb](https://github.com/karlprieb))
+
+- modal data on enter and modal style for file preview ([#9171](https://github.com/RocketChat/Rocket.Chat/pull/9171) by [@karlprieb](https://github.com/karlprieb))
+
+- show oauth logins when adblock is used ([#9170](https://github.com/RocketChat/Rocket.Chat/pull/9170) by [@karlprieb](https://github.com/karlprieb))
+
+- Last sent message reoccurs in textbox ([#9169](https://github.com/RocketChat/Rocket.Chat/pull/9169))
+
+- Update Rocket.Chat for sandstorm ([#9062](https://github.com/RocketChat/Rocket.Chat/pull/9062) by [@peterlee0127](https://github.com/peterlee0127))
+
+- Importers not recovering when an error occurs ([#9134](https://github.com/RocketChat/Rocket.Chat/pull/9134))
+
+- Do not block room while loading history ([#9121](https://github.com/RocketChat/Rocket.Chat/pull/9121))
+
+- Channel page error ([#9091](https://github.com/RocketChat/Rocket.Chat/pull/9091) by [@ggrish](https://github.com/ggrish))
+
+- Contextual bar redesign ([#9481](https://github.com/RocketChat/Rocket.Chat/pull/9481) by [@gdelavald](https://github.com/gdelavald) & [@karlprieb](https://github.com/karlprieb))
+
+- mention-here is missing i18n text #9455 ([#9456](https://github.com/RocketChat/Rocket.Chat/pull/9456) by [@ryjones](https://github.com/ryjones))
+
+- Fix livechat visitor edit ([#9506](https://github.com/RocketChat/Rocket.Chat/pull/9506))
+
+- large names on userinfo, and admin user bug on users with no usernames ([#9493](https://github.com/RocketChat/Rocket.Chat/pull/9493) by [@gdelavald](https://github.com/gdelavald))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Release 0.61.0 ([#9533](https://github.com/RocketChat/Rocket.Chat/pull/9533) by [@karlprieb](https://github.com/karlprieb) & [@ryjones](https://github.com/ryjones))
+
+- Add community bot ([#9439](https://github.com/RocketChat/Rocket.Chat/pull/9439))
+
+- Use correct version of Mailparser module ([#9356](https://github.com/RocketChat/Rocket.Chat/pull/9356))
+
+- Update Marked dependecy to 0.3.9 ([#9346](https://github.com/RocketChat/Rocket.Chat/pull/9346))
+
+- Fix: English language improvements ([#9299](https://github.com/RocketChat/Rocket.Chat/pull/9299) by [@HammyHavoc](https://github.com/HammyHavoc))
+
+- Fix: Change 'Wordpress' to 'WordPress ([#9291](https://github.com/RocketChat/Rocket.Chat/pull/9291) by [@HammyHavoc](https://github.com/HammyHavoc))
+
+- Fix: Improved README.md ([#9290](https://github.com/RocketChat/Rocket.Chat/pull/9290) by [@HammyHavoc](https://github.com/HammyHavoc))
+
+- Fix: README typo ([#9286](https://github.com/RocketChat/Rocket.Chat/pull/9286) by [@HammyHavoc](https://github.com/HammyHavoc))
+
+- Develop sync - Bump version to 0.61.0-develop ([#9260](https://github.com/RocketChat/Rocket.Chat/pull/9260) by [@cpitman](https://github.com/cpitman) & [@karlprieb](https://github.com/karlprieb))
+
+- Do not change room icon color when room is unread ([#9257](https://github.com/RocketChat/Rocket.Chat/pull/9257))
+
+- LingoHub based on develop ([#9256](https://github.com/RocketChat/Rocket.Chat/pull/9256))
+
+- Fix: Sidebar item on rtl and small devices ([#9247](https://github.com/RocketChat/Rocket.Chat/pull/9247) by [@karlprieb](https://github.com/karlprieb))
+
+- Add curl, its missing on worker nodes so has to be explicitly added ([#9248](https://github.com/RocketChat/Rocket.Chat/pull/9248))
+
+- Fix: Unneeded warning in payload of REST API calls ([#9240](https://github.com/RocketChat/Rocket.Chat/pull/9240))
+
+- Fix: Missing option to set user's avatar from a url ([#9229](https://github.com/RocketChat/Rocket.Chat/pull/9229))
+
+- Fix: Upload access control too distributed ([#9215](https://github.com/RocketChat/Rocket.Chat/pull/9215))
+
+- Fix: Username find is matching partially ([#9217](https://github.com/RocketChat/Rocket.Chat/pull/9217))
+
+- Fix: updating last message on message edit or delete ([#9227](https://github.com/RocketChat/Rocket.Chat/pull/9227))
+
+- Fix: Rooms and users are using different avatar style ([#9196](https://github.com/RocketChat/Rocket.Chat/pull/9196))
+
+- Replace postcss-nesting with postcss-nested ([#9200](https://github.com/RocketChat/Rocket.Chat/pull/9200))
+
+- Dependencies Update ([#9197](https://github.com/RocketChat/Rocket.Chat/pull/9197))
+
+- Typo: German language file ([#9190](https://github.com/RocketChat/Rocket.Chat/pull/9190) by [@TheReal1604](https://github.com/TheReal1604))
+
+- Fix: Snippet name to not showing in snippet list ([#9184](https://github.com/RocketChat/Rocket.Chat/pull/9184) by [@karlprieb](https://github.com/karlprieb))
+
+- Fix/api me only return verified ([#9183](https://github.com/RocketChat/Rocket.Chat/pull/9183))
+
+- Fix: UI: Descenders of glyphs are cut off ([#9181](https://github.com/RocketChat/Rocket.Chat/pull/9181))
+
+- [Fix] oauth not working because of email array ([#9173](https://github.com/RocketChat/Rocket.Chat/pull/9173))
+
+- Fix: Click on channel name - hover area bigger than link area ([#9165](https://github.com/RocketChat/Rocket.Chat/pull/9165))
+
+- Fix: UI: Descenders of glyphs are cut off ([#9166](https://github.com/RocketChat/Rocket.Chat/pull/9166))
+
+- Fix: Can’t login using LDAP via REST ([#9162](https://github.com/RocketChat/Rocket.Chat/pull/9162))
+
+- Fix: Unread line ([#9149](https://github.com/RocketChat/Rocket.Chat/pull/9149))
+
+- Fix test without oplog by waiting a successful login on changing users ([#9146](https://github.com/RocketChat/Rocket.Chat/pull/9146))
+
+- Fix: Messages being displayed in reverse order ([#9144](https://github.com/RocketChat/Rocket.Chat/pull/9144))
+
+- Fix: Clear all unreads modal not closing after confirming ([#9137](https://github.com/RocketChat/Rocket.Chat/pull/9137))
+
+- Fix: Message action quick buttons drops if "new message" divider is being shown ([#9138](https://github.com/RocketChat/Rocket.Chat/pull/9138))
+
+- Fix: Confirmation modals showing `Send` button ([#9136](https://github.com/RocketChat/Rocket.Chat/pull/9136))
+
+- Fix: Multiple unread indicators ([#9120](https://github.com/RocketChat/Rocket.Chat/pull/9120))
+
+- [DOCS] Update the links of our Mobile Apps in Features topic ([#9469](https://github.com/RocketChat/Rocket.Chat/pull/9469) by [@rafaelks](https://github.com/rafaelks))
+
+- Update license ([#9490](https://github.com/RocketChat/Rocket.Chat/pull/9490))
+
+- Prevent NPM package-lock inside livechat ([#9504](https://github.com/RocketChat/Rocket.Chat/pull/9504))
 
 </details>
 
 ### 👩‍💻👨‍💻 Contributors 😍
 
+- [@HammyHavoc](https://github.com/HammyHavoc)
+- [@TheReal1604](https://github.com/TheReal1604)
 - [@cpitman](https://github.com/cpitman)
 - [@cyclops24](https://github.com/cyclops24)
 - [@gdelavald](https://github.com/gdelavald)
+- [@ggrish](https://github.com/ggrish)
 - [@karlprieb](https://github.com/karlprieb)
+- [@paulovitin](https://github.com/paulovitin)
+- [@peterlee0127](https://github.com/peterlee0127)
+- [@pierreozoux](https://github.com/pierreozoux)
 - [@rafaelks](https://github.com/rafaelks)
 - [@ramrami](https://github.com/ramrami)
 - [@rndmh3ro](https://github.com/rndmh3ro)
 - [@ryjones](https://github.com/ryjones)
+- [@vitor-nagao](https://github.com/vitor-nagao)
 
 ### 👩‍💻👨‍💻 Core Team 🤓
 
@@ -7688,6 +8354,7 @@
 - [@frdmn](https://github.com/frdmn)
 - [@geekgonecrazy](https://github.com/geekgonecrazy)
 - [@ggazzo](https://github.com/ggazzo)
+- [@graywolf336](https://github.com/graywolf336)
 - [@rodrigok](https://github.com/rodrigok)
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
@@ -7823,7 +8490,7 @@
 - [@rodrigok](https://github.com/rodrigok)
 
 # 0.60.0
-`2017-12-27  ·  27 🎉  ·  74 🐛  ·  72 🔍  ·  59 👩‍💻👨‍💻`
+`2017-12-27  ·  33 🎉  ·  171 🐛  ·  99 🔍  ·  71 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `8.9.3`
@@ -7874,118 +8541,324 @@
 
 - Upgrade Meteor to 1.6 ([#8715](https://github.com/RocketChat/Rocket.Chat/pull/8715) by [@karlprieb](https://github.com/karlprieb))
 
+- Setting to disable MarkDown and enable AutoLinker ([#8459](https://github.com/RocketChat/Rocket.Chat/pull/8459))
+
 - Add settings for allow user direct messages to yourself ([#8066](https://github.com/RocketChat/Rocket.Chat/pull/8066) by [@lindoelio](https://github.com/lindoelio))
 
 - Add sweet alert to video call tab ([#8108](https://github.com/RocketChat/Rocket.Chat/pull/8108))
 
-- Displays QR code for manually entering when enabling 2fa ([#8143](https://github.com/RocketChat/Rocket.Chat/pull/8143))
+- Displays QR code for manually entering when enabling 2fa ([#8143](https://github.com/RocketChat/Rocket.Chat/pull/8143))
+
+- Unify unread and mentions badge ([#8361](https://github.com/RocketChat/Rocket.Chat/pull/8361) by [@karlprieb](https://github.com/karlprieb))
+
+- make sidebar item width 100% ([#8362](https://github.com/RocketChat/Rocket.Chat/pull/8362) by [@karlprieb](https://github.com/karlprieb))
+
+- Smaller accountBox ([#8360](https://github.com/RocketChat/Rocket.Chat/pull/8360) by [@karlprieb](https://github.com/karlprieb))
+
+- Add RD Station integration to livechat ([#8304](https://github.com/RocketChat/Rocket.Chat/pull/8304))
+
+- Upgrade to meteor 1.5.2 ([#8073](https://github.com/RocketChat/Rocket.Chat/pull/8073))
+
+- Add yunohost.org installation method to Readme.md ([#8037](https://github.com/RocketChat/Rocket.Chat/pull/8037) by [@selamanse](https://github.com/selamanse))
+
+- Modal ([#9092](https://github.com/RocketChat/Rocket.Chat/pull/9092) by [@karlprieb](https://github.com/karlprieb))
+
+- Make Custom oauth accept nested usernameField ([#9066](https://github.com/RocketChat/Rocket.Chat/pull/9066) by [@pierreozoux](https://github.com/pierreozoux))
+
+### 🐛 Bug fixes
+
+
+- Can't react on Read Only rooms even when enabled ([#8925](https://github.com/RocketChat/Rocket.Chat/pull/8925) by [@karlprieb](https://github.com/karlprieb))
+
+- CAS does not share secrets when operating multiple server instances ([#8654](https://github.com/RocketChat/Rocket.Chat/pull/8654) by [@AmShaegar13](https://github.com/AmShaegar13))
+
+- Snippetted messages not working ([#8937](https://github.com/RocketChat/Rocket.Chat/pull/8937) by [@karlprieb](https://github.com/karlprieb))
+
+- Added afterUserCreated trigger after first CAS login ([#9022](https://github.com/RocketChat/Rocket.Chat/pull/9022) by [@AmShaegar13](https://github.com/AmShaegar13))
+
+- Notification is not sent when a video conference start ([#8828](https://github.com/RocketChat/Rocket.Chat/pull/8828) by [@deepseainside75](https://github.com/deepseainside75) & [@stefanoverducci](https://github.com/stefanoverducci))
+
+- long filename overlaps cancel button in progress bar ([#8868](https://github.com/RocketChat/Rocket.Chat/pull/8868) by [@joesitton](https://github.com/joesitton))
+
+- Changed oembedUrlWidget to prefer og:image and twitter:image over msapplication-TileImage ([#9012](https://github.com/RocketChat/Rocket.Chat/pull/9012) by [@wferris722](https://github.com/wferris722))
+
+- Update insecure moment.js dependency ([#9046](https://github.com/RocketChat/Rocket.Chat/pull/9046) by [@robbyoconnor](https://github.com/robbyoconnor))
+
+- Custom OAuth: Not able to set different token place for routes ([#9034](https://github.com/RocketChat/Rocket.Chat/pull/9034))
+
+- Can't use OAuth login against a Rocket.Chat OAuth server ([#9044](https://github.com/RocketChat/Rocket.Chat/pull/9044))
+
+- Notification sound is not disabling when busy ([#9042](https://github.com/RocketChat/Rocket.Chat/pull/9042))
+
+- Use encodeURI in AmazonS3 contentDisposition file.name to prevent fail ([#9024](https://github.com/RocketChat/Rocket.Chat/pull/9024) by [@paulovitin](https://github.com/paulovitin))
+
+- snap install by setting grpc package used by google/vision to 1.6.6 ([#9029](https://github.com/RocketChat/Rocket.Chat/pull/9029))
+
+- Enable CORS for Restivus ([#8671](https://github.com/RocketChat/Rocket.Chat/pull/8671) by [@mrsimpson](https://github.com/mrsimpson))
+
+- Importers failing when usernames exists but cases don't match and improve the importer framework's performance ([#8966](https://github.com/RocketChat/Rocket.Chat/pull/8966))
+
+- Error when saving integration with symbol as only trigger ([#9023](https://github.com/RocketChat/Rocket.Chat/pull/9023))
+
+- Sync of non existent field throws exception ([#8006](https://github.com/RocketChat/Rocket.Chat/pull/8006) by [@goiaba](https://github.com/goiaba))
+
+- Autoupdate of CSS does not work when using a prefix ([#8107](https://github.com/RocketChat/Rocket.Chat/pull/8107) by [@Darkneon](https://github.com/Darkneon))
+
+- Contextual errors for this and RegExp declarations in IRC module ([#8656](https://github.com/RocketChat/Rocket.Chat/pull/8656) by [@Pharserror](https://github.com/Pharserror))
+
+- Wrong room counter name ([#9013](https://github.com/RocketChat/Rocket.Chat/pull/9013) by [@karlprieb](https://github.com/karlprieb))
+
+- Message-box autogrow flick ([#8932](https://github.com/RocketChat/Rocket.Chat/pull/8932) by [@karlprieb](https://github.com/karlprieb))
+
+- Don't strip trailing slash on autolinker urls ([#8812](https://github.com/RocketChat/Rocket.Chat/pull/8812) by [@jwilkins](https://github.com/jwilkins))
+
+- Change the unread messages style ([#8883](https://github.com/RocketChat/Rocket.Chat/pull/8883) by [@karlprieb](https://github.com/karlprieb))
+
+- Missing sidebar footer padding ([#8884](https://github.com/RocketChat/Rocket.Chat/pull/8884) by [@karlprieb](https://github.com/karlprieb))
+
+- Long room announcement cut off ([#8907](https://github.com/RocketChat/Rocket.Chat/pull/8907) by [@karlprieb](https://github.com/karlprieb))
+
+- DM email notifications always being sent regardless of account setting ([#8917](https://github.com/RocketChat/Rocket.Chat/pull/8917) by [@ashward](https://github.com/ashward))
+
+- Typo Fix ([#8938](https://github.com/RocketChat/Rocket.Chat/pull/8938) by [@seangeleno](https://github.com/seangeleno))
+
+- Katex markdown link changed ([#8948](https://github.com/RocketChat/Rocket.Chat/pull/8948) by [@mritunjaygoutam12](https://github.com/mritunjaygoutam12))
+
+- if ogImage exists use it over image in oembedUrlWidget ([#9000](https://github.com/RocketChat/Rocket.Chat/pull/9000) by [@satyapramodh](https://github.com/satyapramodh))
+
+- Cannot edit or delete custom sounds ([#8889](https://github.com/RocketChat/Rocket.Chat/pull/8889) by [@ccfang](https://github.com/ccfang))
+
+- Change old 'rocketbot' username to 'InternalHubot_Username' setting ([#8928](https://github.com/RocketChat/Rocket.Chat/pull/8928) by [@ramrami](https://github.com/ramrami))
+
+- Link for channels are not rendering correctly ([#8985](https://github.com/RocketChat/Rocket.Chat/pull/8985) by [@karlprieb](https://github.com/karlprieb))
+
+- Xenforo [BD]API for 'user.user_id; instead of 'id' ([#8968](https://github.com/RocketChat/Rocket.Chat/pull/8968) by [@wesnspace](https://github.com/wesnspace))
+
+- flextab height on smaller screens ([#8994](https://github.com/RocketChat/Rocket.Chat/pull/8994) by [@karlprieb](https://github.com/karlprieb))
+
+- Check for mention-all permission in room scope ([#8931](https://github.com/RocketChat/Rocket.Chat/pull/8931))
+
+- fix emoji package path so they show up correctly in browser ([#8822](https://github.com/RocketChat/Rocket.Chat/pull/8822) by [@ryoshimizu](https://github.com/ryoshimizu))
+
+- Set correct Twitter link ([#8830](https://github.com/RocketChat/Rocket.Chat/pull/8830) by [@jotafeldmann](https://github.com/jotafeldmann))
+
+- User email settings on DM ([#8810](https://github.com/RocketChat/Rocket.Chat/pull/8810) by [@karlprieb](https://github.com/karlprieb))
+
+- i18n'd Resend_verification_mail, username_initials, upload avatar ([#8721](https://github.com/RocketChat/Rocket.Chat/pull/8721) by [@arungalva](https://github.com/arungalva))
+
+- Username clipping on firefox ([#8716](https://github.com/RocketChat/Rocket.Chat/pull/8716) by [@karlprieb](https://github.com/karlprieb))
+
+- Improved grammar and made it clearer to the user ([#8795](https://github.com/RocketChat/Rocket.Chat/pull/8795) by [@HammyHavoc](https://github.com/HammyHavoc))
+
+- Show real name of current user at top of side nav if setting enabled ([#8718](https://github.com/RocketChat/Rocket.Chat/pull/8718) by [@alexbrazier](https://github.com/alexbrazier))
+
+- Range Slider Value label has bug in RTL ([#8441](https://github.com/RocketChat/Rocket.Chat/pull/8441) by [@cyclops24](https://github.com/cyclops24))
+
+- Add historic chats icon in Livechat ([#8708](https://github.com/RocketChat/Rocket.Chat/pull/8708) by [@mrsimpson](https://github.com/mrsimpson))
+
+- Sort direct messages by full name if show real names setting enabled ([#8717](https://github.com/RocketChat/Rocket.Chat/pull/8717) by [@alexbrazier](https://github.com/alexbrazier))
+
+- Improving consistency of UX ([#8796](https://github.com/RocketChat/Rocket.Chat/pull/8796) by [@HammyHavoc](https://github.com/HammyHavoc))
+
+- fixed some typos ([#8787](https://github.com/RocketChat/Rocket.Chat/pull/8787) by [@TheReal1604](https://github.com/TheReal1604))
+
+- Fix e-mail message forward ([#8645](https://github.com/RocketChat/Rocket.Chat/pull/8645))
+
+- Audio message icon ([#8648](https://github.com/RocketChat/Rocket.Chat/pull/8648) by [@karlprieb](https://github.com/karlprieb))
+
+- Highlighted color height issue ([#8431](https://github.com/RocketChat/Rocket.Chat/pull/8431) by [@cyclops24](https://github.com/cyclops24))
+
+- AmazonS3: Quote file.name for ContentDisposition for files with commas ([#8593](https://github.com/RocketChat/Rocket.Chat/pull/8593) by [@xenithorb](https://github.com/xenithorb))
+
+- Update pt-BR translation ([#8655](https://github.com/RocketChat/Rocket.Chat/pull/8655) by [@rodorgas](https://github.com/rodorgas))
+
+- Fix typos ([#8679](https://github.com/RocketChat/Rocket.Chat/pull/8679))
+
+- LDAP not respecting UTF8 characters & Sync Interval not working ([#8691](https://github.com/RocketChat/Rocket.Chat/pull/8691))
+
+- Missing scroll at create channel page ([#8637](https://github.com/RocketChat/Rocket.Chat/pull/8637) by [@karlprieb](https://github.com/karlprieb))
+
+- Message popup menu on mobile/cordova ([#8634](https://github.com/RocketChat/Rocket.Chat/pull/8634) by [@karlprieb](https://github.com/karlprieb))
+
+- API channel/group.members not sorting ([#8635](https://github.com/RocketChat/Rocket.Chat/pull/8635))
+
+- LDAP not merging existent users && Wrong id link generation ([#8613](https://github.com/RocketChat/Rocket.Chat/pull/8613))
+
+- encode filename in url to prevent links breaking ([#8551](https://github.com/RocketChat/Rocket.Chat/pull/8551) by [@joesitton](https://github.com/joesitton))
+
+- Fix guest pool inquiry taking ([#8577](https://github.com/RocketChat/Rocket.Chat/pull/8577))
+
+- Changed all rocket.chat/docs/ to docs.rocket.chat/ ([#8588](https://github.com/RocketChat/Rocket.Chat/pull/8588) by [@RekkyRek](https://github.com/RekkyRek))
+
+- Color reset when default value editor is different ([#8543](https://github.com/RocketChat/Rocket.Chat/pull/8543))
+
+- Wrong colors after migration 103 ([#8547](https://github.com/RocketChat/Rocket.Chat/pull/8547))
+
+- LDAP login error regression at 0.59.0 ([#8541](https://github.com/RocketChat/Rocket.Chat/pull/8541))
+
+- Migration 103 wrong converting primrary colors ([#8544](https://github.com/RocketChat/Rocket.Chat/pull/8544))
+
+- Do not send joinCode field to clients ([#8527](https://github.com/RocketChat/Rocket.Chat/pull/8527))
+
+- Uncessary route reload break some routes ([#8514](https://github.com/RocketChat/Rocket.Chat/pull/8514))
+
+- Invalid Code message for password protected channel ([#8491](https://github.com/RocketChat/Rocket.Chat/pull/8491))
+
+- Wrong message when reseting password and 2FA is enabled ([#8489](https://github.com/RocketChat/Rocket.Chat/pull/8489))
+
+- LDAP memory issues when pagination is not available ([#8457](https://github.com/RocketChat/Rocket.Chat/pull/8457))
+
+- Add needed dependency for snaps ([#8389](https://github.com/RocketChat/Rocket.Chat/pull/8389))
+
+- Slack import failing and not being able to be restarted ([#8390](https://github.com/RocketChat/Rocket.Chat/pull/8390))
+
+- Sidebar item menu position in RTL ([#8397](https://github.com/RocketChat/Rocket.Chat/pull/8397) by [@cyclops24](https://github.com/cyclops24))
+
+- disabled katex tooltip on messageBox ([#8386](https://github.com/RocketChat/Rocket.Chat/pull/8386))
+
+- Duplicate code in rest api letting in a few bugs with the rest api ([#8408](https://github.com/RocketChat/Rocket.Chat/pull/8408))
+
+- Various LDAP issues & Missing pagination ([#8372](https://github.com/RocketChat/Rocket.Chat/pull/8372))
+
+- remove accountBox from admin menu ([#8358](https://github.com/RocketChat/Rocket.Chat/pull/8358) by [@karlprieb](https://github.com/karlprieb))
+
+- Missing i18n translations ([#8357](https://github.com/RocketChat/Rocket.Chat/pull/8357))
+
+- After deleting the room, cache is not synchronizing ([#8314](https://github.com/RocketChat/Rocket.Chat/pull/8314) by [@szluohua](https://github.com/szluohua))
+
+- Remove sidebar header on admin embedded version ([#8334](https://github.com/RocketChat/Rocket.Chat/pull/8334) by [@karlprieb](https://github.com/karlprieb))
+
+- Email Subjects not being sent ([#8317](https://github.com/RocketChat/Rocket.Chat/pull/8317))
+
+- Put delete action on another popover group ([#8315](https://github.com/RocketChat/Rocket.Chat/pull/8315) by [@karlprieb](https://github.com/karlprieb))
+
+- Mention unread indicator was removed ([#8316](https://github.com/RocketChat/Rocket.Chat/pull/8316))
+
+- Execute meteor reset on TRAVIS_TAG builds ([#8310](https://github.com/RocketChat/Rocket.Chat/pull/8310))
+
+- Wrong file name when upload to AWS S3 ([#8296](https://github.com/RocketChat/Rocket.Chat/pull/8296))
+
+- TypeError: Cannot read property 't' of undefined ([#8298](https://github.com/RocketChat/Rocket.Chat/pull/8298))
+
+- Check attachments is defined before accessing first element ([#8295](https://github.com/RocketChat/Rocket.Chat/pull/8295) by [@Darkneon](https://github.com/Darkneon))
+
+- Amin menu not showing all items & File list breaking line ([#8299](https://github.com/RocketChat/Rocket.Chat/pull/8299) by [@karlprieb](https://github.com/karlprieb))
+
+- Call buttons with wrong margin on RTL ([#8307](https://github.com/RocketChat/Rocket.Chat/pull/8307) by [@karlprieb](https://github.com/karlprieb))
+
+- Emoji Picker hidden for reactions in RTL ([#8300](https://github.com/RocketChat/Rocket.Chat/pull/8300) by [@karlprieb](https://github.com/karlprieb))
+
+- fix color on unread messages ([#8282](https://github.com/RocketChat/Rocket.Chat/pull/8282))
+
+- Missing placeholder translations ([#8286](https://github.com/RocketChat/Rocket.Chat/pull/8286))
 
-- Add yunohost.org installation method to Readme.md ([#8037](https://github.com/RocketChat/Rocket.Chat/pull/8037) by [@selamanse](https://github.com/selamanse))
+- "Cancel button" on modal in RTL in Firefox 55 ([#8278](https://github.com/RocketChat/Rocket.Chat/pull/8278) by [@cyclops24](https://github.com/cyclops24))
 
-- Modal ([#9092](https://github.com/RocketChat/Rocket.Chat/pull/9092) by [@karlprieb](https://github.com/karlprieb))
+- Attachment icons alignment in LTR and RTL ([#8271](https://github.com/RocketChat/Rocket.Chat/pull/8271) by [@cyclops24](https://github.com/cyclops24))
 
-- Make Custom oauth accept nested usernameField ([#9066](https://github.com/RocketChat/Rocket.Chat/pull/9066) by [@pierreozoux](https://github.com/pierreozoux))
+- [i18n] My Profile & README.md links ([#8270](https://github.com/RocketChat/Rocket.Chat/pull/8270) by [@Rzeszow](https://github.com/Rzeszow))
 
-### 🐛 Bug fixes
+- Incorrect URL for login terms when using prefix ([#8211](https://github.com/RocketChat/Rocket.Chat/pull/8211) by [@Darkneon](https://github.com/Darkneon))
 
+- Scrollbar not using new style ([#8190](https://github.com/RocketChat/Rocket.Chat/pull/8190))
 
-- Can't react on Read Only rooms even when enabled ([#8925](https://github.com/RocketChat/Rocket.Chat/pull/8925) by [@karlprieb](https://github.com/karlprieb))
+- User avatar in DM list. ([#8210](https://github.com/RocketChat/Rocket.Chat/pull/8210))
 
-- CAS does not share secrets when operating multiple server instances ([#8654](https://github.com/RocketChat/Rocket.Chat/pull/8654) by [@AmShaegar13](https://github.com/AmShaegar13))
+- Fix iframe login API response (issue #8145) ([#8146](https://github.com/RocketChat/Rocket.Chat/pull/8146) by [@astax-t](https://github.com/astax-t))
 
-- Snippetted messages not working ([#8937](https://github.com/RocketChat/Rocket.Chat/pull/8937) by [@karlprieb](https://github.com/karlprieb))
+- Issue #8166 where empty analytics setting breaks to load Piwik script ([#8167](https://github.com/RocketChat/Rocket.Chat/pull/8167) by [@ruKurz](https://github.com/ruKurz))
 
-- Added afterUserCreated trigger after first CAS login ([#9022](https://github.com/RocketChat/Rocket.Chat/pull/9022) by [@AmShaegar13](https://github.com/AmShaegar13))
+- Sidebar and RTL alignments ([#8154](https://github.com/RocketChat/Rocket.Chat/pull/8154) by [@karlprieb](https://github.com/karlprieb))
 
-- Notification is not sent when a video conference start ([#8828](https://github.com/RocketChat/Rocket.Chat/pull/8828) by [@deepseainside75](https://github.com/deepseainside75) & [@stefanoverducci](https://github.com/stefanoverducci))
+- "*.members" rest api being useless and only returning usernames ([#8147](https://github.com/RocketChat/Rocket.Chat/pull/8147))
 
-- long filename overlaps cancel button in progress bar ([#8868](https://github.com/RocketChat/Rocket.Chat/pull/8868) by [@joesitton](https://github.com/joesitton))
+- Text area lost text when page reloads ([#8159](https://github.com/RocketChat/Rocket.Chat/pull/8159))
 
-- Changed oembedUrlWidget to prefer og:image and twitter:image over msapplication-TileImage ([#9012](https://github.com/RocketChat/Rocket.Chat/pull/9012) by [@wferris722](https://github.com/wferris722))
+- Add admin audio preferences translations ([#8094](https://github.com/RocketChat/Rocket.Chat/pull/8094))
 
-- Update insecure moment.js dependency ([#9046](https://github.com/RocketChat/Rocket.Chat/pull/9046) by [@robbyoconnor](https://github.com/robbyoconnor))
+- RTL ([#8112](https://github.com/RocketChat/Rocket.Chat/pull/8112))
 
-- Custom OAuth: Not able to set different token place for routes ([#9034](https://github.com/RocketChat/Rocket.Chat/pull/9034))
+- Settings description not showing ([#8122](https://github.com/RocketChat/Rocket.Chat/pull/8122))
 
-- Can't use OAuth login against a Rocket.Chat OAuth server ([#9044](https://github.com/RocketChat/Rocket.Chat/pull/9044))
+- Not sending email to mentioned users with unchanged preference ([#8059](https://github.com/RocketChat/Rocket.Chat/pull/8059))
 
-- Notification sound is not disabling when busy ([#9042](https://github.com/RocketChat/Rocket.Chat/pull/9042))
+- Dynamic popover ([#8101](https://github.com/RocketChat/Rocket.Chat/pull/8101) by [@karlprieb](https://github.com/karlprieb))
 
-- Use encodeURI in AmazonS3 contentDisposition file.name to prevent fail ([#9024](https://github.com/RocketChat/Rocket.Chat/pull/9024) by [@paulovitin](https://github.com/paulovitin))
+- Fix setting user avatar on LDAP login ([#8099](https://github.com/RocketChat/Rocket.Chat/pull/8099))
 
-- snap install by setting grpc package used by google/vision to 1.6.6 ([#9029](https://github.com/RocketChat/Rocket.Chat/pull/9029))
+- Scroll on messagebox ([#8047](https://github.com/RocketChat/Rocket.Chat/pull/8047))
 
-- Enable CORS for Restivus ([#8671](https://github.com/RocketChat/Rocket.Chat/pull/8671) by [@mrsimpson](https://github.com/mrsimpson))
+- Invisible leader bar on hover ([#8048](https://github.com/RocketChat/Rocket.Chat/pull/8048))
 
-- Importers failing when usernames exists but cases don't match and improve the importer framework's performance ([#8966](https://github.com/RocketChat/Rocket.Chat/pull/8966))
+- Fix email on mention ([#7754](https://github.com/RocketChat/Rocket.Chat/pull/7754))
 
-- Error when saving integration with symbol as only trigger ([#9023](https://github.com/RocketChat/Rocket.Chat/pull/9023))
+- Prevent autotranslate tokens race condition ([#8046](https://github.com/RocketChat/Rocket.Chat/pull/8046))
 
-- Sync of non existent field throws exception ([#8006](https://github.com/RocketChat/Rocket.Chat/pull/8006) by [@goiaba](https://github.com/goiaba))
+- Vertical menu on flex-tab ([#7988](https://github.com/RocketChat/Rocket.Chat/pull/7988) by [@karlprieb](https://github.com/karlprieb))
 
-- Autoupdate of CSS does not work when using a prefix ([#8107](https://github.com/RocketChat/Rocket.Chat/pull/8107) by [@Darkneon](https://github.com/Darkneon))
+- message-box autogrow ([#8019](https://github.com/RocketChat/Rocket.Chat/pull/8019) by [@karlprieb](https://github.com/karlprieb))
 
-- Contextual errors for this and RegExp declarations in IRC module ([#8656](https://github.com/RocketChat/Rocket.Chat/pull/8656) by [@Pharserror](https://github.com/Pharserror))
+- copy to clipboard and update clipboard.js library ([#8039](https://github.com/RocketChat/Rocket.Chat/pull/8039) by [@karlprieb](https://github.com/karlprieb))
 
-- Wrong room counter name ([#9013](https://github.com/RocketChat/Rocket.Chat/pull/9013) by [@karlprieb](https://github.com/karlprieb))
+- Recent emojis not updated when adding via text ([#7998](https://github.com/RocketChat/Rocket.Chat/pull/7998))
 
-- Message-box autogrow flick ([#8932](https://github.com/RocketChat/Rocket.Chat/pull/8932) by [@karlprieb](https://github.com/karlprieb))
+- [PL] Polish translation ([#7989](https://github.com/RocketChat/Rocket.Chat/pull/7989) by [@Rzeszow](https://github.com/Rzeszow))
 
-- Don't strip trailing slash on autolinker urls ([#8812](https://github.com/RocketChat/Rocket.Chat/pull/8812) by [@jwilkins](https://github.com/jwilkins))
+- Chat box no longer auto-focuses when typing ([#7984](https://github.com/RocketChat/Rocket.Chat/pull/7984))
 
-- Change the unread messages style ([#8883](https://github.com/RocketChat/Rocket.Chat/pull/8883) by [@karlprieb](https://github.com/karlprieb))
+- Fix the status on the members list ([#7963](https://github.com/RocketChat/Rocket.Chat/pull/7963))
 
-- Missing sidebar footer padding ([#8884](https://github.com/RocketChat/Rocket.Chat/pull/8884) by [@karlprieb](https://github.com/karlprieb))
+- Markdown being rendered in code tags ([#7965](https://github.com/RocketChat/Rocket.Chat/pull/7965))
 
-- Long room announcement cut off ([#8907](https://github.com/RocketChat/Rocket.Chat/pull/8907) by [@karlprieb](https://github.com/karlprieb))
+- Email verification indicator added ([#7923](https://github.com/RocketChat/Rocket.Chat/pull/7923) by [@aditya19496](https://github.com/aditya19496))
 
-- DM email notifications always being sent regardless of account setting ([#8917](https://github.com/RocketChat/Rocket.Chat/pull/8917) by [@ashward](https://github.com/ashward))
+- Show leader on first load ([#7712](https://github.com/RocketChat/Rocket.Chat/pull/7712) by [@danischreiber](https://github.com/danischreiber))
 
-- Typo Fix ([#8938](https://github.com/RocketChat/Rocket.Chat/pull/8938) by [@seangeleno](https://github.com/seangeleno))
+- Add padding on messages to allow space to the action buttons ([#7971](https://github.com/RocketChat/Rocket.Chat/pull/7971))
 
-- Katex markdown link changed ([#8948](https://github.com/RocketChat/Rocket.Chat/pull/8948) by [@mritunjaygoutam12](https://github.com/mritunjaygoutam12))
+- Small alignment fixes ([#7970](https://github.com/RocketChat/Rocket.Chat/pull/7970))
 
-- if ogImage exists use it over image in oembedUrlWidget ([#9000](https://github.com/RocketChat/Rocket.Chat/pull/9000) by [@satyapramodh](https://github.com/satyapramodh))
+- username ellipsis on firefox ([#7953](https://github.com/RocketChat/Rocket.Chat/pull/7953) by [@karlprieb](https://github.com/karlprieb))
 
-- Cannot edit or delete custom sounds ([#8889](https://github.com/RocketChat/Rocket.Chat/pull/8889) by [@ccfang](https://github.com/ccfang))
+- Document README.md. Drupal repo out of date ([#7948](https://github.com/RocketChat/Rocket.Chat/pull/7948) by [@Lawri-van-Buel](https://github.com/Lawri-van-Buel))
 
-- Change old 'rocketbot' username to 'InternalHubot_Username' setting ([#8928](https://github.com/RocketChat/Rocket.Chat/pull/8928) by [@ramrami](https://github.com/ramrami))
+- Double scroll on 'keyboard shortcuts' menu in sidepanel ([#7927](https://github.com/RocketChat/Rocket.Chat/pull/7927) by [@aditya19496](https://github.com/aditya19496))
 
-- Link for channels are not rendering correctly ([#8985](https://github.com/RocketChat/Rocket.Chat/pull/8985) by [@karlprieb](https://github.com/karlprieb))
+- Broken emoji picker on firefox ([#7943](https://github.com/RocketChat/Rocket.Chat/pull/7943) by [@karlprieb](https://github.com/karlprieb))
 
-- Xenforo [BD]API for 'user.user_id; instead of 'id' ([#8968](https://github.com/RocketChat/Rocket.Chat/pull/8968) by [@wesnspace](https://github.com/wesnspace))
+- Broken embedded view layout ([#7944](https://github.com/RocketChat/Rocket.Chat/pull/7944) by [@karlprieb](https://github.com/karlprieb))
 
-- flextab height on smaller screens ([#8994](https://github.com/RocketChat/Rocket.Chat/pull/8994) by [@karlprieb](https://github.com/karlprieb))
+- Fix placeholders in account profile ([#7945](https://github.com/RocketChat/Rocket.Chat/pull/7945) by [@josiasds](https://github.com/josiasds))
 
-- Check for mention-all permission in room scope ([#8931](https://github.com/RocketChat/Rocket.Chat/pull/8931))
+- OTR buttons padding ([#7954](https://github.com/RocketChat/Rocket.Chat/pull/7954) by [@karlprieb](https://github.com/karlprieb))
 
-- fix emoji package path so they show up correctly in browser ([#8822](https://github.com/RocketChat/Rocket.Chat/pull/8822) by [@ryoshimizu](https://github.com/ryoshimizu))
+- status and active room colors on sidebar ([#7960](https://github.com/RocketChat/Rocket.Chat/pull/7960) by [@karlprieb](https://github.com/karlprieb))
 
-- Set correct Twitter link ([#8830](https://github.com/RocketChat/Rocket.Chat/pull/8830) by [@jotafeldmann](https://github.com/jotafeldmann))
+- Fix google play logo on repo README ([#7912](https://github.com/RocketChat/Rocket.Chat/pull/7912) by [@luizbills](https://github.com/luizbills))
 
-- User email settings on DM ([#8810](https://github.com/RocketChat/Rocket.Chat/pull/8810) by [@karlprieb](https://github.com/karlprieb))
+- Fix livechat toggle UI issue ([#7904](https://github.com/RocketChat/Rocket.Chat/pull/7904))
 
-- i18n'd Resend_verification_mail, username_initials, upload avatar ([#8721](https://github.com/RocketChat/Rocket.Chat/pull/8721) by [@arungalva](https://github.com/arungalva))
+- Remove break change in Realtime API ([#7895](https://github.com/RocketChat/Rocket.Chat/pull/7895))
 
-- Username clipping on firefox ([#8716](https://github.com/RocketChat/Rocket.Chat/pull/8716) by [@karlprieb](https://github.com/karlprieb))
+- Window exception when parsing Markdown on server ([#7893](https://github.com/RocketChat/Rocket.Chat/pull/7893))
 
-- Improved grammar and made it clearer to the user ([#8795](https://github.com/RocketChat/Rocket.Chat/pull/8795) by [@HammyHavoc](https://github.com/HammyHavoc))
+- sidebar buttons and badge paddings ([#7888](https://github.com/RocketChat/Rocket.Chat/pull/7888) by [@karlprieb](https://github.com/karlprieb))
 
-- Show real name of current user at top of side nav if setting enabled ([#8718](https://github.com/RocketChat/Rocket.Chat/pull/8718) by [@alexbrazier](https://github.com/alexbrazier))
+- hyperlink style on sidebar footer ([#7882](https://github.com/RocketChat/Rocket.Chat/pull/7882) by [@karlprieb](https://github.com/karlprieb))
 
-- Range Slider Value label has bug in RTL ([#8441](https://github.com/RocketChat/Rocket.Chat/pull/8441) by [@cyclops24](https://github.com/cyclops24))
+- livechat icon ([#7886](https://github.com/RocketChat/Rocket.Chat/pull/7886) by [@karlprieb](https://github.com/karlprieb))
 
-- Add historic chats icon in Livechat ([#8708](https://github.com/RocketChat/Rocket.Chat/pull/8708) by [@mrsimpson](https://github.com/mrsimpson))
+- Makes text action menu width based on content size ([#7887](https://github.com/RocketChat/Rocket.Chat/pull/7887) by [@gdelavald](https://github.com/gdelavald))
 
-- Sort direct messages by full name if show real names setting enabled ([#8717](https://github.com/RocketChat/Rocket.Chat/pull/8717) by [@alexbrazier](https://github.com/alexbrazier))
+- message actions over unread bar ([#7885](https://github.com/RocketChat/Rocket.Chat/pull/7885) by [@karlprieb](https://github.com/karlprieb))
 
-- Improving consistency of UX ([#8796](https://github.com/RocketChat/Rocket.Chat/pull/8796) by [@HammyHavoc](https://github.com/HammyHavoc))
+- popover position on mobile ([#7883](https://github.com/RocketChat/Rocket.Chat/pull/7883) by [@karlprieb](https://github.com/karlprieb))
 
-- fixed some typos ([#8787](https://github.com/RocketChat/Rocket.Chat/pull/8787) by [@TheReal1604](https://github.com/TheReal1604))
+- search results position on sidebar ([#7881](https://github.com/RocketChat/Rocket.Chat/pull/7881) by [@karlprieb](https://github.com/karlprieb))
 
-- Changed all rocket.chat/docs/ to docs.rocket.chat/ ([#8588](https://github.com/RocketChat/Rocket.Chat/pull/8588) by [@RekkyRek](https://github.com/RekkyRek))
+- sidebar paddings ([#7880](https://github.com/RocketChat/Rocket.Chat/pull/7880) by [@karlprieb](https://github.com/karlprieb))
 
-- Email verification indicator added ([#7923](https://github.com/RocketChat/Rocket.Chat/pull/7923) by [@aditya19496](https://github.com/aditya19496))
+- Adds default search text padding for emoji search ([#7878](https://github.com/RocketChat/Rocket.Chat/pull/7878) by [@gdelavald](https://github.com/gdelavald))
 
 - REST API file upload not respecting size limit ([#9108](https://github.com/RocketChat/Rocket.Chat/pull/9108))
 
@@ -8091,8 +8964,26 @@
 
 - Updated comments. ([#8719](https://github.com/RocketChat/Rocket.Chat/pull/8719) by [@jasonjyu](https://github.com/jasonjyu))
 
+- removing a duplicate line ([#8434](https://github.com/RocketChat/Rocket.Chat/pull/8434) by [@vikaskedia](https://github.com/vikaskedia))
+
+- install grpc package manually to fix snap armhf build ([#8653](https://github.com/RocketChat/Rocket.Chat/pull/8653))
+
 - Fix community links in readme ([#8589](https://github.com/RocketChat/Rocket.Chat/pull/8589))
 
+- Improve room sync speed ([#8529](https://github.com/RocketChat/Rocket.Chat/pull/8529))
+
+- Fix high CPU load when sending messages on large rooms (regression) ([#8520](https://github.com/RocketChat/Rocket.Chat/pull/8520))
+
+- Change artifact path ([#8515](https://github.com/RocketChat/Rocket.Chat/pull/8515))
+
+- Color variables migration ([#8463](https://github.com/RocketChat/Rocket.Chat/pull/8463) by [@karlprieb](https://github.com/karlprieb))
+
+- Fix: Change password not working in new UI ([#8516](https://github.com/RocketChat/Rocket.Chat/pull/8516))
+
+- Enable AutoLinker back ([#8490](https://github.com/RocketChat/Rocket.Chat/pull/8490))
+
+- Improve markdown parser code ([#8451](https://github.com/RocketChat/Rocket.Chat/pull/8451))
+
 - [MOVE] Move favico to client folder ([#8077](https://github.com/RocketChat/Rocket.Chat/pull/8077) by [@vcapretz](https://github.com/vcapretz))
 
 - [MOVE] Move files from emojione to client/server folders ([#8078](https://github.com/RocketChat/Rocket.Chat/pull/8078) by [@vcapretz](https://github.com/vcapretz))
@@ -8119,12 +9010,48 @@
 
 - [MOVE] Move timesync files to client/server folders ([#8152](https://github.com/RocketChat/Rocket.Chat/pull/8152) by [@vcapretz](https://github.com/vcapretz))
 
+- Fix: Account menu position on RTL ([#8416](https://github.com/RocketChat/Rocket.Chat/pull/8416) by [@karlprieb](https://github.com/karlprieb))
+
+- Fix: Missing LDAP option to show internal logs ([#8417](https://github.com/RocketChat/Rocket.Chat/pull/8417))
+
+- Fix: Missing LDAP reconnect setting ([#8414](https://github.com/RocketChat/Rocket.Chat/pull/8414))
+
+- Add i18n Title to snippet messages ([#8394](https://github.com/RocketChat/Rocket.Chat/pull/8394))
+
+- Fix: Missing settings to configure LDAP size and page limits ([#8398](https://github.com/RocketChat/Rocket.Chat/pull/8398))
+
+- LingoHub based on develop ([#8375](https://github.com/RocketChat/Rocket.Chat/pull/8375))
+
+- Update Meteor to 1.5.2.2 ([#8364](https://github.com/RocketChat/Rocket.Chat/pull/8364))
+
+- Sync translations from LingoHub ([#8363](https://github.com/RocketChat/Rocket.Chat/pull/8363))
+
+- Remove field `lastActivity` from subscription data ([#8345](https://github.com/RocketChat/Rocket.Chat/pull/8345))
+
+- Update meteor to 1.5.2.2-rc.0 ([#8355](https://github.com/RocketChat/Rocket.Chat/pull/8355))
+
+- [FIX-RC] Mobile file upload not working ([#8331](https://github.com/RocketChat/Rocket.Chat/pull/8331) by [@karlprieb](https://github.com/karlprieb))
+
+- Deps update ([#8273](https://github.com/RocketChat/Rocket.Chat/pull/8273))
+
+- Fix more rtl issues ([#8194](https://github.com/RocketChat/Rocket.Chat/pull/8194) by [@karlprieb](https://github.com/karlprieb))
+
+- npm deps update ([#8197](https://github.com/RocketChat/Rocket.Chat/pull/8197))
+
+- Remove unnecessary returns in cors common ([#8054](https://github.com/RocketChat/Rocket.Chat/pull/8054) by [@Kiran-Rao](https://github.com/Kiran-Rao))
+
 - Adding: How to Install in WeDeploy ([#8036](https://github.com/RocketChat/Rocket.Chat/pull/8036) by [@thompsonemerson](https://github.com/thompsonemerson))
 
 - Revert "npm deps update" ([#7983](https://github.com/RocketChat/Rocket.Chat/pull/7983))
 
+- [DOCS] Add native mobile app links into README and update button images ([#7909](https://github.com/RocketChat/Rocket.Chat/pull/7909) by [@rafaelks](https://github.com/rafaelks))
+
 - npm deps update ([#7969](https://github.com/RocketChat/Rocket.Chat/pull/7969))
 
+- Update BlackDuck URL ([#7941](https://github.com/RocketChat/Rocket.Chat/pull/7941))
+
+- Hide flex-tab close button ([#7894](https://github.com/RocketChat/Rocket.Chat/pull/7894) by [@karlprieb](https://github.com/karlprieb))
+
 - Added RocketChatLauncher (SaaS) ([#6606](https://github.com/RocketChat/Rocket.Chat/pull/6606) by [@designgurudotorg](https://github.com/designgurudotorg))
 
 - Develop sync ([#7866](https://github.com/RocketChat/Rocket.Chat/pull/7866))
@@ -8192,14 +9119,18 @@
 - [@AmShaegar13](https://github.com/AmShaegar13)
 - [@Darkneon](https://github.com/Darkneon)
 - [@HammyHavoc](https://github.com/HammyHavoc)
+- [@Kiran-Rao](https://github.com/Kiran-Rao)
+- [@Lawri-van-Buel](https://github.com/Lawri-van-Buel)
 - [@Pharserror](https://github.com/Pharserror)
 - [@RekkyRek](https://github.com/RekkyRek)
+- [@Rzeszow](https://github.com/Rzeszow)
 - [@TheReal1604](https://github.com/TheReal1604)
 - [@aditya19496](https://github.com/aditya19496)
 - [@alexbrazier](https://github.com/alexbrazier)
 - [@armand1m](https://github.com/armand1m)
 - [@arungalva](https://github.com/arungalva)
 - [@ashward](https://github.com/ashward)
+- [@astax-t](https://github.com/astax-t)
 - [@ccfang](https://github.com/ccfang)
 - [@cpitman](https://github.com/cpitman)
 - [@cyclops24](https://github.com/cyclops24)
@@ -8213,10 +9144,12 @@
 - [@icosamuel](https://github.com/icosamuel)
 - [@jasonjyu](https://github.com/jasonjyu)
 - [@joesitton](https://github.com/joesitton)
+- [@josiasds](https://github.com/josiasds)
 - [@jotafeldmann](https://github.com/jotafeldmann)
 - [@jwilkins](https://github.com/jwilkins)
 - [@karlprieb](https://github.com/karlprieb)
 - [@lindoelio](https://github.com/lindoelio)
+- [@luizbills](https://github.com/luizbills)
 - [@mastappl](https://github.com/mastappl)
 - [@mritunjaygoutam12](https://github.com/mritunjaygoutam12)
 - [@mrsimpson](https://github.com/mrsimpson)
@@ -8224,9 +9157,12 @@
 - [@peterlee0127](https://github.com/peterlee0127)
 - [@pierreozoux](https://github.com/pierreozoux)
 - [@pkgodara](https://github.com/pkgodara)
+- [@rafaelks](https://github.com/rafaelks)
 - [@ramrami](https://github.com/ramrami)
 - [@rmetzler](https://github.com/rmetzler)
 - [@robbyoconnor](https://github.com/robbyoconnor)
+- [@rodorgas](https://github.com/rodorgas)
+- [@ruKurz](https://github.com/ruKurz)
 - [@ryoshimizu](https://github.com/ryoshimizu)
 - [@sarbasamuel](https://github.com/sarbasamuel)
 - [@satyapramodh](https://github.com/satyapramodh)
@@ -8234,12 +9170,15 @@
 - [@selamanse](https://github.com/selamanse)
 - [@stalley](https://github.com/stalley)
 - [@stefanoverducci](https://github.com/stefanoverducci)
+- [@szluohua](https://github.com/szluohua)
 - [@thompsonemerson](https://github.com/thompsonemerson)
 - [@torgeirl](https://github.com/torgeirl)
 - [@vcapretz](https://github.com/vcapretz)
+- [@vikaskedia](https://github.com/vikaskedia)
 - [@vitor-nagao](https://github.com/vitor-nagao)
 - [@wesnspace](https://github.com/wesnspace)
 - [@wferris722](https://github.com/wferris722)
+- [@xenithorb](https://github.com/xenithorb)
 
 ### 👩‍💻👨‍💻 Core Team 🤓
 
@@ -8427,7 +9366,7 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 0.59.0
-`2017-10-18  ·  24 🎉  ·  116 🐛  ·  50 🔍  ·  44 👩‍💻👨‍💻`
+`2017-10-18  ·  25 🎉  ·  122 🐛  ·  51 🔍  ·  46 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `4.8.4`
@@ -8470,6 +9409,8 @@
 
 - Rocket.Chat UI Redesign ([#7643](https://github.com/RocketChat/Rocket.Chat/pull/7643))
 
+- Add unread options for direct messages ([#7658](https://github.com/RocketChat/Rocket.Chat/pull/7658))
+
 - Upgrade to meteor 1.5.2 ([#8073](https://github.com/RocketChat/Rocket.Chat/pull/8073))
 
 - Enable read only channel creation ([#8260](https://github.com/RocketChat/Rocket.Chat/pull/8260) by [@karlprieb](https://github.com/karlprieb))
@@ -8517,6 +9458,8 @@
 
 - Fixed function closure syntax allowing validation emails to be sent. ([#7758](https://github.com/RocketChat/Rocket.Chat/pull/7758) by [@snoozan](https://github.com/snoozan))
 
+- Csv importer: work with more problematic data ([#7456](https://github.com/RocketChat/Rocket.Chat/pull/7456) by [@reist](https://github.com/reist))
+
 - Fix avatar upload fail on Cordova app ([#7656](https://github.com/RocketChat/Rocket.Chat/pull/7656) by [@ccfang](https://github.com/ccfang))
 
 - Make link inside YouTube preview open in new tab ([#7679](https://github.com/RocketChat/Rocket.Chat/pull/7679) by [@1lann](https://github.com/1lann))
@@ -8525,6 +9468,16 @@
 
 - Example usage of unsubscribe.js ([#7673](https://github.com/RocketChat/Rocket.Chat/pull/7673) by [@Kiran-Rao](https://github.com/Kiran-Rao))
 
+- Wrong email subject when "All Messages" setting enabled ([#7639](https://github.com/RocketChat/Rocket.Chat/pull/7639))
+
+- Markdown noopener/noreferrer: use correct HTML attribute ([#7644](https://github.com/RocketChat/Rocket.Chat/pull/7644) by [@jangmarker](https://github.com/jangmarker))
+
+- Fix room load on first hit ([#7687](https://github.com/RocketChat/Rocket.Chat/pull/7687))
+
+- Wrong render of snippet’s name ([#7630](https://github.com/RocketChat/Rocket.Chat/pull/7630))
+
+- Fix messagebox growth ([#7629](https://github.com/RocketChat/Rocket.Chat/pull/7629))
+
 - sidebar paddings ([#7880](https://github.com/RocketChat/Rocket.Chat/pull/7880) by [@karlprieb](https://github.com/karlprieb))
 
 - Adds default search text padding for emoji search ([#7878](https://github.com/RocketChat/Rocket.Chat/pull/7878) by [@gdelavald](https://github.com/gdelavald))
@@ -8759,6 +9712,8 @@
 
 - [MOVE] Client folder rocketchat-emoji ([#7671](https://github.com/RocketChat/Rocket.Chat/pull/7671) by [@Kiran-Rao](https://github.com/Kiran-Rao))
 
+- Only use "File Uploaded" prefix on files ([#7652](https://github.com/RocketChat/Rocket.Chat/pull/7652))
+
 - Fix typo in generated URI ([#7661](https://github.com/RocketChat/Rocket.Chat/pull/7661) by [@Rohlik](https://github.com/Rohlik))
 
 - Bump version to 0.59.0-develop ([#7625](https://github.com/RocketChat/Rocket.Chat/pull/7625))
@@ -8848,6 +9803,7 @@
 - [@danischreiber](https://github.com/danischreiber)
 - [@gdelavald](https://github.com/gdelavald)
 - [@goiaba](https://github.com/goiaba)
+- [@jangmarker](https://github.com/jangmarker)
 - [@josiasds](https://github.com/josiasds)
 - [@karlprieb](https://github.com/karlprieb)
 - [@luizbills](https://github.com/luizbills)
@@ -8858,6 +9814,7 @@
 - [@pkgodara](https://github.com/pkgodara)
 - [@rafaelks](https://github.com/rafaelks)
 - [@rdebeasi](https://github.com/rdebeasi)
+- [@reist](https://github.com/reist)
 - [@ruKurz](https://github.com/ruKurz)
 - [@snoozan](https://github.com/snoozan)
 - [@szluohua](https://github.com/szluohua)
@@ -8876,12 +9833,26 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 0.58.4
-`2017-10-05`
+`2017-10-05  ·  3 🐛  ·  2 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `4.8.4`
 - NPM: `4.6.1`
 
+### 🐛 Bug fixes
+
+
+- Duplicate code in rest api letting in a few bugs with the rest api ([#8408](https://github.com/RocketChat/Rocket.Chat/pull/8408))
+
+- Slack import failing and not being able to be restarted ([#8390](https://github.com/RocketChat/Rocket.Chat/pull/8390))
+
+- Add needed dependency for snaps ([#8389](https://github.com/RocketChat/Rocket.Chat/pull/8389))
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@geekgonecrazy](https://github.com/geekgonecrazy)
+- [@graywolf336](https://github.com/graywolf336)
+
 # 0.58.2
 `2017-08-22  ·  1 🔍  ·  2 👩‍💻👨‍💻`
 
@@ -8931,7 +9902,7 @@
 - [@rodrigok](https://github.com/rodrigok)
 
 # 0.58.0
-`2017-08-16  ·  1 ️️️⚠️  ·  26 🎉  ·  33 🐛  ·  18 🔍  ·  32 👩‍💻👨‍💻`
+`2017-08-16  ·  1 ️️️⚠️  ·  27 🎉  ·  48 🐛  ·  19 🔍  ·  32 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `4.8.4`
@@ -8993,6 +9964,8 @@
 
 - Option to select unread count behavior ([#7477](https://github.com/RocketChat/Rocket.Chat/pull/7477))
 
+- Force use of MongoDB for spotlight queries ([#7311](https://github.com/RocketChat/Rocket.Chat/pull/7311))
+
 - Add healthchecks in OpenShift templates ([#7184](https://github.com/RocketChat/Rocket.Chat/pull/7184) by [@jfchevrette](https://github.com/jfchevrette))
 
 - Add unread options for direct messages ([#7658](https://github.com/RocketChat/Rocket.Chat/pull/7658))
@@ -9000,6 +9973,12 @@
 ### 🐛 Bug fixes
 
 
+- Slack import failing and not being able to be restarted ([#8390](https://github.com/RocketChat/Rocket.Chat/pull/8390))
+
+- Duplicate code in rest api letting in a few bugs with the rest api ([#8408](https://github.com/RocketChat/Rocket.Chat/pull/8408))
+
+- Add needed dependency for snaps ([#8389](https://github.com/RocketChat/Rocket.Chat/pull/8389))
+
 - Error when updating message with an empty attachment array ([#7624](https://github.com/RocketChat/Rocket.Chat/pull/7624))
 
 - Uploading an unknown file type erroring out ([#7623](https://github.com/RocketChat/Rocket.Chat/pull/7623))
@@ -9034,8 +10013,22 @@
 
 - Prevent new room status from playing when user status changes ([#7487](https://github.com/RocketChat/Rocket.Chat/pull/7487))
 
+- S3 uploads not working for custom URLs ([#7443](https://github.com/RocketChat/Rocket.Chat/pull/7443))
+
+- Fix Private Channel List Submit ([#7432](https://github.com/RocketChat/Rocket.Chat/pull/7432))
+
+- Fix file upload on Slack import ([#7469](https://github.com/RocketChat/Rocket.Chat/pull/7469))
+
+- Fix Unread Bar Disappearing ([#7403](https://github.com/RocketChat/Rocket.Chat/pull/7403))
+
+- Always set LDAP properties on login ([#7472](https://github.com/RocketChat/Rocket.Chat/pull/7472))
+
 - url click events in the cordova app open in external browser or not at all ([#7205](https://github.com/RocketChat/Rocket.Chat/pull/7205) by [@flaviogrossi](https://github.com/flaviogrossi))
 
+- Fix Emails in User Admin View ([#7431](https://github.com/RocketChat/Rocket.Chat/pull/7431))
+
+- Fix migration of avatars from version 0.57.0 ([#7428](https://github.com/RocketChat/Rocket.Chat/pull/7428))
+
 - sweetalert alignment on mobile ([#7404](https://github.com/RocketChat/Rocket.Chat/pull/7404) by [@karlprieb](https://github.com/karlprieb))
 
 - Sweet-Alert modal popup position on mobile devices ([#7376](https://github.com/RocketChat/Rocket.Chat/pull/7376) by [@Oliver84](https://github.com/Oliver84))
@@ -9048,8 +10041,18 @@
 
 - Fix Block Delete Message After (n) Minutes ([#7207](https://github.com/RocketChat/Rocket.Chat/pull/7207))
 
+- Fix jump to unread button ([#7320](https://github.com/RocketChat/Rocket.Chat/pull/7320))
+
+- Fix Secret Url ([#7321](https://github.com/RocketChat/Rocket.Chat/pull/7321))
+
 - Use I18n on "File Uploaded" ([#7199](https://github.com/RocketChat/Rocket.Chat/pull/7199))
 
+- "requirePasswordChange" property not being saved when set to false ([#7209](https://github.com/RocketChat/Rocket.Chat/pull/7209))
+
+- Fix oembed previews not being shown ([#7208](https://github.com/RocketChat/Rocket.Chat/pull/7208))
+
+- Fix editing others messages ([#7200](https://github.com/RocketChat/Rocket.Chat/pull/7200))
+
 - Fix error on image preview due to undefined description|title  ([#7187](https://github.com/RocketChat/Rocket.Chat/pull/7187))
 
 - Fix messagebox growth ([#7629](https://github.com/RocketChat/Rocket.Chat/pull/7629))
@@ -9102,6 +10105,8 @@
 
 - update meteor to 1.5.0 ([#7287](https://github.com/RocketChat/Rocket.Chat/pull/7287))
 
+- Fix the Zapier oAuth return url to the new one ([#7215](https://github.com/RocketChat/Rocket.Chat/pull/7215))
+
 - [New] Add instance id to response headers ([#7211](https://github.com/RocketChat/Rocket.Chat/pull/7211))
 
 - Only use "File Uploaded" prefix on files ([#7652](https://github.com/RocketChat/Rocket.Chat/pull/7652))
@@ -9260,7 +10265,7 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 0.57.0
-`2017-07-03  ·  1 ️️️⚠️  ·  10 🎉  ·  44 🐛  ·  30 🔍  ·  25 👩‍💻👨‍💻`
+`2017-07-03  ·  1 ️️️⚠️  ·  12 🎉  ·  45 🐛  ·  29 🔍  ·  25 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `4.8.2`
@@ -9290,6 +10295,10 @@
 
 - Make channel/group delete call answer to roomName ([#6857](https://github.com/RocketChat/Rocket.Chat/pull/6857) by [@reist](https://github.com/reist))
 
+- Show info about multiple instances at admin page ([#6953](https://github.com/RocketChat/Rocket.Chat/pull/6953))
+
+- Improve CI/Docker build/release ([#6938](https://github.com/RocketChat/Rocket.Chat/pull/6938))
+
 - Feature/delete any message permission ([#6919](https://github.com/RocketChat/Rocket.Chat/pull/6919) by [@phutchins](https://github.com/phutchins))
 
 - Force use of MongoDB for spotlight queries ([#7311](https://github.com/RocketChat/Rocket.Chat/pull/7311))
@@ -9357,6 +10366,8 @@
 
 - Use AWS Signature Version 4 signed URLs for uploads ([#6947](https://github.com/RocketChat/Rocket.Chat/pull/6947))
 
+- make channels.create API check for create-c ([#6968](https://github.com/RocketChat/Rocket.Chat/pull/6968) by [@reist](https://github.com/reist))
+
 - Bugs in `isUserFromParams` helper ([#6904](https://github.com/RocketChat/Rocket.Chat/pull/6904) by [@abrom](https://github.com/abrom))
 
 - Allow image insert from slack through slackbridge ([#6910](https://github.com/RocketChat/Rocket.Chat/pull/6910))
@@ -9435,18 +10446,16 @@
 
 - Convert WebRTC Package to Js ([#6775](https://github.com/RocketChat/Rocket.Chat/pull/6775))
 
+- [Fix] Error when trying to show preview of undefined filetype ([#6935](https://github.com/RocketChat/Rocket.Chat/pull/6935))
+
 - Remove missing CoffeeScript dependencies ([#7154](https://github.com/RocketChat/Rocket.Chat/pull/7154))
 
 - Switch logic of artifact name ([#7158](https://github.com/RocketChat/Rocket.Chat/pull/7158))
 
 - Fix the Zapier oAuth return url to the new one ([#7215](https://github.com/RocketChat/Rocket.Chat/pull/7215))
 
-- Fix the admin oauthApps view not working ([#7196](https://github.com/RocketChat/Rocket.Chat/pull/7196))
-
 - Fix forbidden error on setAvatar REST endpoint ([#7159](https://github.com/RocketChat/Rocket.Chat/pull/7159))
 
-- Fix the admin oauthApps view not working ([#7196](https://github.com/RocketChat/Rocket.Chat/pull/7196))
-
 - Fix mobile avatars ([#7177](https://github.com/RocketChat/Rocket.Chat/pull/7177))
 
 </details>
@@ -9483,7 +10492,7 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 
 # 0.56.0
-`2017-05-15  ·  11 🎉  ·  19 🐛  ·  19 🔍  ·  19 👩‍💻👨‍💻`
+`2017-05-15  ·  11 🎉  ·  21 🐛  ·  19 🔍  ·  19 👩‍💻👨‍💻`
 
 ### Engine versions
 - Node: `4.8.2`
@@ -9545,6 +10554,10 @@
 
 - Fix Caddy by forcing go 1.7 as needed by one of caddy's dependencies ([#6721](https://github.com/RocketChat/Rocket.Chat/pull/6721))
 
+- emoji picker exception ([#6709](https://github.com/RocketChat/Rocket.Chat/pull/6709) by [@gdelavald](https://github.com/gdelavald))
+
+- Fix message types ([#6704](https://github.com/RocketChat/Rocket.Chat/pull/6704))
+
 - Users status on main menu always offline ([#6896](https://github.com/RocketChat/Rocket.Chat/pull/6896))
 
 - Not showing unread count on electron app’s icon ([#6923](https://github.com/RocketChat/Rocket.Chat/pull/6923))
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index b91fdaf87e64..fed25a57f1f5 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.0.9"
+	"version": "3.0.10"
 }
diff --git a/package.json b/package.json
index 02d510d54f46..4fa88b77424a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.0.9",
+	"version": "3.0.10",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

From e7c69ad73ad63259cd115c3a1c70dd23b5944731 Mon Sep 17 00:00:00 2001
From: gabriellsh <40830821+gabriellsh@users.noreply.github.com>
Date: Wed, 1 Apr 2020 14:17:53 -0300
Subject: [PATCH 142/223] Regression: IE11 Support (#17125)

---
 app/apps/client/RealAppsEngineUIHost.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/apps/client/RealAppsEngineUIHost.js b/app/apps/client/RealAppsEngineUIHost.js
index 5d5274b7afb5..e21a458baff1 100644
--- a/app/apps/client/RealAppsEngineUIHost.js
+++ b/app/apps/client/RealAppsEngineUIHost.js
@@ -4,13 +4,14 @@ import { AppsEngineUIHost } from '@rocket.chat/apps-engine/client/AppsEngineUIHo
 
 import { Rooms } from '../../models/client';
 import { APIClient } from '../../utils/client';
+import { baseURI } from '../../utils/client/lib/baseuri';
 import { getUserAvatarURL } from '../../utils/lib/getUserAvatarURL';
 
 export class RealAppsEngineUIHost extends AppsEngineUIHost {
 	constructor() {
 		super();
 
-		this._baseURL = document.baseURI.slice(0, -1);
+		this._baseURL = baseURI;
 	}
 
 	getUserAvatarUrl(username) {

From 9a7e4bc9c88cc358c563e5b4bf0df6e1c3254225 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Wed, 1 Apr 2020 15:28:01 -0300
Subject: [PATCH 143/223] Regression: Fix engagement dashboard urls, fixing
 Flowrouter imports (#17127)

---
 app/ui-sidenav/client/sidebarHeader.js |  2 +-
 client/createTemplateForComponent.js   | 66 ++++++++++++++++++++++++++
 client/routes.js                       | 65 +------------------------
 3 files changed, 69 insertions(+), 64 deletions(-)
 create mode 100644 client/createTemplateForComponent.js

diff --git a/app/ui-sidenav/client/sidebarHeader.js b/app/ui-sidenav/client/sidebarHeader.js
index 172abe5ef480..306872c0a456 100644
--- a/app/ui-sidenav/client/sidebarHeader.js
+++ b/app/ui-sidenav/client/sidebarHeader.js
@@ -10,7 +10,7 @@ import { settings } from '../../settings';
 import { hasAtLeastOnePermission } from '../../authorization';
 import { userStatus } from '../../user-status';
 import { hasPermission } from '../../authorization/client';
-import { createTemplateForComponent } from '../../../client/routes';
+import { createTemplateForComponent } from '../../../client/createTemplateForComponent';
 
 
 const setStatus = (status, statusText) => {
diff --git a/client/createTemplateForComponent.js b/client/createTemplateForComponent.js
new file mode 100644
index 000000000000..423964471174
--- /dev/null
+++ b/client/createTemplateForComponent.js
@@ -0,0 +1,66 @@
+import { Blaze } from 'meteor/blaze';
+import { HTML } from 'meteor/htmljs';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { ReactiveVar } from 'meteor/reactive-var';
+import { Template } from 'meteor/templating';
+
+
+export const createTemplateForComponent = async (
+	component,
+	props = {},
+	// eslint-disable-next-line new-cap
+	renderContainerView = () => HTML.DIV(),
+	url,
+
+) => {
+	const name = component.displayName || component.name;
+
+	if (!name) {
+		throw new Error('the component must have a name');
+	}
+
+	if (Template[name]) {
+		Template[name].props.set(props);
+		return name;
+	}
+
+	Template[name] = new Blaze.Template(name, renderContainerView);
+
+	Template[name].props = new ReactiveVar(props);
+
+	const React = await import('react');
+	const ReactDOM = await import('react-dom');
+	const { MeteorProvider } = await import('./providers/MeteorProvider');
+
+	function TemplateComponent() {
+		return React.createElement(component, Template[name].props.get());
+	}
+
+	Template[name].onRendered(() => {
+		Template.instance().autorun((computation) => {
+			if (computation.firstRun) {
+				Template.instance().container = Template.instance().firstNode;
+			}
+
+			ReactDOM.render(
+				React.createElement(MeteorProvider, {
+					children: React.createElement(TemplateComponent),
+				}), Template.instance().firstNode);
+		});
+
+		url && Template.instance().autorun(() => {
+			const routeName = FlowRouter.getRouteName();
+			if (routeName !== url) {
+				ReactDOM.unmountComponentAtNode(Template.instance().container);
+			}
+		});
+	});
+
+	Template[name].onDestroyed(() => {
+		if (Template.instance().container) {
+			ReactDOM.unmountComponentAtNode(Template.instance().container);
+		}
+	});
+
+	return name;
+};
diff --git a/client/routes.js b/client/routes.js
index b14945c4ac8b..08cd28a47ecf 100644
--- a/client/routes.js
+++ b/client/routes.js
@@ -3,18 +3,16 @@ import s from 'underscore.string';
 import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
 import { Tracker } from 'meteor/tracker';
-import { Blaze } from 'meteor/blaze';
 import { HTML } from 'meteor/htmljs';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
-import { ReactiveVar } from 'meteor/reactive-var';
 import { Session } from 'meteor/session';
-import { Template } from 'meteor/templating';
 
 import { KonchatNotification } from '../app/ui';
 import { ChatSubscription } from '../app/models';
 import { roomTypes } from '../app/utils';
 import { call } from '../app/ui-utils';
+import { createTemplateForComponent } from './createTemplateForComponent';
 
 const getRoomById = mem((rid) => call('getRoomById', rid));
 
@@ -34,66 +32,6 @@ FlowRouter.goToRoomById = async (rid) => {
 
 BlazeLayout.setRoot('body');
 
-export const createTemplateForComponent = async (
-	component,
-	props = {},
-	// eslint-disable-next-line new-cap
-	renderContainerView = () => HTML.DIV(),
-	url,
-
-) => {
-	const name = component.displayName || component.name;
-
-	if (!name) {
-		throw new Error('the component must have a name');
-	}
-
-	if (Template[name]) {
-		Template[name].props.set(props);
-		return name;
-	}
-
-	Template[name] = new Blaze.Template(name, renderContainerView);
-
-	Template[name].props = new ReactiveVar(props);
-
-	const React = await import('react');
-	const ReactDOM = await import('react-dom');
-	const { MeteorProvider } = await import('./providers/MeteorProvider');
-
-	function TemplateComponent() {
-		return React.createElement(component, Template[name].props.get());
-	}
-
-	Template[name].onRendered(() => {
-		Template.instance().autorun((computation) => {
-			if (computation.firstRun) {
-				Template.instance().container = Template.instance().firstNode;
-			}
-
-			ReactDOM.render(
-				React.createElement(MeteorProvider, {
-					children: React.createElement(TemplateComponent),
-				}), Template.instance().firstNode);
-		});
-
-		url && Template.instance().autorun(() => {
-			const routeName = FlowRouter.getRouteName();
-			if (routeName !== url) {
-				ReactDOM.unmountComponentAtNode(Template.instance().container);
-			}
-		});
-	});
-
-	Template[name].onDestroyed(() => {
-		if (Template.instance().container) {
-			ReactDOM.unmountComponentAtNode(Template.instance().container);
-		}
-	});
-
-	return name;
-};
-
 FlowRouter.route('/', {
 	name: 'index',
 	action() {
@@ -246,6 +184,7 @@ FlowRouter.route('/setup-wizard/:step?', {
 });
 
 const style = 'overflow: hidden; flex: 1 1 auto; height: 1%;';
+
 FlowRouter.route('/admin/:group?', {
 	name: 'admin',
 	action: async ({ group = 'info' } = {}) => {

From 8f2026a542c7ef9e797e6c9198ddba936b7efae3 Mon Sep 17 00:00:00 2001
From: Djorkaeff Alexandre <djorkaeff.unb@gmail.com>
Date: Wed, 1 Apr 2020 16:26:12 -0300
Subject: [PATCH 144/223] Regression: Can't login with 2FA over REST API when
 2FA via Email is enabled (#17128)

---
 app/api/server/api.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/api/server/api.js b/app/api/server/api.js
index 8c731e7bfcce..eab220650d6b 100644
--- a/app/api/server/api.js
+++ b/app/api/server/api.js
@@ -481,6 +481,7 @@ export class APIClass extends Restivus {
 						body: {
 							status: 'error',
 							error: e.error,
+							details: e.details,
 							message: e.reason || e.message,
 						},
 					};

From 67deacb3976d23a4c8f44fdf3cb1afa386d6397b Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Wed, 1 Apr 2020 23:12:22 -0300
Subject: [PATCH 145/223] Regression: Direct message creation by REST (#17109)

Co-authored-by: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
---
 app/api/server/v1/im.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/api/server/v1/im.js b/app/api/server/v1/im.js
index 68bcc4db3ec3..f61426949b08 100644
--- a/app/api/server/v1/im.js
+++ b/app/api/server/v1/im.js
@@ -32,10 +32,18 @@ function findDirectMessageRoom(params, user) {
 
 API.v1.addRoute(['dm.create', 'im.create'], { authRequired: true }, {
 	post() {
-		const findResult = findDirectMessageRoom(this.requestParams(), this.user);
+		const { username, usernames } = this.requestParams();
+
+		const users = username ? [username] : usernames && usernames.split(',').map((username) => username.trim());
+
+		if (!users) {
+			throw new Meteor.Error('error-room-not-found', 'The required "username" or "usernames" param provided does not match any direct message');
+		}
+
+		const room = Meteor.call('createDirectMessage', ...users);
 
 		return API.v1.success({
-			room: findResult.room,
+			room: { ...room, _id: room.rid },
 		});
 	},
 });

From f960d335ba6f7f742482be6e71273d65e79410ea Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Thu, 2 Apr 2020 00:19:45 -0300
Subject: [PATCH 146/223] Bump version to 3.1.0-rc.7

---
 .docker/Dockerfile.rhel   |   2 +-
 .github/history.json      | 241 ++++++++++++++++++++++++++++++++++++++
 HISTORY.md                | 110 +++++++++++++++++
 app/utils/rocketchat.info |   2 +-
 package.json              |   2 +-
 5 files changed, 354 insertions(+), 3 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index cf38e2d5fe94..09e4f8463966 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.1.0-rc.6
+ENV RC_VERSION 3.1.0-rc.7
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index 669163f1f675..4cdce5336526 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -41719,6 +41719,247 @@
           ]
         }
       ]
+    },
+    "3.0.10": {
+      "node_version": "12.14.0",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "17126",
+          "title": "Release 3.0.10",
+          "userLogin": "sampaiodiego",
+          "contributors": [
+            "1rV1N-git",
+            "sampaiodiego",
+            "rodrigok",
+            "d-gubert"
+          ]
+        },
+        {
+          "pr": "17114",
+          "title": "New Troubleshoot section for disabling features",
+          "userLogin": "rodrigok",
+          "milestone": "3.0.10",
+          "contributors": [
+            "rodrigok",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "17115",
+          "title": "[IMPROVE] Apps Engine: Reduce some stream calls and remove a find user from the app's status changes",
+          "userLogin": "d-gubert",
+          "milestone": "3.0.10",
+          "contributors": [
+            "d-gubert",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "17060",
+          "title": "Regression: Do not refresh statistics when opening the info panel",
+          "userLogin": "rodrigok",
+          "milestone": "3.0.10",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "17075",
+          "title": "Add User’s index for field `appId`",
+          "userLogin": "rodrigok",
+          "milestone": "3.0.10",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "16878",
+          "title": "[FIX] Federation Event ROOM_ADD_USER not being dispatched",
+          "userLogin": "1rV1N-git",
+          "milestone": "3.0.10",
+          "contributors": [
+            "1rV1N-git",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16861",
+          "title": "[FIX] Federation delete room event not being dispatched",
+          "userLogin": "1rV1N-git",
+          "milestone": "3.0.10",
+          "contributors": [
+            "1rV1N-git",
+            "web-flow"
+          ]
+        }
+      ]
+    },
+    "3.1.0-rc.7": {
+      "node_version": "12.16.1",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "17109",
+          "title": "Regression: Direct message creation by REST",
+          "userLogin": "ggazzo",
+          "contributors": [
+            "ggazzo",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "17128",
+          "title": "Regression: Can't login with 2FA over REST API when 2FA via Email is enabled",
+          "userLogin": "djorkaeffalexandre",
+          "milestone": "3.1.0",
+          "contributors": [
+            "djorkaeffalexandre"
+          ]
+        },
+        {
+          "pr": "17127",
+          "title": "Regression: Fix engagement dashboard urls, fixing Flowrouter imports",
+          "userLogin": "ggazzo",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "17125",
+          "title": "Regression: IE11 Support",
+          "userLogin": "gabriellsh",
+          "contributors": [
+            "gabriellsh",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16861",
+          "title": "[FIX] Federation delete room event not being dispatched",
+          "userLogin": "1rV1N-git",
+          "milestone": "3.0.10",
+          "contributors": [
+            "1rV1N-git",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "16878",
+          "title": "[FIX] Federation Event ROOM_ADD_USER not being dispatched",
+          "userLogin": "1rV1N-git",
+          "milestone": "3.0.10",
+          "contributors": [
+            "1rV1N-git",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "17114",
+          "title": "New Troubleshoot section for disabling features",
+          "userLogin": "rodrigok",
+          "milestone": "3.0.10",
+          "contributors": [
+            "rodrigok",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "17118",
+          "title": "Regression: Wrong size of Directory search/sort icons and Sort Channels menu not showing on production build",
+          "userLogin": "ggazzo",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "17070",
+          "title": "[FIX] Discussions were not inheriting the public status of parent's channel",
+          "userLogin": "rodrigok",
+          "milestone": "3.1.0",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "17116",
+          "title": "Regression: fix fuselage import, remove directory css",
+          "userLogin": "ggazzo",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "17115",
+          "title": "[IMPROVE] Apps Engine: Reduce some stream calls and remove a find user from the app's status changes",
+          "userLogin": "d-gubert",
+          "milestone": "3.0.10",
+          "contributors": [
+            "d-gubert",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "17113",
+          "title": "Regression: Remove old and closed Omnichannel inquiries",
+          "userLogin": "renatobecker",
+          "milestone": "3.1.0",
+          "contributors": [
+            "renatobecker",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "17110",
+          "title": "[FIX] Member's list only filtering users already on screen",
+          "userLogin": "ggazzo",
+          "milestone": "3.1.0",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "17081",
+          "title": "Single codebase announcement",
+          "userLogin": "Sing-Li",
+          "milestone": "3.1.0",
+          "contributors": [
+            "Sing-Li",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "17043",
+          "title": "[NEW] Directory page refactored, new user's bio field",
+          "userLogin": "ggazzo",
+          "contributors": [
+            "ggazzo",
+            "web-flow",
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "17103",
+          "title": "[NEW] Merge Sort List and View Mode menus and improve its UI/UX",
+          "userLogin": "ggazzo",
+          "description": "![image](https://user-images.githubusercontent.com/5263975/78036622-e8db2a80-7340-11ea-91d0-65728eabdcb6.png)",
+          "contributors": [
+            "ggazzo",
+            "web-flow",
+            "tassoevan"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/HISTORY.md b/HISTORY.md
index 0b94b78ef297..a539bdcbabb3 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,6 +1,72 @@
 
 # 3.1.0 (Under Release Candidate Process)
 
+## 3.1.0-rc.7
+`2020-04-02  ·  2 🎉  ·  1 🚀  ·  4 🐛  ·  9 🔍  ·  9 👩‍💻👨‍💻`
+
+### 🎉 New features
+
+
+- Directory page refactored, new user's bio field ([#17043](https://github.com/RocketChat/Rocket.Chat/pull/17043))
+
+- Merge Sort List and View Mode menus and improve its UI/UX ([#17103](https://github.com/RocketChat/Rocket.Chat/pull/17103))
+  ![image](https://user-images.githubusercontent.com/5263975/78036622-e8db2a80-7340-11ea-91d0-65728eabdcb6.png)
+
+### 🚀 Improvements
+
+
+- Apps Engine: Reduce some stream calls and remove a find user from the app's status changes ([#17115](https://github.com/RocketChat/Rocket.Chat/pull/17115))
+
+### 🐛 Bug fixes
+
+
+- Federation delete room event not being dispatched ([#16861](https://github.com/RocketChat/Rocket.Chat/pull/16861) by [@1rV1N-git](https://github.com/1rV1N-git))
+
+- Federation Event ROOM_ADD_USER not being dispatched ([#16878](https://github.com/RocketChat/Rocket.Chat/pull/16878) by [@1rV1N-git](https://github.com/1rV1N-git))
+
+- Discussions were not inheriting the public status of parent's channel ([#17070](https://github.com/RocketChat/Rocket.Chat/pull/17070))
+
+- Member's list only filtering users already on screen ([#17110](https://github.com/RocketChat/Rocket.Chat/pull/17110))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Regression: Direct message creation by REST ([#17109](https://github.com/RocketChat/Rocket.Chat/pull/17109))
+
+- Regression: Can't login with 2FA over REST API when 2FA via Email is enabled ([#17128](https://github.com/RocketChat/Rocket.Chat/pull/17128))
+
+- Regression: Fix engagement dashboard urls, fixing Flowrouter imports ([#17127](https://github.com/RocketChat/Rocket.Chat/pull/17127))
+
+- Regression: IE11 Support ([#17125](https://github.com/RocketChat/Rocket.Chat/pull/17125))
+
+- New Troubleshoot section for disabling features ([#17114](https://github.com/RocketChat/Rocket.Chat/pull/17114))
+
+- Regression: Wrong size of Directory search/sort icons and Sort Channels menu not showing on production build ([#17118](https://github.com/RocketChat/Rocket.Chat/pull/17118))
+
+- Regression: fix fuselage import, remove directory css ([#17116](https://github.com/RocketChat/Rocket.Chat/pull/17116))
+
+- Regression: Remove old and closed Omnichannel inquiries ([#17113](https://github.com/RocketChat/Rocket.Chat/pull/17113))
+
+- Single codebase announcement ([#17081](https://github.com/RocketChat/Rocket.Chat/pull/17081))
+
+</details>
+
+### 👩‍💻👨‍💻 Contributors 😍
+
+- [@1rV1N-git](https://github.com/1rV1N-git)
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@Sing-Li](https://github.com/Sing-Li)
+- [@d-gubert](https://github.com/d-gubert)
+- [@djorkaeffalexandre](https://github.com/djorkaeffalexandre)
+- [@gabriellsh](https://github.com/gabriellsh)
+- [@ggazzo](https://github.com/ggazzo)
+- [@renatobecker](https://github.com/renatobecker)
+- [@rodrigok](https://github.com/rodrigok)
+- [@tassoevan](https://github.com/tassoevan)
+
 ## 3.1.0-rc.6
 `2020-03-31  ·  3 🔍  ·  3 👩‍💻👨‍💻`
 
@@ -487,6 +553,50 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 - [@tassoevan](https://github.com/tassoevan)
 
+# 3.0.10
+`2020-04-01  ·  1 🚀  ·  2 🐛  ·  4 🔍  ·  4 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `12.14.0`
+- NPM: `6.13.4`
+- MongoDB: `3.4, 3.6, 4.0`
+
+### 🚀 Improvements
+
+
+- Apps Engine: Reduce some stream calls and remove a find user from the app's status changes ([#17115](https://github.com/RocketChat/Rocket.Chat/pull/17115))
+
+### 🐛 Bug fixes
+
+
+- Federation Event ROOM_ADD_USER not being dispatched ([#16878](https://github.com/RocketChat/Rocket.Chat/pull/16878) by [@1rV1N-git](https://github.com/1rV1N-git))
+
+- Federation delete room event not being dispatched ([#16861](https://github.com/RocketChat/Rocket.Chat/pull/16861) by [@1rV1N-git](https://github.com/1rV1N-git))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Release 3.0.10 ([#17126](https://github.com/RocketChat/Rocket.Chat/pull/17126) by [@1rV1N-git](https://github.com/1rV1N-git))
+
+- New Troubleshoot section for disabling features ([#17114](https://github.com/RocketChat/Rocket.Chat/pull/17114))
+
+- Regression: Do not refresh statistics when opening the info panel ([#17060](https://github.com/RocketChat/Rocket.Chat/pull/17060))
+
+- Add User’s index for field `appId` ([#17075](https://github.com/RocketChat/Rocket.Chat/pull/17075))
+
+</details>
+
+### 👩‍💻👨‍💻 Contributors 😍
+
+- [@1rV1N-git](https://github.com/1rV1N-git)
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@d-gubert](https://github.com/d-gubert)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 3.0.9
 `2020-03-31  ·  1 🐛  ·  1 🔍  ·  1 👩‍💻👨‍💻`
 
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index d857506287d8..f785e4858f58 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.1.0-rc.6"
+	"version": "3.1.0-rc.7"
 }
diff --git a/package.json b/package.json
index 3aaccd44f224..5429b2a062d5 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.1.0-rc.6",
+	"version": "3.1.0-rc.7",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

From ba553a700614fc092b083378b2c96612644b26f4 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Thu, 2 Apr 2020 02:57:23 -0300
Subject: [PATCH 147/223] Fix design review (#17133)

---
 app/api/server/lib/rooms.js                   |  1 +
 app/ui-admin/client/rooms/adminRooms.html     |  6 ++-
 .../app/components/Directory/ChannelsTab.js   | 37 +++++++++----------
 .../components/Directory/DirectoryTable.js    | 29 ++++++++-------
 .../views/app/components/Directory/UserTab.js | 23 ++++--------
 server/methods/browseChannels.js              | 10 ++---
 6 files changed, 49 insertions(+), 57 deletions(-)

diff --git a/app/api/server/lib/rooms.js b/app/api/server/lib/rooms.js
index a0c371d1f59d..52c67f0dcdc6 100644
--- a/app/api/server/lib/rooms.js
+++ b/app/api/server/lib/rooms.js
@@ -18,6 +18,7 @@ export async function findAdminRooms({ uid, filter, types = [], pagination: { of
 		unmuted: 1,
 		ro: 1,
 		default: 1,
+		featured: 1,
 		topic: 1,
 		msgs: 1,
 		archived: 1,
diff --git a/app/ui-admin/client/rooms/adminRooms.html b/app/ui-admin/client/rooms/adminRooms.html
index c662086fb535..9dc9595917d9 100644
--- a/app/ui-admin/client/rooms/adminRooms.html
+++ b/app/ui-admin/client/rooms/adminRooms.html
@@ -34,7 +34,8 @@
 								<th width="20%"><div class="table-fake-th">{{_ "Type"}}</div></th>
 								<th width="20%"><div class="table-fake-th">{{_ "Users"}}</div></th>
 								<th width="10%"><div class="table-fake-th">{{_ "Msgs"}}</div></th>
-								<th width="20%"><div class="table-fake-th">{{_ "Default"}}</div></th>
+								<th width="10%"><div class="table-fake-th">{{_ "Default"}}</div></th>
+								<th width="10%"><div class="table-fake-th">{{_ "Featured"}}</div></th>
 							</tr>
 						</thead>
 						<tbody>
@@ -51,7 +52,8 @@
 									<td width="20%"><div class="rc-table-wrapper">{{type}}</div></td>
 									<td width="20%"><div class="rc-table-wrapper">{{usersCount}}</div></td>
 									<td width="10%"><div class="rc-table-wrapper">{{msgs}}</div></td>
-									<td width="20%"><div class="rc-table-wrapper">{{default}}</div></td>
+									<td width="10%"><div class="rc-table-wrapper">{{default}}</div></td>
+									<td width="10%"><div class="rc-table-wrapper">{{#if featured}}True{{else}}False{{/if}}</div></td>
 								</tr>
 							 {{else}} {{# with searchText}}
 							<tr class="table-no-click">
diff --git a/app/ui/client/views/app/components/Directory/ChannelsTab.js b/app/ui/client/views/app/components/Directory/ChannelsTab.js
index 71c0d193bfc4..b516006eabfb 100644
--- a/app/ui/client/views/app/components/Directory/ChannelsTab.js
+++ b/app/ui/client/views/app/components/Directory/ChannelsTab.js
@@ -1,21 +1,24 @@
 import React, { useMemo, useState, useCallback } from 'react';
-import { Box, Margins, Table, Flex, Avatar, Tag } from '@rocket.chat/fuselage';
+import { Box, Margins, Table, Avatar, Tag, Icon } from '@rocket.chat/fuselage';
 import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
 
 import { useEndpointData } from '../../../../../../../ee/app/engagement-dashboard/client/hooks/useEndpointData';
-import { DirectoryTable, Th } from './DirectoryTable';
+import { DirectoryTable, Th, Markdown } from './DirectoryTable';
 import { useTranslation } from '../../../../../../../client/contexts/TranslationContext';
 import { useRoute } from '../../../../../../../client/contexts/RouterContext';
 import { useQuery, useFormatDate } from '../hooks';
+import { roomTypes } from '../../../../../../utils/client';
 
 const style = { whiteSpace: 'nowrap', textOverflow: 'ellipsis', overflow: 'hidden' };
 
 function RoomTags({ room }) {
 	const t = useTranslation();
-	return <Margins inline='x2'>
-		{room.default && <Tag variant='primary'>{t('default')}</Tag>}
-		{room.featured && <Tag variant='primary'>{t('featured')}</Tag>}
-	</Margins>;
+	return <Box mi='x4' alignItems='center' display='flex'>
+		<Margins inline='x2'>
+			{room.default && <Tag variant='primary'>{t('default')}</Tag>}
+			{room.featured && <Tag variant='primary'>{t('featured')}</Tag>}
+		</Margins>
+	</Box>;
 }
 
 export function ChannelsTab() {
@@ -57,21 +60,15 @@ export function ChannelsTab() {
 	const formatDate = useFormatDate();
 	const renderRow = useCallback(({ _id, ts, name, fname, description, usersCount, lastMessage, topic, ...room }) => <Table.Row key={_id} onKeyDown={onClick(name)} onClick={onClick(name)} tabIndex={0} role='link' action>
 		<Table.Cell>
-			<Flex.Container>
-				<Box>
-					<Flex.Item>
-						<Avatar size='x40' title={fname || name} url={`%40${ fname || name }`} />
-					</Flex.Item>
-					<Margins inline='x8'>
-						<Flex.Item grow={1}>
-							<Box>
-								<Box textStyle='p2'>{fname || name} <RoomTags room={room} style={style} /></Box>
-								{topic && <Box textStyle='p1' textColor='hint' style={style}>{topic}</Box> }
-							</Box>
-						</Flex.Item>
-					</Margins>
+			<Box display='flex'>
+				<Avatar size='x40' title={fname || name} url={`%40${ fname || name }`} flexGrow={0} />
+				<Box grow={1} mi='x8' style={style}>
+					<Box display='flex' alignItems='center'>
+						<Icon name={roomTypes.getIcon(room)} textColor='hint' /> <Box textStyle='p2' textColor='default' mi='x4'>{fname || name}</Box><RoomTags room={room} style={style} />
+					</Box>
+					{topic && <Markdown textStyle='p1' textColor='hint' style={style}>{topic}</Markdown> }
 				</Box>
-			</Flex.Container>
+			</Box>
 		</Table.Cell>
 		<Table.Cell textStyle='p1' textColor='hint' style={style}>
 			{usersCount}
diff --git a/app/ui/client/views/app/components/Directory/DirectoryTable.js b/app/ui/client/views/app/components/Directory/DirectoryTable.js
index 4d009fa69279..44ea34de3350 100644
--- a/app/ui/client/views/app/components/Directory/DirectoryTable.js
+++ b/app/ui/client/views/app/components/Directory/DirectoryTable.js
@@ -1,8 +1,9 @@
 import React, { useMemo, useState, useEffect, useCallback } from 'react';
-import { Box, Icon, Margins, Pagination, Skeleton, Table, Flex, TextInput, Tile } from '@rocket.chat/fuselage';
+import { Box, Icon, Pagination, Skeleton, Table, Flex, TextInput, Tile } from '@rocket.chat/fuselage';
 
 import { useTranslation } from '../../../../../../../client/contexts/TranslationContext';
 import { useDebounce } from '../hooks';
+import { Markdown as mrkd } from '../../../../../../markdown/client';
 
 function SortIcon({ direction }) {
 	return <Box is='svg' width='x16' height='x16' viewBox='0 0 16 16' fill='none' xmlns='http://www.w3.org/2000/svg'>
@@ -14,12 +15,16 @@ function SortIcon({ direction }) {
 export function Th({ children, active, direction, sort, onClick, align, ...props }) {
 	const fn = useMemo(() => () => onClick && onClick(sort), [sort, onClick]);
 	return <Table.Cell clickable={!!sort} onClick={fn} { ...props }>
-		<Flex.Container alignItems='center' wrap='no-wrap'>
-			<Box>{children}{sort && <SortIcon mod-active={active} direction={active && direction} />}</Box>
-		</Flex.Container>
+		<Box display='flex' alignItems='center' wrap='no-wrap'>{children}{sort && <SortIcon mod-active={active} direction={active && direction} />}</Box>
 	</Table.Cell>;
 }
 
+export function Markdown({ children, ...props }) {
+	return React.Children.map(children, function(text, index) {
+		return <Box { ...props } key={index} dangerouslySetInnerHTML={{ __html: mrkd.parse(text) }}/>;
+	});
+}
+
 const LoadingRow = ({ cols }) => <Table.Row>
 	<Table.Cell>
 		<Flex.Container>
@@ -27,14 +32,10 @@ const LoadingRow = ({ cols }) => <Table.Row>
 				<Flex.Item>
 					<Skeleton variant='rect' height={40} width={40} />
 				</Flex.Item>
-				<Margins inline='x8'>
-					<Flex.Item grow={1}>
-						<Box>
-							<Skeleton width='100%' />
-							<Skeleton width='100%' />
-						</Box>
-					</Flex.Item>
-				</Margins>
+				<Box mi='x8' grow={1}>
+					<Skeleton width='100%' />
+					<Skeleton width='100%' />
+				</Box>
 			</Box>
 		</Flex.Container>
 	</Table.Cell>
@@ -78,9 +79,9 @@ export function DirectoryTable({
 	return <>
 		<Flex.Container direction='column'>
 			<Box>
-				<Margins block='x16'>
+				<Box mb='x16' display='flex'>
 					<TextInput placeholder={searchPlaceholder} addon={<Icon name='magnifier' size='x20'/>} onChange={handleChange} value={text} />
-				</Margins>
+				</Box>
 				{channels && !channels.length
 					? <Tile textStyle='p1' elevation='0' textColor='info' style={{ textAlign: 'center' }}>
 						{t('No_data_found')}
diff --git a/app/ui/client/views/app/components/Directory/UserTab.js b/app/ui/client/views/app/components/Directory/UserTab.js
index 23924d11f558..eda4c92ca7a7 100644
--- a/app/ui/client/views/app/components/Directory/UserTab.js
+++ b/app/ui/client/views/app/components/Directory/UserTab.js
@@ -1,5 +1,5 @@
 import React, { useMemo, useState, useCallback } from 'react';
-import { Box, Margins, Table, Flex, Avatar } from '@rocket.chat/fuselage';
+import { Box, Table, Flex, Avatar } from '@rocket.chat/fuselage';
 import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
 
 import { useEndpointData } from '../../../../../../../ee/app/engagement-dashboard/client/hooks/useEndpointData';
@@ -34,11 +34,9 @@ export function UserTab({
 		}
 		setSort([id, 'asc']);
 	};
-	const bioStyle = useMemo(() => ({ ...style, width: '200px' }), [mediaQuery]);
 
 	const header = useMemo(() => [
 		<Th key={'name'} direction={sort[1]} active={sort[0] === 'name'} onClick={onHeaderClick} sort='name'>{t('Name')}</Th>,
-		<Th key={'bio'} direction={sort[1]} active={sort[0] === 'bio'} onClick={onHeaderClick} sort='bio' style={bioStyle}>{t('Bio')}</Th>,
 		mediaQuery && canViewFullOtherUserInfo && <Th key={'email'} direction={sort[1]} active={sort[0] === 'email'} onClick={onHeaderClick} sort='email' style={{ width: '200px' }} >{t('Email')}</Th>,
 		federation && <Th key={'origin'} direction={sort[1]} active={sort[0] === 'origin'} onClick={onHeaderClick} sort='origin' style={{ width: '200px' }} >{t('Domain')}</Th>,
 		mediaQuery && <Th key={'createdAt'} direction={sort[1]} active={sort[0] === 'createdAt'} onClick={onHeaderClick} sort='createdAt' style={{ width: '200px' }}>{t('Joined_at')}</Th>,
@@ -64,22 +62,15 @@ export function UserTab({
 					<Flex.Item>
 						<Avatar size='x40' title={username} url={username} />
 					</Flex.Item>
-					<Margins inline='x8'>
-						<Flex.Item grow={1}>
-							<Box style={style}>
-								<Box textStyle='p2' style={style}>{name || username}</Box>
-								<Box textStyle='p1' textColor='hint' style={style}>{name && username}</Box>
-							</Box>
-						</Flex.Item>
-					</Margins>
+					<Box style={style} grow={1} mi='x8'>
+						<Box display='flex'>
+							<Box textStyle='p2' style={style} textColor='default'>{name || username}</Box> <Box mi='x4'/> <Box textStyle='p1' textColor='hint' style={style}>{username}</Box>
+						</Box>
+						<Box textStyle='p1' textColor='hint' style={style}> {bio} </Box>
+					</Box>
 				</Box>
 			</Flex.Container>
 		</Table.Cell>
-		<Table.Cell textStyle='p1' textColor='hint' style={ bioStyle }>
-			<Box is='div' style={ style }>
-				{bio}
-			</Box>
-		</Table.Cell>
 		{mediaQuery && canViewFullOtherUserInfo
 			&& <Table.Cell style={style} >
 				{emails && emails[0].address}
diff --git a/server/methods/browseChannels.js b/server/methods/browseChannels.js
index e1433d25d780..762b4662fe5e 100644
--- a/server/methods/browseChannels.js
+++ b/server/methods/browseChannels.js
@@ -85,6 +85,7 @@ Meteor.methods({
 					...sort,
 				},
 				fields: {
+					t: 1,
 					description: 1,
 					topic: 1,
 					name: 1,
@@ -95,6 +96,7 @@ Meteor.methods({
 					default: 1,
 					featured: 1,
 					usersCount: 1,
+					prid: 1,
 				},
 			});
 
@@ -114,8 +116,6 @@ Meteor.methods({
 			return;
 		}
 
-		const exceptions = [user.username];
-
 		const forcedSearchFields = workspace === 'all' && ['username', 'name', 'emails.address'];
 
 		const options = {
@@ -133,11 +133,11 @@ Meteor.methods({
 
 		let result;
 		if (workspace === 'all') {
-			result = Users.findByActiveUsersExcept(text, exceptions, options, forcedSearchFields);
+			result = Users.findByActiveUsersExcept(text, [], options, forcedSearchFields);
 		} else if (workspace === 'external') {
-			result = Users.findByActiveExternalUsersExcept(text, exceptions, options, forcedSearchFields, getFederationDomain());
+			result = Users.findByActiveExternalUsersExcept(text, [], options, forcedSearchFields, getFederationDomain());
 		} else {
-			result = Users.findByActiveLocalUsersExcept(text, exceptions, options, forcedSearchFields, getFederationDomain());
+			result = Users.findByActiveLocalUsersExcept(text, [], options, forcedSearchFields, getFederationDomain());
 		}
 
 		const total = result.count(); // count ignores the `skip` and `limit` options

From e4533208ec72e4c4f9cc8a25554280e077ec83c9 Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Thu, 2 Apr 2020 11:23:58 -0300
Subject: [PATCH 148/223] [FIX] Omnichannel endpoint `inquiries.getOne`
 returning only queued inquiries (#17132)

---
 app/livechat/server/api/lib/inquiries.js | 2 +-
 app/models/server/raw/LivechatInquiry.js | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/livechat/server/api/lib/inquiries.js b/app/livechat/server/api/lib/inquiries.js
index a9c683b167a9..eefba5f313e8 100644
--- a/app/livechat/server/api/lib/inquiries.js
+++ b/app/livechat/server/api/lib/inquiries.js
@@ -64,6 +64,6 @@ export async function findOneInquiryByRoomId({ userId, roomId }) {
 	}
 
 	return {
-		inquiry: await LivechatInquiry.findOneQueuedByRoomId(roomId),
+		inquiry: await LivechatInquiry.findOneByRoomId(roomId),
 	};
 }
diff --git a/app/models/server/raw/LivechatInquiry.js b/app/models/server/raw/LivechatInquiry.js
index 253fa6003406..f1507953435e 100644
--- a/app/models/server/raw/LivechatInquiry.js
+++ b/app/models/server/raw/LivechatInquiry.js
@@ -8,4 +8,11 @@ export class LivechatInquiryRaw extends BaseRaw {
 		};
 		return this.findOne(query);
 	}
+
+	findOneByRoomId(rid) {
+		const query = {
+			rid,
+		};
+		return this.findOne(query);
+	}
 }

From 7656ae1ba4d250db61da180d49ba8b4e89b1e33b Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 2 Apr 2020 22:09:41 -0300
Subject: [PATCH 149/223] [FIX] Option BYPASS_OPLOG_VALIDATION not working
 (#17143)

---
 app/models/server/models/_BaseDb.js        | 17 ++++++++++++-----
 app/utils/server/functions/getMongoInfo.js |  4 ++--
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/models/server/models/_BaseDb.js b/app/models/server/models/_BaseDb.js
index d248544a918a..f8ced9735d36 100644
--- a/app/models/server/models/_BaseDb.js
+++ b/app/models/server/models/_BaseDb.js
@@ -1,9 +1,11 @@
 import { EventEmitter } from 'events';
 
 import { Match } from 'meteor/check';
-import { Mongo, MongoInternals } from 'meteor/mongo';
+import { Mongo } from 'meteor/mongo';
 import _ from 'underscore';
 
+import { getMongoInfo } from '../../../utils/server/functions/getMongoInfo';
+
 const baseName = 'rocketchat_';
 
 const trash = new Mongo.Collection(`${ baseName }_trash`);
@@ -35,6 +37,8 @@ export class BaseDb extends EventEmitter {
 
 		this.wrapModel();
 
+		const { oplogEnabled, mongo } = getMongoInfo();
+
 		// When someone start listening for changes we start oplog if available
 		const handleListener = (event /* , listener*/) => {
 			if (event !== 'change') {
@@ -47,7 +51,7 @@ export class BaseDb extends EventEmitter {
 				collection: this.collectionName,
 			};
 
-			if (!MongoInternals.defaultRemoteCollectionDriver().mongo._oplogHandle) {
+			if (!mongo._oplogHandle) {
 				throw new Error(`Error: Unable to find Mongodb Oplog. You must run the server with oplog enabled. Try the following:\n
 				1. Start your mongodb in a replicaset mode: mongod --smallfiles --oplogSize 128 --replSet rs0\n
 				2. Start the replicaset via mongodb shell: mongo mongo/meteor --eval "rs.initiate({ _id: ''rs0'', members: [ { _id: 0, host: ''localhost:27017'' } ]})"\n
@@ -55,18 +59,21 @@ export class BaseDb extends EventEmitter {
 				`);
 			}
 
-			MongoInternals.defaultRemoteCollectionDriver().mongo._oplogHandle.onOplogEntry(
+			mongo._oplogHandle.onOplogEntry(
 				query,
 				this.processOplogRecord.bind(this),
 			);
 			// Meteor will handle if we have a value https://github.com/meteor/meteor/blob/5dcd0b2eb9c8bf881ffbee98bc4cb7631772c4da/packages/mongo/oplog_tailing.js#L5
 			if (process.env.METEOR_OPLOG_TOO_FAR_BEHIND == null) {
-				MongoInternals.defaultRemoteCollectionDriver().mongo._oplogHandle._defineTooFarBehind(
+				mongo._oplogHandle._defineTooFarBehind(
 					Number.MAX_SAFE_INTEGER,
 				);
 			}
 		};
-		this.on('newListener', handleListener);
+
+		if (oplogEnabled) {
+			this.on('newListener', handleListener);
+		}
 
 		this.tryEnsureIndex({ _updatedAt: 1 }, options._updatedAtIndexOptions);
 	}
diff --git a/app/utils/server/functions/getMongoInfo.js b/app/utils/server/functions/getMongoInfo.js
index 49baab0536d8..f734af101066 100644
--- a/app/utils/server/functions/getMongoInfo.js
+++ b/app/utils/server/functions/getMongoInfo.js
@@ -27,7 +27,7 @@ function fallbackMongoInfo() {
 		console.error('==================================');
 	}
 
-	return { oplogEnabled, mongoVersion, mongoStorageEngine };
+	return { oplogEnabled, mongoVersion, mongoStorageEngine, mongo };
 }
 
 export function getMongoInfo() {
@@ -47,5 +47,5 @@ export function getMongoInfo() {
 		return fallbackMongoInfo();
 	}
 
-	return { oplogEnabled, mongoVersion, mongoStorageEngine };
+	return { oplogEnabled, mongoVersion, mongoStorageEngine, mongo };
 }

From 8e634be11fd8e24be50dce1c3c95bfd40a079d3d Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 2 Apr 2020 23:10:06 -0300
Subject: [PATCH 150/223] New metric to track oplog queue (#17142)

* New metric to track oplog queue

* Reuse mongo instance from getMongoInfo
---
 app/metrics/server/lib/metrics.js          |  6 +++++-
 app/utils/server/functions/getMongoInfo.js | 16 ++++++++++------
 app/utils/server/index.js                  |  2 +-
 server/startup/serverRunning.js            |  4 ++--
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/app/metrics/server/lib/metrics.js b/app/metrics/server/lib/metrics.js
index 32030be0b1b9..f8a033c6597c 100644
--- a/app/metrics/server/lib/metrics.js
+++ b/app/metrics/server/lib/metrics.js
@@ -5,7 +5,7 @@ import connect from 'connect';
 import _ from 'underscore';
 import { Meteor } from 'meteor/meteor';
 
-import { Info } from '../../../utils';
+import { Info, getOplogInfo } from '../../../utils/server';
 import { Migrations } from '../../../migrations';
 import { settings } from '../../../settings';
 import { Statistics } from '../../../models';
@@ -57,6 +57,7 @@ metrics.version = new client.Gauge({ name: 'rocketchat_version', labelNames: ['v
 metrics.migration = new client.Gauge({ name: 'rocketchat_migration', help: 'migration versoin' });
 metrics.instanceCount = new client.Gauge({ name: 'rocketchat_instance_count', help: 'instances running' });
 metrics.oplogEnabled = new client.Gauge({ name: 'rocketchat_oplog_enabled', labelNames: ['enabled'], help: 'oplog enabled' });
+metrics.oplogQueue = new client.Gauge({ name: 'rocketchat_oplog_queue', labelNames: ['queue'], help: 'oplog queue' });
 metrics.oplog = new client.Counter({
 	name: 'rocketchat_oplog',
 	help: 'summary of oplog operations',
@@ -134,6 +135,9 @@ const setPrometheusData = async () => {
 	metrics.totalPrivateGroupMessages.set(statistics.totalPrivateGroupMessages, date);
 	metrics.totalDirectMessages.set(statistics.totalDirectMessages, date);
 	metrics.totalLivechatMessages.set(statistics.totalLivechatMessages, date);
+
+	const oplogQueue = getOplogInfo().mongo._oplogHandle?._entryQueue?.length || 0;
+	metrics.oplogQueue.set(oplogQueue, date);
 };
 
 const app = connect();
diff --git a/app/utils/server/functions/getMongoInfo.js b/app/utils/server/functions/getMongoInfo.js
index f734af101066..c0cbd9a17a62 100644
--- a/app/utils/server/functions/getMongoInfo.js
+++ b/app/utils/server/functions/getMongoInfo.js
@@ -1,12 +1,18 @@
 import { MongoInternals } from 'meteor/mongo';
 
+export function getOplogInfo() {
+	const { mongo } = MongoInternals.defaultRemoteCollectionDriver();
+
+	const oplogEnabled = Boolean(mongo._oplogHandle && mongo._oplogHandle.onOplogEntry);
+
+	return { oplogEnabled, mongo };
+}
+
 function fallbackMongoInfo() {
 	let mongoVersion;
 	let mongoStorageEngine;
 
-	const { mongo } = MongoInternals.defaultRemoteCollectionDriver();
-
-	const oplogEnabled = Boolean(mongo._oplogHandle && mongo._oplogHandle.onOplogEntry);
+	const { oplogEnabled, mongo } = getOplogInfo();
 
 	try {
 		const { version } = Promise.await(mongo.db.command({ buildinfo: 1 }));
@@ -34,9 +40,7 @@ export function getMongoInfo() {
 	let mongoVersion;
 	let mongoStorageEngine;
 
-	const { mongo } = MongoInternals.defaultRemoteCollectionDriver();
-
-	const oplogEnabled = Boolean(mongo._oplogHandle && mongo._oplogHandle.onOplogEntry);
+	const { oplogEnabled, mongo } = getOplogInfo();
 
 	try {
 		const { version, storageEngine } = Promise.await(mongo.db.command({ serverStatus: 1 }));
diff --git a/app/utils/server/index.js b/app/utils/server/index.js
index e8d909ef79c4..a380d6f4ba7b 100644
--- a/app/utils/server/index.js
+++ b/app/utils/server/index.js
@@ -7,7 +7,7 @@ export { roomTypes } from './lib/roomTypes';
 export { RoomTypeRouteConfig, RoomTypeConfig, RoomSettingsEnum, RoomMemberActions, UiTextContext } from '../lib/RoomTypeConfig';
 export { RoomTypesCommon } from '../lib/RoomTypesCommon';
 export { isDocker } from './functions/isDocker';
-export { getMongoInfo } from './functions/getMongoInfo';
+export { getMongoInfo, getOplogInfo } from './functions/getMongoInfo';
 export { getUserAvatarURL } from '../lib/getUserAvatarURL';
 export { slashCommands } from '../lib/slashCommand';
 export { getUserNotificationPreference } from '../lib/getUserNotificationPreference';
diff --git a/server/startup/serverRunning.js b/server/startup/serverRunning.js
index 5b06f722ee39..9b7611951c5c 100644
--- a/server/startup/serverRunning.js
+++ b/server/startup/serverRunning.js
@@ -6,8 +6,8 @@ import { Meteor } from 'meteor/meteor';
 import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { SystemLogger } from '../../app/logger';
-import { settings } from '../../app/settings';
-import { Info, getMongoInfo } from '../../app/utils';
+import { settings } from '../../app/settings/server';
+import { Info, getMongoInfo } from '../../app/utils/server';
 import { Users } from '../../app/models/server';
 import { sendMessagesToAdmins } from '../lib/sendMessagesToAdmins';
 

From e04da25d0d17931d95bbe3ae6a4057a1af520c1b Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 2 Apr 2020 23:10:06 -0300
Subject: [PATCH 151/223] New metric to track oplog queue (#17142)

* New metric to track oplog queue

* Reuse mongo instance from getMongoInfo
---
 app/metrics/server/lib/metrics.js          |  6 +++++-
 app/utils/server/functions/getMongoInfo.js | 16 ++++++++++------
 app/utils/server/index.js                  |  2 +-
 server/startup/serverRunning.js            |  4 ++--
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/app/metrics/server/lib/metrics.js b/app/metrics/server/lib/metrics.js
index 32030be0b1b9..f8a033c6597c 100644
--- a/app/metrics/server/lib/metrics.js
+++ b/app/metrics/server/lib/metrics.js
@@ -5,7 +5,7 @@ import connect from 'connect';
 import _ from 'underscore';
 import { Meteor } from 'meteor/meteor';
 
-import { Info } from '../../../utils';
+import { Info, getOplogInfo } from '../../../utils/server';
 import { Migrations } from '../../../migrations';
 import { settings } from '../../../settings';
 import { Statistics } from '../../../models';
@@ -57,6 +57,7 @@ metrics.version = new client.Gauge({ name: 'rocketchat_version', labelNames: ['v
 metrics.migration = new client.Gauge({ name: 'rocketchat_migration', help: 'migration versoin' });
 metrics.instanceCount = new client.Gauge({ name: 'rocketchat_instance_count', help: 'instances running' });
 metrics.oplogEnabled = new client.Gauge({ name: 'rocketchat_oplog_enabled', labelNames: ['enabled'], help: 'oplog enabled' });
+metrics.oplogQueue = new client.Gauge({ name: 'rocketchat_oplog_queue', labelNames: ['queue'], help: 'oplog queue' });
 metrics.oplog = new client.Counter({
 	name: 'rocketchat_oplog',
 	help: 'summary of oplog operations',
@@ -134,6 +135,9 @@ const setPrometheusData = async () => {
 	metrics.totalPrivateGroupMessages.set(statistics.totalPrivateGroupMessages, date);
 	metrics.totalDirectMessages.set(statistics.totalDirectMessages, date);
 	metrics.totalLivechatMessages.set(statistics.totalLivechatMessages, date);
+
+	const oplogQueue = getOplogInfo().mongo._oplogHandle?._entryQueue?.length || 0;
+	metrics.oplogQueue.set(oplogQueue, date);
 };
 
 const app = connect();
diff --git a/app/utils/server/functions/getMongoInfo.js b/app/utils/server/functions/getMongoInfo.js
index 49baab0536d8..27b9d655b1d0 100644
--- a/app/utils/server/functions/getMongoInfo.js
+++ b/app/utils/server/functions/getMongoInfo.js
@@ -1,12 +1,18 @@
 import { MongoInternals } from 'meteor/mongo';
 
+export function getOplogInfo() {
+	const { mongo } = MongoInternals.defaultRemoteCollectionDriver();
+
+	const oplogEnabled = Boolean(mongo._oplogHandle && mongo._oplogHandle.onOplogEntry);
+
+	return { oplogEnabled, mongo };
+}
+
 function fallbackMongoInfo() {
 	let mongoVersion;
 	let mongoStorageEngine;
 
-	const { mongo } = MongoInternals.defaultRemoteCollectionDriver();
-
-	const oplogEnabled = Boolean(mongo._oplogHandle && mongo._oplogHandle.onOplogEntry);
+	const { oplogEnabled, mongo } = getOplogInfo();
 
 	try {
 		const { version } = Promise.await(mongo.db.command({ buildinfo: 1 }));
@@ -34,9 +40,7 @@ export function getMongoInfo() {
 	let mongoVersion;
 	let mongoStorageEngine;
 
-	const { mongo } = MongoInternals.defaultRemoteCollectionDriver();
-
-	const oplogEnabled = Boolean(mongo._oplogHandle && mongo._oplogHandle.onOplogEntry);
+	const { oplogEnabled, mongo } = getOplogInfo();
 
 	try {
 		const { version, storageEngine } = Promise.await(mongo.db.command({ serverStatus: 1 }));
diff --git a/app/utils/server/index.js b/app/utils/server/index.js
index 07d2f50c4970..fa936628bdfe 100644
--- a/app/utils/server/index.js
+++ b/app/utils/server/index.js
@@ -7,7 +7,7 @@ export { roomTypes } from './lib/roomTypes';
 export { RoomTypeRouteConfig, RoomTypeConfig, RoomSettingsEnum, UiTextContext } from '../lib/RoomTypeConfig';
 export { RoomTypesCommon } from '../lib/RoomTypesCommon';
 export { isDocker } from './functions/isDocker';
-export { getMongoInfo } from './functions/getMongoInfo';
+export { getMongoInfo, getOplogInfo } from './functions/getMongoInfo';
 export { getUserAvatarURL } from '../lib/getUserAvatarURL';
 export { slashCommands } from '../lib/slashCommand';
 export { getUserNotificationPreference } from '../lib/getUserNotificationPreference';
diff --git a/server/startup/serverRunning.js b/server/startup/serverRunning.js
index 5b06f722ee39..9b7611951c5c 100644
--- a/server/startup/serverRunning.js
+++ b/server/startup/serverRunning.js
@@ -6,8 +6,8 @@ import { Meteor } from 'meteor/meteor';
 import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { SystemLogger } from '../../app/logger';
-import { settings } from '../../app/settings';
-import { Info, getMongoInfo } from '../../app/utils';
+import { settings } from '../../app/settings/server';
+import { Info, getMongoInfo } from '../../app/utils/server';
 import { Users } from '../../app/models/server';
 import { sendMessagesToAdmins } from '../lib/sendMessagesToAdmins';
 

From d4186260a76e89902a50f63049499ae7fa64318f Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Thu, 2 Apr 2020 22:09:41 -0300
Subject: [PATCH 152/223] [FIX] Option BYPASS_OPLOG_VALIDATION not working
 (#17143)

---
 app/models/server/models/_BaseDb.js        | 17 ++++++++++++-----
 app/utils/server/functions/getMongoInfo.js |  4 ++--
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/models/server/models/_BaseDb.js b/app/models/server/models/_BaseDb.js
index d248544a918a..f8ced9735d36 100644
--- a/app/models/server/models/_BaseDb.js
+++ b/app/models/server/models/_BaseDb.js
@@ -1,9 +1,11 @@
 import { EventEmitter } from 'events';
 
 import { Match } from 'meteor/check';
-import { Mongo, MongoInternals } from 'meteor/mongo';
+import { Mongo } from 'meteor/mongo';
 import _ from 'underscore';
 
+import { getMongoInfo } from '../../../utils/server/functions/getMongoInfo';
+
 const baseName = 'rocketchat_';
 
 const trash = new Mongo.Collection(`${ baseName }_trash`);
@@ -35,6 +37,8 @@ export class BaseDb extends EventEmitter {
 
 		this.wrapModel();
 
+		const { oplogEnabled, mongo } = getMongoInfo();
+
 		// When someone start listening for changes we start oplog if available
 		const handleListener = (event /* , listener*/) => {
 			if (event !== 'change') {
@@ -47,7 +51,7 @@ export class BaseDb extends EventEmitter {
 				collection: this.collectionName,
 			};
 
-			if (!MongoInternals.defaultRemoteCollectionDriver().mongo._oplogHandle) {
+			if (!mongo._oplogHandle) {
 				throw new Error(`Error: Unable to find Mongodb Oplog. You must run the server with oplog enabled. Try the following:\n
 				1. Start your mongodb in a replicaset mode: mongod --smallfiles --oplogSize 128 --replSet rs0\n
 				2. Start the replicaset via mongodb shell: mongo mongo/meteor --eval "rs.initiate({ _id: ''rs0'', members: [ { _id: 0, host: ''localhost:27017'' } ]})"\n
@@ -55,18 +59,21 @@ export class BaseDb extends EventEmitter {
 				`);
 			}
 
-			MongoInternals.defaultRemoteCollectionDriver().mongo._oplogHandle.onOplogEntry(
+			mongo._oplogHandle.onOplogEntry(
 				query,
 				this.processOplogRecord.bind(this),
 			);
 			// Meteor will handle if we have a value https://github.com/meteor/meteor/blob/5dcd0b2eb9c8bf881ffbee98bc4cb7631772c4da/packages/mongo/oplog_tailing.js#L5
 			if (process.env.METEOR_OPLOG_TOO_FAR_BEHIND == null) {
-				MongoInternals.defaultRemoteCollectionDriver().mongo._oplogHandle._defineTooFarBehind(
+				mongo._oplogHandle._defineTooFarBehind(
 					Number.MAX_SAFE_INTEGER,
 				);
 			}
 		};
-		this.on('newListener', handleListener);
+
+		if (oplogEnabled) {
+			this.on('newListener', handleListener);
+		}
 
 		this.tryEnsureIndex({ _updatedAt: 1 }, options._updatedAtIndexOptions);
 	}
diff --git a/app/utils/server/functions/getMongoInfo.js b/app/utils/server/functions/getMongoInfo.js
index 27b9d655b1d0..c0cbd9a17a62 100644
--- a/app/utils/server/functions/getMongoInfo.js
+++ b/app/utils/server/functions/getMongoInfo.js
@@ -33,7 +33,7 @@ function fallbackMongoInfo() {
 		console.error('==================================');
 	}
 
-	return { oplogEnabled, mongoVersion, mongoStorageEngine };
+	return { oplogEnabled, mongoVersion, mongoStorageEngine, mongo };
 }
 
 export function getMongoInfo() {
@@ -51,5 +51,5 @@ export function getMongoInfo() {
 		return fallbackMongoInfo();
 	}
 
-	return { oplogEnabled, mongoVersion, mongoStorageEngine };
+	return { oplogEnabled, mongoVersion, mongoStorageEngine, mongo };
 }

From 5de63220234b5f29300cce0c012ea786f9382d9e Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Thu, 2 Apr 2020 11:23:58 -0300
Subject: [PATCH 153/223] [FIX] Omnichannel endpoint `inquiries.getOne`
 returning only queued inquiries (#17132)

---
 app/livechat/server/api/lib/inquiries.js | 2 +-
 app/models/server/raw/LivechatInquiry.js | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/livechat/server/api/lib/inquiries.js b/app/livechat/server/api/lib/inquiries.js
index a9c683b167a9..eefba5f313e8 100644
--- a/app/livechat/server/api/lib/inquiries.js
+++ b/app/livechat/server/api/lib/inquiries.js
@@ -64,6 +64,6 @@ export async function findOneInquiryByRoomId({ userId, roomId }) {
 	}
 
 	return {
-		inquiry: await LivechatInquiry.findOneQueuedByRoomId(roomId),
+		inquiry: await LivechatInquiry.findOneByRoomId(roomId),
 	};
 }
diff --git a/app/models/server/raw/LivechatInquiry.js b/app/models/server/raw/LivechatInquiry.js
index 253fa6003406..f1507953435e 100644
--- a/app/models/server/raw/LivechatInquiry.js
+++ b/app/models/server/raw/LivechatInquiry.js
@@ -8,4 +8,11 @@ export class LivechatInquiryRaw extends BaseRaw {
 		};
 		return this.findOne(query);
 	}
+
+	findOneByRoomId(rid) {
+		const query = {
+			rid,
+		};
+		return this.findOne(query);
+	}
 }

From 075570b5bf6c09d3baf8f1aa460b0674de6f2c30 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Thu, 2 Apr 2020 23:17:15 -0300
Subject: [PATCH 154/223] Bump version to 3.0.11

---
 .docker/Dockerfile.rhel   |  2 +-
 .github/history.json      | 38 ++++++++++++++++++++++++++++++++++++++
 HISTORY.md                | 28 ++++++++++++++++++++++++++++
 app/utils/rocketchat.info |  2 +-
 package.json              |  2 +-
 5 files changed, 69 insertions(+), 3 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 98316250b658..37f09179807e 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.0.10
+ENV RC_VERSION 3.0.11
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index d3b105596dc7..29f1018fac2e 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -40205,6 +40205,44 @@
           ]
         }
       ]
+    },
+    "3.0.11": {
+      "node_version": "12.14.0",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "17132",
+          "title": "[FIX] Omnichannel endpoint `inquiries.getOne` returning only queued inquiries",
+          "userLogin": "renatobecker",
+          "milestone": "3.0.11",
+          "contributors": [
+            "renatobecker"
+          ]
+        },
+        {
+          "pr": "17143",
+          "title": "[FIX] Option BYPASS_OPLOG_VALIDATION not working",
+          "userLogin": "rodrigok",
+          "milestone": "3.0.11",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "17142",
+          "title": "New metric to track oplog queue",
+          "userLogin": "rodrigok",
+          "milestone": "3.0.11",
+          "contributors": [
+            "rodrigok"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/HISTORY.md b/HISTORY.md
index 5aa6cf8613c2..b7fd6f5519a3 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,32 @@
 
+# 3.0.11
+`2020-04-02  ·  2 🐛  ·  1 🔍  ·  2 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `12.14.0`
+- NPM: `6.13.4`
+- MongoDB: `3.4, 3.6, 4.0`
+
+### 🐛 Bug fixes
+
+
+- Omnichannel endpoint `inquiries.getOne` returning only queued inquiries ([#17132](https://github.com/RocketChat/Rocket.Chat/pull/17132))
+
+- Option BYPASS_OPLOG_VALIDATION not working ([#17143](https://github.com/RocketChat/Rocket.Chat/pull/17143))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- New metric to track oplog queue ([#17142](https://github.com/RocketChat/Rocket.Chat/pull/17142))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@renatobecker](https://github.com/renatobecker)
+- [@rodrigok](https://github.com/rodrigok)
+
 # 3.0.10
 `2020-04-01  ·  1 🚀  ·  2 🐛  ·  3 🔍  ·  3 👩‍💻👨‍💻`
 
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index fed25a57f1f5..c5abd3a312f2 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.0.10"
+	"version": "3.0.11"
 }
diff --git a/package.json b/package.json
index 4fa88b77424a..804bd862610a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.0.10",
+	"version": "3.0.11",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

From 8ff674efea5960d3c7c1b589fb15b93e158c5b47 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Thu, 2 Apr 2020 23:22:54 -0300
Subject: [PATCH 155/223] Bump version to 3.1.0-rc.8

---
 .docker/Dockerfile.rhel   |  2 +-
 .github/history.json      | 46 +++++++++++++++++++++++++++++++++++++++
 HISTORY.md                | 26 ++++++++++++++++++++++
 app/utils/rocketchat.info |  2 +-
 package.json              |  2 +-
 5 files changed, 75 insertions(+), 3 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 09e4f8463966..83945222de60 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.1.0-rc.7
+ENV RC_VERSION 3.1.0-rc.8
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index 4cdce5336526..90cc4848e5e3 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -41960,6 +41960,52 @@
           ]
         }
       ]
+    },
+    "3.1.0-rc.8": {
+      "node_version": "12.16.1",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "17142",
+          "title": "New metric to track oplog queue",
+          "userLogin": "rodrigok",
+          "milestone": "3.0.11",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "17143",
+          "title": "[FIX] Option BYPASS_OPLOG_VALIDATION not working",
+          "userLogin": "rodrigok",
+          "milestone": "3.0.11",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "17132",
+          "title": "[FIX] Omnichannel endpoint `inquiries.getOne` returning only queued inquiries",
+          "userLogin": "renatobecker",
+          "milestone": "3.0.11",
+          "contributors": [
+            "renatobecker"
+          ]
+        },
+        {
+          "pr": "17133",
+          "title": "Regression: fix design review of Directory",
+          "userLogin": "ggazzo",
+          "contributors": [
+            "ggazzo"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/HISTORY.md b/HISTORY.md
index a539bdcbabb3..f9555521eb6e 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,6 +1,32 @@
 
 # 3.1.0 (Under Release Candidate Process)
 
+## 3.1.0-rc.8
+`2020-04-02  ·  2 🐛  ·  2 🔍  ·  3 👩‍💻👨‍💻`
+
+### 🐛 Bug fixes
+
+
+- Option BYPASS_OPLOG_VALIDATION not working ([#17143](https://github.com/RocketChat/Rocket.Chat/pull/17143))
+
+- Omnichannel endpoint `inquiries.getOne` returning only queued inquiries ([#17132](https://github.com/RocketChat/Rocket.Chat/pull/17132))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- New metric to track oplog queue ([#17142](https://github.com/RocketChat/Rocket.Chat/pull/17142))
+
+- Regression: fix design review of Directory ([#17133](https://github.com/RocketChat/Rocket.Chat/pull/17133))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@ggazzo](https://github.com/ggazzo)
+- [@renatobecker](https://github.com/renatobecker)
+- [@rodrigok](https://github.com/rodrigok)
+
 ## 3.1.0-rc.7
 `2020-04-02  ·  2 🎉  ·  1 🚀  ·  4 🐛  ·  9 🔍  ·  9 👩‍💻👨‍💻`
 
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index f785e4858f58..26844756d935 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.1.0-rc.7"
+	"version": "3.1.0-rc.8"
 }
diff --git a/package.json b/package.json
index 5429b2a062d5..d3a25136fedc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.1.0-rc.7",
+	"version": "3.1.0-rc.8",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

From f6085fa28cc07239a26b7378c20725770049571e Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 3 Apr 2020 11:51:37 -0300
Subject: [PATCH 156/223] =?UTF-8?q?Fix:=20Error=20message=20on=20startup?=
 =?UTF-8?q?=20of=20multiple=20instances=20related=20to=20the=20metrics?=
 =?UTF-8?q?=E2=80=99=20server=20(#17152)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix: Error message on startup of multiple instances related to the metrics’ server

* Use control variable
---
 app/metrics/server/lib/metrics.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/metrics/server/lib/metrics.js b/app/metrics/server/lib/metrics.js
index f8a033c6597c..ecabb6c67f7b 100644
--- a/app/metrics/server/lib/metrics.js
+++ b/app/metrics/server/lib/metrics.js
@@ -175,11 +175,18 @@ const oplogMetric = ({ collection, op }) => {
 };
 
 let timer;
+let wasEnabled = false;
 const updatePrometheusConfig = async () => {
 	const port = process.env.PROMETHEUS_PORT || settings.get('Prometheus_Port');
-	const enabled = settings.get('Prometheus_Enabled');
+	const enabled = Boolean(port && settings.get('Prometheus_Enabled'));
 
-	if (!port || !enabled) {
+	if (wasEnabled === enabled) {
+		return;
+	}
+
+	wasEnabled = enabled;
+
+	if (!enabled) {
 		server.close();
 		Meteor.clearInterval(timer);
 		oplogEvents.removeListener('record', oplogMetric);

From 6e27845fc7b141550416d4df750244f93daae413 Mon Sep 17 00:00:00 2001
From: Douglas Gubert <d-gubert@users.noreply.github.com>
Date: Fri, 3 Apr 2020 15:47:07 -0300
Subject: [PATCH 157/223] [NEW] Add omnichannel external frame feature (#17038)

---
 app/livechat/client/externalFrame/crypto.ts   | 39 +++++++++++++++
 .../externalFrame/externalFrameContainer.html |  5 ++
 .../externalFrame/externalFrameContainer.js   | 49 +++++++++++++++++++
 .../client/externalFrame/generateNewKey.ts    | 10 ++++
 app/livechat/client/externalFrame/index.js    |  3 ++
 app/livechat/client/externalFrame/tabBar.js   | 23 +++++++++
 app/livechat/client/index.js                  |  1 +
 app/livechat/client/stylesheets/livechat.less |  5 ++
 .../server/externalFrame/generateNewKey.ts    | 10 ++++
 app/livechat/server/externalFrame/index.js    |  2 +
 app/livechat/server/externalFrame/settings.js | 38 ++++++++++++++
 app/livechat/server/index.js                  |  1 +
 app/settings/server/functions/settings.d.ts   |  3 +-
 app/utils/client/lib/RestApiClient.js         | 15 +++---
 packages/rocketchat-i18n/i18n/en.i18n.json    |  7 +++
 packages/rocketchat-i18n/i18n/pt-BR.i18n.json |  7 +++
 16 files changed, 211 insertions(+), 7 deletions(-)
 create mode 100644 app/livechat/client/externalFrame/crypto.ts
 create mode 100644 app/livechat/client/externalFrame/externalFrameContainer.html
 create mode 100644 app/livechat/client/externalFrame/externalFrameContainer.js
 create mode 100644 app/livechat/client/externalFrame/generateNewKey.ts
 create mode 100644 app/livechat/client/externalFrame/index.js
 create mode 100644 app/livechat/client/externalFrame/tabBar.js
 create mode 100644 app/livechat/server/externalFrame/generateNewKey.ts
 create mode 100644 app/livechat/server/externalFrame/index.js
 create mode 100644 app/livechat/server/externalFrame/settings.js

diff --git a/app/livechat/client/externalFrame/crypto.ts b/app/livechat/client/externalFrame/crypto.ts
new file mode 100644
index 000000000000..873721c0c890
--- /dev/null
+++ b/app/livechat/client/externalFrame/crypto.ts
@@ -0,0 +1,39 @@
+function ab2str(buf: ArrayBuffer): string {
+	return String.fromCharCode(...new Uint16Array(buf));
+}
+
+function str2ab(str: string): ArrayBuffer {
+	const buf = new ArrayBuffer(str.length * 2); // 2 bytes for each char
+	const bufView = new Uint16Array(buf);
+	for (let i = 0, strLen = str.length; i < strLen; i++) {
+		bufView[i] = str.charCodeAt(i);
+	}
+	return buf;
+}
+
+export async function generateKey(): Promise<string> {
+	const key = await crypto.subtle.generateKey({ name: 'AES-GCM', length: 256 }, true, ['encrypt', 'decrypt']);
+	const exportedKey = await crypto.subtle.exportKey('jwk', key);
+	return JSON.stringify(exportedKey);
+}
+
+export async function getKeyFromString(keyStr: string): Promise<CryptoKey> {
+	const key = JSON.parse(keyStr);
+	return crypto.subtle.importKey('jwk', key, { name: 'AES-GCM', length: 256 }, true, ['encrypt', 'decrypt']);
+}
+
+export async function encrypt(text: string, key: CryptoKey): Promise<string> {
+	const vector = crypto.getRandomValues(new Uint8Array(16));
+	const data = new TextEncoder().encode(text);
+	const enc = await crypto.subtle.encrypt({ name: 'AES-GCM', iv: vector }, key, data);
+	const cipherText = new Uint8Array(enc);
+	return encodeURIComponent(btoa(ab2str(vector) + ab2str(cipherText)));
+}
+
+export async function decrypt(data: string, key: CryptoKey): Promise<string> {
+	const binaryData = atob(decodeURIComponent(data));
+	const vector = new Uint8Array(new Uint16Array(str2ab(binaryData.slice(0, 16))));
+	const buffer = new Uint8Array(new Uint16Array(str2ab(binaryData.slice(16))));
+	const decoded = await crypto.subtle.decrypt({ name: 'AES-GCM', iv: vector }, key, buffer);
+	return new TextDecoder().decode(decoded);
+}
diff --git a/app/livechat/client/externalFrame/externalFrameContainer.html b/app/livechat/client/externalFrame/externalFrameContainer.html
new file mode 100644
index 000000000000..e70035a929ec
--- /dev/null
+++ b/app/livechat/client/externalFrame/externalFrameContainer.html
@@ -0,0 +1,5 @@
+<template name="ExternalFrameContainer">
+	<div class="flex-nav">
+		<iframe class="external-frame" src="{{ externalFrameUrl }}"></iframe>
+	</div>
+</template>
diff --git a/app/livechat/client/externalFrame/externalFrameContainer.js b/app/livechat/client/externalFrame/externalFrameContainer.js
new file mode 100644
index 000000000000..fe8abeedb4cf
--- /dev/null
+++ b/app/livechat/client/externalFrame/externalFrameContainer.js
@@ -0,0 +1,49 @@
+import { Meteor } from 'meteor/meteor';
+import { Template } from 'meteor/templating';
+import { Session } from 'meteor/session';
+import { ReactiveVar } from 'meteor/reactive-var';
+
+import { APIClient } from '../../../utils/client';
+import { settings } from '../../../settings/client';
+import { encrypt, getKeyFromString } from './crypto';
+
+import './externalFrameContainer.html';
+
+Template.ExternalFrameContainer.helpers({
+	externalFrameUrl() {
+		const authToken = Template.instance().authToken.get();
+
+		if (!authToken) {
+			return '';
+		}
+
+		const frameURLSetting = settings.get('Omnichannel_External_Frame_URL');
+
+		try {
+			const frameURL = new URL(frameURLSetting);
+
+			frameURL.searchParams.append('uid', Meteor.userId());
+			frameURL.searchParams.append('rid', Session.get('openedRoom'));
+			frameURL.searchParams.append('t', authToken);
+
+			return frameURL.toString();
+		} catch {
+			console.error('Invalid URL provided to external frame');
+
+			return '';
+		}
+	},
+});
+
+Template.ExternalFrameContainer.onCreated(async function() {
+	this.authToken = new ReactiveVar();
+
+	const { 'X-Auth-Token': authToken } = APIClient.getCredentials();
+	const keyStr = settings.get('Omnichannel_External_Frame_Encryption_JWK');
+
+	if (keyStr) {
+		return this.authToken.set(await encrypt(authToken, await getKeyFromString(keyStr)));
+	}
+
+	this.authToken.set(authToken);
+});
diff --git a/app/livechat/client/externalFrame/generateNewKey.ts b/app/livechat/client/externalFrame/generateNewKey.ts
new file mode 100644
index 000000000000..79e299b05b9b
--- /dev/null
+++ b/app/livechat/client/externalFrame/generateNewKey.ts
@@ -0,0 +1,10 @@
+import { Meteor } from 'meteor/meteor';
+
+import { generateKey } from './crypto';
+
+Meteor.methods({
+	async omnichannelExternalFrameGenerateKey() {
+		const key = await generateKey();
+		Meteor.call('saveSetting', 'Omnichannel_External_Frame_Encryption_JWK', key);
+	},
+});
diff --git a/app/livechat/client/externalFrame/index.js b/app/livechat/client/externalFrame/index.js
new file mode 100644
index 000000000000..dd98f6958a1f
--- /dev/null
+++ b/app/livechat/client/externalFrame/index.js
@@ -0,0 +1,3 @@
+import './generateNewKey';
+import './tabBar';
+import './externalFrameContainer';
diff --git a/app/livechat/client/externalFrame/tabBar.js b/app/livechat/client/externalFrame/tabBar.js
new file mode 100644
index 000000000000..2907b3d67180
--- /dev/null
+++ b/app/livechat/client/externalFrame/tabBar.js
@@ -0,0 +1,23 @@
+import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
+
+import { TabBar } from '../../../ui-utils/client';
+import { settings } from '../../../settings/client';
+
+
+Meteor.startup(function() {
+	Tracker.autorun(function() {
+		if (!settings.get('Omnichannel_External_Frame_Enabled')) {
+			return TabBar.removeButton('omnichannelExternalFrame');
+		}
+
+		TabBar.addButton({
+			groups: ['live'],
+			id: 'omnichannelExternalFrame',
+			i18nTitle: 'Omnichannel_External_Frame',
+			icon: 'cube',
+			template: 'ExternalFrameContainer',
+			order: -1,
+		});
+	});
+});
diff --git a/app/livechat/client/index.js b/app/livechat/client/index.js
index f48235e2bcc5..a482ce7e293e 100644
--- a/app/livechat/client/index.js
+++ b/app/livechat/client/index.js
@@ -6,3 +6,4 @@ import './hooks/onRenderRoom';
 import './startup/notifyUnreadRooms';
 import './views/sideNav/livechat';
 import './views/sideNav/livechatFlex';
+import './externalFrame';
diff --git a/app/livechat/client/stylesheets/livechat.less b/app/livechat/client/stylesheets/livechat.less
index 00fbbed79423..232c8cb93317 100644
--- a/app/livechat/client/stylesheets/livechat.less
+++ b/app/livechat/client/stylesheets/livechat.less
@@ -633,3 +633,8 @@
 .livechat-current-chats-add-filter-button {
 	margin-top: 17px;
 }
+
+.external-frame {
+	width: 100%;
+	height: 100%;
+}
diff --git a/app/livechat/server/externalFrame/generateNewKey.ts b/app/livechat/server/externalFrame/generateNewKey.ts
new file mode 100644
index 000000000000..21cf89373f82
--- /dev/null
+++ b/app/livechat/server/externalFrame/generateNewKey.ts
@@ -0,0 +1,10 @@
+import { Meteor } from 'meteor/meteor';
+
+Meteor.methods({
+	// eslint-disable-next-line @typescript-eslint/no-empty-function
+	omnichannelExternalFrameGenerateKey() {
+		return {
+			message: 'Generating_key',
+		};
+	}, // only to prevent error when calling the client method
+});
diff --git a/app/livechat/server/externalFrame/index.js b/app/livechat/server/externalFrame/index.js
new file mode 100644
index 000000000000..4bb507671714
--- /dev/null
+++ b/app/livechat/server/externalFrame/index.js
@@ -0,0 +1,2 @@
+import './settings';
+import './generateNewKey';
diff --git a/app/livechat/server/externalFrame/settings.js b/app/livechat/server/externalFrame/settings.js
new file mode 100644
index 000000000000..e707e8604de7
--- /dev/null
+++ b/app/livechat/server/externalFrame/settings.js
@@ -0,0 +1,38 @@
+import { settings } from '../../../settings/server/functions/settings';
+
+settings.addGroup('Omnichannel', function() {
+	this.section('External Frame', function() {
+		this.add('Omnichannel_External_Frame_Enabled', false, {
+			type: 'boolean',
+			public: true,
+			alert: 'Experimental_Feature_Alert',
+		});
+
+		this.add('Omnichannel_External_Frame_URL', '', {
+			type: 'string',
+			public: true,
+			enableQuery: {
+				_id: 'Omnichannel_External_Frame_Enabled',
+				value: true,
+			},
+		});
+
+		this.add('Omnichannel_External_Frame_Encryption_JWK', '', {
+			type: 'string',
+			public: true,
+			enableQuery: {
+				_id: 'Omnichannel_External_Frame_Enabled',
+				value: true,
+			},
+		});
+
+		this.add('Omnichannel_External_Frame_GenerateKey', 'omnichannelExternalFrameGenerateKey', {
+			type: 'action',
+			actionText: 'Generate_new_key',
+			enableQuery: {
+				_id: 'Omnichannel_External_Frame_Enabled',
+				value: true,
+			},
+		});
+	});
+});
diff --git a/app/livechat/server/index.js b/app/livechat/server/index.js
index cc3c0b8fb927..f806301c05d8 100644
--- a/app/livechat/server/index.js
+++ b/app/livechat/server/index.js
@@ -81,5 +81,6 @@ import './lib/stream/queueManager';
 import './sendMessageBySMS';
 import './api';
 import './api/rest';
+import './externalFrame';
 
 export { Livechat } from './lib/Livechat';
diff --git a/app/settings/server/functions/settings.d.ts b/app/settings/server/functions/settings.d.ts
index 9576e32719a8..aab7040d6ccd 100644
--- a/app/settings/server/functions/settings.d.ts
+++ b/app/settings/server/functions/settings.d.ts
@@ -1,3 +1,4 @@
 export namespace settings {
-	export function get(name: string, callback: (key: string, value: any) => void): string;
+	export function get(name: string, callback?: (key: string, value: any) => void): string;
+	export function updateById(_id: string, value: any, editor?: string): number;
 }
diff --git a/app/utils/client/lib/RestApiClient.js b/app/utils/client/lib/RestApiClient.js
index a0d74e93d0b2..50eba6f56ae1 100644
--- a/app/utils/client/lib/RestApiClient.js
+++ b/app/utils/client/lib/RestApiClient.js
@@ -31,6 +31,13 @@ export const APIClient = {
 		return APIClient._jqueryFormDataCall(endpoint, params, formData, xhrOptions);
 	},
 
+	getCredentials() {
+		return {
+			'X-User-Id': Meteor._localStorage.getItem(Accounts.USER_ID_KEY),
+			'X-Auth-Token': Meteor._localStorage.getItem(Accounts.LOGIN_TOKEN_KEY),
+		};
+	},
+
 	_generateQueryFromParams(params) {
 		let query = '';
 		if (params && typeof params === 'object') {
@@ -53,8 +60,7 @@ export const APIClient = {
 				url: `${ baseURI }api/${ endpoint }${ query }`,
 				headers: Object.assign({
 					'Content-Type': 'application/json',
-					'X-User-Id': Meteor._localStorage.getItem(Accounts.USER_ID_KEY),
-					'X-Auth-Token': Meteor._localStorage.getItem(Accounts.LOGIN_TOKEN_KEY),
+					...APIClient.getCredentials(),
 				}, headers),
 				data: JSON.stringify(body),
 				success: function _rlGetSuccess(result) {
@@ -103,10 +109,7 @@ export const APIClient = {
 					return xhr;
 				},
 				url: `${ baseURI }api/${ endpoint }${ query }`,
-				headers: {
-					'X-User-Id': Meteor._localStorage.getItem(Accounts.USER_ID_KEY),
-					'X-Auth-Token': Meteor._localStorage.getItem(Accounts.LOGIN_TOKEN_KEY),
-				},
+				headers: APIClient.getCredentials(),
 				data: formData,
 				processData: false,
 				contentType: false,
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index ce11d6eacdd1..a7312db9ed0a 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -1623,6 +1623,8 @@
   "Full_Screen": "Full Screen",
   "Gaming": "Gaming",
   "General": "General",
+  "Generate_new_key": "Generate a new key",
+  "Generating_key": "Generating key",
   "Get_link": "Get Link",
   "Generate_New_Link": "Generate New Link",
   "github_no_public_email": "You don't have any email as public email in your GitHub account",
@@ -2539,6 +2541,11 @@
   "Old Colors": "Old Colors",
   "Old Colors (minor)": "Old Colors (minor)",
   "Older_than": "Older than",
+  "Omnichannel_External_Frame": "External Frame",
+  "Omnichannel_External_Frame_Enabled": "External frame enabled",
+  "Omnichannel_External_Frame_URL": "External frame URL",
+  "Omnichannel_External_Frame_Encryption_JWK": "Encryption key (JWK)",
+  "Omnichannel_External_Frame_Encryption_JWK_Description": "If provided it will encrypt the user's token with the provided key and the external system will need to decrypt the data to access the token",
   "On": "On",
   "Online": "Online",
   "online": "online",
diff --git a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
index 763b1c634ded..f51d1e4c576d 100644
--- a/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
+++ b/packages/rocketchat-i18n/i18n/pt-BR.i18n.json
@@ -1482,6 +1482,8 @@
   "Full_Screen": "Tela cheia",
   "Gaming": "Jogos",
   "General": "Geral",
+  "Generate_new_key": "Gerar uma nova chave",
+  "Generating_key": "Gerando chave",
   "Get_link": "Obter Link",
   "Generate_New_Link": "Gerar Novo Link",
   "github_no_public_email": "Você não possui um e-mail público em sua conta do GitHub",
@@ -2283,6 +2285,11 @@
   "Old Colors": "Cores antigas",
   "Old Colors (minor)": "Cores antigas (menores)",
   "Older_than": "Mais velho que",
+  "Omnichannel_External_Frame": "Frame Externo",
+  "Omnichannel_External_Frame_Enabled": "Frame Externo habilitado",
+  "Omnichannel_External_Frame_URL": "URL do Frame Externo",
+  "Omnichannel_External_Frame_Encryption_JWK": "Chave de criptografia (JWK)",
+  "Omnichannel_External_Frame_Encryption_JWK_Description": "Se a chave for fornecida o token do usuário será encriptado com esta chave e a outra aplicação precisará descriptografar o campo de token para ter acesso a informação",
   "On": "Em",
   "Online": "Online",
   "online": "online",

From ff8017a5c7f8a8bbd0a98eab365a3de74b1416a9 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 3 Apr 2020 16:33:51 -0300
Subject: [PATCH 158/223] Fix: Missing checks for Troubleshoot > Disable
 Notifications (#17155)

---
 app/lib/server/functions/notifications/audio.js  |  9 +++++++--
 app/lib/server/lib/sendNotificationsOnMessage.js | 15 ++++++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/lib/server/functions/notifications/audio.js b/app/lib/server/functions/notifications/audio.js
index a943e7dbd032..0c237507fd15 100644
--- a/app/lib/server/functions/notifications/audio.js
+++ b/app/lib/server/functions/notifications/audio.js
@@ -22,8 +22,13 @@ export function shouldNotifyAudio({
 		return false;
 	}
 
-	if (!audioNotifications && settings.get('Accounts_Default_User_Preferences_audioNotifications') === 'all') {
-		return true;
+	if (!audioNotifications) {
+		if (settings.get('Accounts_Default_User_Preferences_audioNotifications') === 'all') {
+			return true;
+		}
+		if (settings.get('Accounts_Default_User_Preferences_audioNotifications') === 'nothing') {
+			return false;
+		}
 	}
 
 	return roomType === 'd' || (!disableAllMessageNotifications && (hasMentionToAll || hasMentionToHere)) || isHighlighted || audioNotifications === 'all' || hasMentionToUser || hasReplyToThread;
diff --git a/app/lib/server/lib/sendNotificationsOnMessage.js b/app/lib/server/lib/sendNotificationsOnMessage.js
index 04c7c2f06beb..1d2e831c4441 100644
--- a/app/lib/server/lib/sendNotificationsOnMessage.js
+++ b/app/lib/server/lib/sendNotificationsOnMessage.js
@@ -12,6 +12,8 @@ import { sendSinglePush, shouldNotifyMobile } from '../functions/notifications/m
 import { notifyDesktopUser, shouldNotifyDesktop } from '../functions/notifications/desktop';
 import { notifyAudioUser, shouldNotifyAudio } from '../functions/notifications/audio';
 
+let TroubleshootDisableNotifications;
+
 export const sendNotification = async ({
 	subscription,
 	sender,
@@ -24,6 +26,10 @@ export const sendNotification = async ({
 	mentionIds,
 	disableAllMessageNotifications,
 }) => {
+	if (TroubleshootDisableNotifications === true) {
+		return;
+	}
+
 	// don't notify the sender
 	if (subscription.u._id === sender._id) {
 		return;
@@ -187,6 +193,10 @@ const lookup = {
 };
 
 export async function sendMessageNotifications(message, room, usersInThread = []) {
+	if (TroubleshootDisableNotifications === true) {
+		return;
+	}
+
 	const sender = roomTypes.getConfig(room.t).getMsgSender(message.u._id);
 	if (!sender) {
 		return message;
@@ -287,6 +297,10 @@ export async function sendMessageNotifications(message, room, usersInThread = []
 }
 
 export async function sendAllNotifications(message, room) {
+	if (TroubleshootDisableNotifications === true) {
+		return;
+	}
+
 	// threads
 	if (message.tmid) {
 		return message;
@@ -353,7 +367,6 @@ export async function sendAllNotifications(message, room) {
 	return message;
 }
 
-let TroubleshootDisableNotifications;
 settings.get('Troubleshoot_Disable_Notifications', (key, value) => {
 	if (TroubleshootDisableNotifications === value) { return; }
 	TroubleshootDisableNotifications = value;

From e06fe7009402a58411655d8b346ba2925304a7c5 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 3 Apr 2020 11:51:37 -0300
Subject: [PATCH 159/223] =?UTF-8?q?Fix:=20Error=20message=20on=20startup?=
 =?UTF-8?q?=20of=20multiple=20instances=20related=20to=20the=20metrics?=
 =?UTF-8?q?=E2=80=99=20server=20(#17152)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix: Error message on startup of multiple instances related to the metrics’ server

* Use control variable
---
 app/metrics/server/lib/metrics.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/metrics/server/lib/metrics.js b/app/metrics/server/lib/metrics.js
index f8a033c6597c..ecabb6c67f7b 100644
--- a/app/metrics/server/lib/metrics.js
+++ b/app/metrics/server/lib/metrics.js
@@ -175,11 +175,18 @@ const oplogMetric = ({ collection, op }) => {
 };
 
 let timer;
+let wasEnabled = false;
 const updatePrometheusConfig = async () => {
 	const port = process.env.PROMETHEUS_PORT || settings.get('Prometheus_Port');
-	const enabled = settings.get('Prometheus_Enabled');
+	const enabled = Boolean(port && settings.get('Prometheus_Enabled'));
 
-	if (!port || !enabled) {
+	if (wasEnabled === enabled) {
+		return;
+	}
+
+	wasEnabled = enabled;
+
+	if (!enabled) {
 		server.close();
 		Meteor.clearInterval(timer);
 		oplogEvents.removeListener('record', oplogMetric);

From 9675424635c62866365e88e795d4a72ba7dbf10f Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Fri, 3 Apr 2020 16:33:51 -0300
Subject: [PATCH 160/223] Fix: Missing checks for Troubleshoot > Disable
 Notifications (#17155)

---
 app/lib/server/functions/notifications/audio.js  |  9 +++++++--
 app/lib/server/lib/sendNotificationsOnMessage.js | 15 ++++++++++++++-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/lib/server/functions/notifications/audio.js b/app/lib/server/functions/notifications/audio.js
index a943e7dbd032..0c237507fd15 100644
--- a/app/lib/server/functions/notifications/audio.js
+++ b/app/lib/server/functions/notifications/audio.js
@@ -22,8 +22,13 @@ export function shouldNotifyAudio({
 		return false;
 	}
 
-	if (!audioNotifications && settings.get('Accounts_Default_User_Preferences_audioNotifications') === 'all') {
-		return true;
+	if (!audioNotifications) {
+		if (settings.get('Accounts_Default_User_Preferences_audioNotifications') === 'all') {
+			return true;
+		}
+		if (settings.get('Accounts_Default_User_Preferences_audioNotifications') === 'nothing') {
+			return false;
+		}
 	}
 
 	return roomType === 'd' || (!disableAllMessageNotifications && (hasMentionToAll || hasMentionToHere)) || isHighlighted || audioNotifications === 'all' || hasMentionToUser || hasReplyToThread;
diff --git a/app/lib/server/lib/sendNotificationsOnMessage.js b/app/lib/server/lib/sendNotificationsOnMessage.js
index 04c7c2f06beb..1d2e831c4441 100644
--- a/app/lib/server/lib/sendNotificationsOnMessage.js
+++ b/app/lib/server/lib/sendNotificationsOnMessage.js
@@ -12,6 +12,8 @@ import { sendSinglePush, shouldNotifyMobile } from '../functions/notifications/m
 import { notifyDesktopUser, shouldNotifyDesktop } from '../functions/notifications/desktop';
 import { notifyAudioUser, shouldNotifyAudio } from '../functions/notifications/audio';
 
+let TroubleshootDisableNotifications;
+
 export const sendNotification = async ({
 	subscription,
 	sender,
@@ -24,6 +26,10 @@ export const sendNotification = async ({
 	mentionIds,
 	disableAllMessageNotifications,
 }) => {
+	if (TroubleshootDisableNotifications === true) {
+		return;
+	}
+
 	// don't notify the sender
 	if (subscription.u._id === sender._id) {
 		return;
@@ -187,6 +193,10 @@ const lookup = {
 };
 
 export async function sendMessageNotifications(message, room, usersInThread = []) {
+	if (TroubleshootDisableNotifications === true) {
+		return;
+	}
+
 	const sender = roomTypes.getConfig(room.t).getMsgSender(message.u._id);
 	if (!sender) {
 		return message;
@@ -287,6 +297,10 @@ export async function sendMessageNotifications(message, room, usersInThread = []
 }
 
 export async function sendAllNotifications(message, room) {
+	if (TroubleshootDisableNotifications === true) {
+		return;
+	}
+
 	// threads
 	if (message.tmid) {
 		return message;
@@ -353,7 +367,6 @@ export async function sendAllNotifications(message, room) {
 	return message;
 }
 
-let TroubleshootDisableNotifications;
 settings.get('Troubleshoot_Disable_Notifications', (key, value) => {
 	if (TroubleshootDisableNotifications === value) { return; }
 	TroubleshootDisableNotifications = value;

From 07ca30aa953a5df4284d366bd06c677a605436a3 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Fri, 3 Apr 2020 16:42:44 -0300
Subject: [PATCH 161/223] Bump version to 3.0.12

---
 .docker/Dockerfile.rhel   |  2 +-
 .github/history.json      | 29 +++++++++++++++++++++++++++++
 HISTORY.md                | 22 ++++++++++++++++++++++
 app/utils/rocketchat.info |  2 +-
 package.json              |  2 +-
 5 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 37f09179807e..20e6b25f31ee 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.0.11
+ENV RC_VERSION 3.0.12
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index 29f1018fac2e..51e45cfe0a80 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -40243,6 +40243,35 @@
           ]
         }
       ]
+    },
+    "3.0.12": {
+      "node_version": "12.14.0",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "17155",
+          "title": "Fix: Missing checks for Troubleshoot > Disable Notifications",
+          "userLogin": "rodrigok",
+          "milestone": "3.0.12",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "17152",
+          "title": "Fix: Error message on startup of multiple instances related to the metrics’ server",
+          "userLogin": "rodrigok",
+          "milestone": "3.0.12",
+          "contributors": [
+            "rodrigok"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/HISTORY.md b/HISTORY.md
index b7fd6f5519a3..0b27f9badc9c 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,26 @@
 
+# 3.0.12
+`2020-04-03  ·  2 🔍  ·  1 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `12.14.0`
+- NPM: `6.13.4`
+- MongoDB: `3.4, 3.6, 4.0`
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Fix: Missing checks for Troubleshoot > Disable Notifications ([#17155](https://github.com/RocketChat/Rocket.Chat/pull/17155))
+
+- Fix: Error message on startup of multiple instances related to the metrics’ server ([#17152](https://github.com/RocketChat/Rocket.Chat/pull/17152))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@rodrigok](https://github.com/rodrigok)
+
 # 3.0.11
 `2020-04-02  ·  2 🐛  ·  1 🔍  ·  2 👩‍💻👨‍💻`
 
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index c5abd3a312f2..ce4ee222bc2e 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.0.11"
+	"version": "3.0.12"
 }
diff --git a/package.json b/package.json
index 804bd862610a..c13ab9c6caf8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.0.11",
+	"version": "3.0.12",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

From b872773756db6fd075b7e6d20bab9f4bea5c3a46 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 6 Apr 2020 14:33:02 -0300
Subject: [PATCH 162/223] Fix: Huge amount of hasLicense calls to the server
 (#17169)

Co-authored-by: Diego Sampaio <chinello@gmail.com>
---
 ee/app/license/client/index.js   | 13 -------------
 ee/app/license/client/index.ts   | 23 +++++++++++++++++++++++
 ee/app/license/server/license.ts | 18 +++++++++++-------
 ee/app/license/server/methods.ts |  5 ++++-
 4 files changed, 38 insertions(+), 21 deletions(-)
 delete mode 100644 ee/app/license/client/index.js
 create mode 100644 ee/app/license/client/index.ts

diff --git a/ee/app/license/client/index.js b/ee/app/license/client/index.js
deleted file mode 100644
index d91d9614efad..000000000000
--- a/ee/app/license/client/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-
-export function hasLicense(feature) {
-	return new Promise((resolve, reject) => {
-		Meteor.call('license:hasLicense', feature, (error, result) => {
-			if (error) {
-				return reject(error);
-			}
-
-			return resolve(result);
-		});
-	});
-}
diff --git a/ee/app/license/client/index.ts b/ee/app/license/client/index.ts
new file mode 100644
index 000000000000..c243ad6c93b3
--- /dev/null
+++ b/ee/app/license/client/index.ts
@@ -0,0 +1,23 @@
+import { CachedCollectionManager } from '../../../../app/ui-cached-collection';
+import { callMethod } from '../../../../app/ui-utils/client/lib/callMethod';
+
+const allModules = new Promise<Set<string>>((resolve, reject) => {
+	CachedCollectionManager.onLogin(async () => {
+		try {
+			const features: string[] = await callMethod('license:getModules');
+			resolve(new Set(features));
+		} catch (e) {
+			console.error('Error getting modules', e);
+			reject(e);
+		}
+	});
+});
+
+export async function hasLicense(feature: string): Promise<boolean> {
+	try {
+		const features = await allModules;
+		return features.has(feature);
+	} catch (e) {
+		return false;
+	}
+}
diff --git a/ee/app/license/server/license.ts b/ee/app/license/server/license.ts
index 845363bee97b..2fd536acb535 100644
--- a/ee/app/license/server/license.ts
+++ b/ee/app/license/server/license.ts
@@ -6,10 +6,6 @@ import { getBundleModules, isBundle } from './bundles';
 
 const EnterpriseLicenses = new EventEmitter();
 
-export interface IModules {
-	[key: string]: number;
-}
-
 export interface ILicense {
 	url: string;
 	expiry: string;
@@ -27,7 +23,7 @@ class LicenseClass {
 
 	private licenses: IValidLicense[] = [];
 
-	private modules: IModules = {};
+	private modules = new Set<string>();
 
 	_validateExpiration(expiration: string): boolean {
 		return new Date() > new Date(expiration);
@@ -49,7 +45,7 @@ class LicenseClass {
 				: [licenseModule];
 
 			modules.forEach((module) => {
-				this.modules[module] = 1;
+				this.modules.add(module);
 				EnterpriseLicenses.emit(`valid:${ module }`);
 			});
 		});
@@ -79,7 +75,11 @@ class LicenseClass {
 	}
 
 	hasModule(module: string): boolean {
-		return typeof this.modules[module] !== 'undefined';
+		return this.modules.has(module);
+	}
+
+	getModules(): string[] {
+		return [...this.modules];
 	}
 
 	setURL(url: string): void {
@@ -185,6 +185,10 @@ export function hasLicense(feature: string): boolean {
 	return License.hasModule(feature);
 }
 
+export function getModules(): string[] {
+	return License.getModules();
+}
+
 export function onLicense(feature: string, cb: (...args: any[]) => void): void {
 	if (hasLicense(feature)) {
 		return cb();
diff --git a/ee/app/license/server/methods.ts b/ee/app/license/server/methods.ts
index d7ae53ea6c88..679ad5a41e17 100644
--- a/ee/app/license/server/methods.ts
+++ b/ee/app/license/server/methods.ts
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 
-import { hasLicense } from './license';
+import { hasLicense, getModules } from './license';
 
 Meteor.methods({
 	'license:hasLicense'(feature: string) {
@@ -9,4 +9,7 @@ Meteor.methods({
 
 		return hasLicense(feature);
 	},
+	'license:getModules'() {
+		return getModules();
+	},
 });

From 043ff48469216ac56ad4bb04423464a412d740df Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Mon, 6 Apr 2020 17:59:24 -0300
Subject: [PATCH 163/223] Metrics: New metrics, performance and size
 improvements (#17183)

* Update prom-client and add setting to reset metrics

* Add GC metrics

* Fix metrics displaying api query strings

* Add setting to disable GC metrics (need restart)

* Add Metrics about Metrics :)

* Remove user_agent label report from APIs

* Prometheus improvements & setting to track user agent

* Reduce statistics frequency

* Metrics: Only get url with params if calling method.call
---
 app/api/server/api.js                      |   9 +-
 app/lib/server/startup/settings.js         |  10 +
 app/metrics/server/lib/metrics.js          | 163 ++++---
 package-lock.json                          | 519 ++++++++++++++++++++-
 package.json                               |   3 +-
 packages/rocketchat-i18n/i18n/en.i18n.json |   4 +
 6 files changed, 644 insertions(+), 64 deletions(-)

diff --git a/app/api/server/api.js b/app/api/server/api.js
index eab220650d6b..8c5f77b7fd0b 100644
--- a/app/api/server/api.js
+++ b/app/api/server/api.js
@@ -21,6 +21,7 @@ export const defaultRateLimiterOptions = {
 	numRequestsAllowed: settings.get('API_Enable_Rate_Limiter_Limit_Calls_Default'),
 	intervalTimeInMS: settings.get('API_Enable_Rate_Limiter_Limit_Time_Default'),
 };
+let prometheusAPIUserAgent = false;
 
 export let API = {};
 
@@ -320,8 +321,8 @@ export class APIClass extends Restivus {
 					const rocketchatRestApiEnd = metrics.rocketchatRestApi.startTimer({
 						method,
 						version,
-						user_agent: this.request.headers['user-agent'],
-						entrypoint: route,
+						...prometheusAPIUserAgent && { user_agent: this.request.headers['user-agent'] },
+						entrypoint: route.startsWith('method.call') ? decodeURIComponent(this.request._parsedUrl.pathname.slice(8)) : route,
 					});
 
 					logger.debug(`${ this.request.method.toUpperCase() }: ${ this.request.url }`);
@@ -695,3 +696,7 @@ settings.get('API_Enable_Rate_Limiter_Limit_Calls_Default', (key, value) => {
 	defaultRateLimiterOptions.numRequestsAllowed = value;
 	API.v1.reloadRoutesToRefreshRateLimiter();
 });
+
+settings.get('Prometheus_API_User_Agent', (key, value) => {
+	prometheusAPIUserAgent = value;
+});
diff --git a/app/lib/server/startup/settings.js b/app/lib/server/startup/settings.js
index 7f42f30ee2dc..f395501d02eb 100644
--- a/app/lib/server/startup/settings.js
+++ b/app/lib/server/startup/settings.js
@@ -1460,6 +1460,16 @@ settings.addGroup('Logs', function() {
 			type: 'string',
 			i18nLabel: 'Port',
 		});
+		this.add('Prometheus_Reset_Interval', 0, {
+			type: 'int',
+		});
+		this.add('Prometheus_Garbage_Collector', false, {
+			type: 'boolean',
+			alert: 'Prometheus_Garbage_Collector_Alert',
+		});
+		this.add('Prometheus_API_User_Agent', false, {
+			type: 'boolean',
+		});
 	});
 });
 
diff --git a/app/metrics/server/lib/metrics.js b/app/metrics/server/lib/metrics.js
index ecabb6c67f7b..d5f7b3953091 100644
--- a/app/metrics/server/lib/metrics.js
+++ b/app/metrics/server/lib/metrics.js
@@ -3,6 +3,7 @@ import http from 'http';
 import client from 'prom-client';
 import connect from 'connect';
 import _ from 'underscore';
+import gcStats from 'prometheus-gc-stats';
 import { Meteor } from 'meteor/meteor';
 
 import { Info, getOplogInfo } from '../../../utils/server';
@@ -11,45 +12,55 @@ import { settings } from '../../../settings';
 import { Statistics } from '../../../models';
 import { oplogEvents } from '../../../models/server/oplogEvents';
 
-client.collectDefaultMetrics();
-
 export const metrics = {};
+const percentiles = [0.01, 0.1, 0.9, 0.99];
+
+// Metrics
+metrics.metricsRequests = new client.Counter({ name: 'rocketchat_metrics_requests', labelNames: ['notification_type'], help: 'cumulated number of calls to the metrics endpoint' });
+metrics.metricsSize = new client.Gauge({ name: 'rocketchat_metrics_size', help: 'size of the metrics response in chars' });
+
+metrics.info = new client.Gauge({ name: 'rocketchat_info', labelNames: ['version', 'unique_id', 'site_url'], help: 'Rocket.Chat info' });
 
 metrics.meteorMethods = new client.Summary({
 	name: 'rocketchat_meteor_methods',
 	help: 'summary of meteor methods count and time',
 	labelNames: ['method', 'has_connection', 'has_user'],
+	percentiles,
 });
 
 metrics.rocketchatCallbacks = new client.Summary({
 	name: 'rocketchat_callbacks',
 	help: 'summary of rocketchat callbacks count and time',
 	labelNames: ['hook', 'callback'],
+	percentiles,
 });
 
 metrics.rocketchatHooks = new client.Summary({
 	name: 'rocketchat_hooks',
 	help: 'summary of rocketchat hooks count and time',
 	labelNames: ['hook', 'callbacks_length'],
+	percentiles,
 });
 
 metrics.rocketchatRestApi = new client.Summary({
 	name: 'rocketchat_rest_api',
 	help: 'summary of rocketchat rest api count and time',
 	labelNames: ['method', 'entrypoint', 'user_agent', 'status', 'version'],
+	percentiles,
 });
 
 metrics.meteorSubscriptions = new client.Summary({
 	name: 'rocketchat_meteor_subscriptions',
 	help: 'summary of meteor subscriptions count and time',
 	labelNames: ['subscription'],
+	percentiles,
 });
 
 metrics.messagesSent = new client.Counter({ name: 'rocketchat_message_sent', help: 'cumulated number of messages sent' });
 metrics.notificationsSent = new client.Counter({ name: 'rocketchat_notification_sent', labelNames: ['notification_type'], help: 'cumulated number of notifications sent' });
 
 metrics.ddpSessions = new client.Gauge({ name: 'rocketchat_ddp_sessions_count', help: 'number of open ddp sessions' });
-metrics.ddpAthenticatedSessions = new client.Gauge({ name: 'rocketchat_ddp_sessions_auth', help: 'number of authenticated open ddp sessions' });
+metrics.ddpAuthenticatedSessions = new client.Gauge({ name: 'rocketchat_ddp_sessions_auth', help: 'number of authenticated open ddp sessions' });
 metrics.ddpConnectedUsers = new client.Gauge({ name: 'rocketchat_ddp_connected_users', help: 'number of unique connected users' });
 metrics.ddpRateLimitExceeded = new client.Counter({ name: 'rocketchat_ddp_rate_limit_exceeded', labelNames: ['limit_name', 'user_id', 'client_address', 'type', 'name', 'connection_id'], help: 'number of times a ddp rate limiter was exceeded' });
 
@@ -87,57 +98,52 @@ metrics.totalDirectMessages = new client.Gauge({ name: 'rocketchat_direct_messag
 metrics.totalLivechatMessages = new client.Gauge({ name: 'rocketchat_livechat_messages_total', help: 'total of messages in livechat rooms' });
 
 const setPrometheusData = async () => {
-	client.register.setDefaultLabels({
-		uniqueId: settings.get('uniqueID'),
-		siteUrl: settings.get('Site_Url'),
-	});
-	const date = new Date();
-	client.register.setDefaultLabels({
+	metrics.info.set({
+		version: Info.version,
 		unique_id: settings.get('uniqueID'),
 		site_url: settings.get('Site_Url'),
-		version: Info.version,
-	});
+	}, 1);
 
 	const sessions = Array.from(Meteor.server.sessions.values());
 	const authenticatedSessions = sessions.filter((s) => s.userId);
-	metrics.ddpSessions.set(Meteor.server.sessions.size, date);
-	metrics.ddpAthenticatedSessions.set(authenticatedSessions.length, date);
-	metrics.ddpConnectedUsers.set(_.unique(authenticatedSessions.map((s) => s.userId)).length, date);
+	metrics.ddpSessions.set(Meteor.server.sessions.size);
+	metrics.ddpAuthenticatedSessions.set(authenticatedSessions.length);
+	metrics.ddpConnectedUsers.set(_.unique(authenticatedSessions.map((s) => s.userId)).length);
 
 	const statistics = Statistics.findLast();
 	if (!statistics) {
 		return;
 	}
 
-	metrics.version.set({ version: statistics.version }, 1, date);
-	metrics.migration.set(Migrations._getControl().version, date);
-	metrics.instanceCount.set(statistics.instanceCount, date);
-	metrics.oplogEnabled.set({ enabled: statistics.oplogEnabled }, 1, date);
+	metrics.version.set({ version: statistics.version }, 1);
+	metrics.migration.set(Migrations._getControl().version);
+	metrics.instanceCount.set(statistics.instanceCount);
+	metrics.oplogEnabled.set({ enabled: statistics.oplogEnabled }, 1);
 
 	// User statistics
-	metrics.totalUsers.set(statistics.totalUsers, date);
-	metrics.activeUsers.set(statistics.activeUsers, date);
-	metrics.nonActiveUsers.set(statistics.nonActiveUsers, date);
-	metrics.onlineUsers.set(statistics.onlineUsers, date);
-	metrics.awayUsers.set(statistics.awayUsers, date);
-	metrics.offlineUsers.set(statistics.offlineUsers, date);
+	metrics.totalUsers.set(statistics.totalUsers);
+	metrics.activeUsers.set(statistics.activeUsers);
+	metrics.nonActiveUsers.set(statistics.nonActiveUsers);
+	metrics.onlineUsers.set(statistics.onlineUsers);
+	metrics.awayUsers.set(statistics.awayUsers);
+	metrics.offlineUsers.set(statistics.offlineUsers);
 
 	// Room statistics
-	metrics.totalRooms.set(statistics.totalRooms, date);
-	metrics.totalChannels.set(statistics.totalChannels, date);
-	metrics.totalPrivateGroups.set(statistics.totalPrivateGroups, date);
-	metrics.totalDirect.set(statistics.totalDirect, date);
-	metrics.totalLivechat.set(statistics.totalLivechat, date);
+	metrics.totalRooms.set(statistics.totalRooms);
+	metrics.totalChannels.set(statistics.totalChannels);
+	metrics.totalPrivateGroups.set(statistics.totalPrivateGroups);
+	metrics.totalDirect.set(statistics.totalDirect);
+	metrics.totalLivechat.set(statistics.totalLivechat);
 
 	// Message statistics
-	metrics.totalMessages.set(statistics.totalMessages, date);
-	metrics.totalChannelMessages.set(statistics.totalChannelMessages, date);
-	metrics.totalPrivateGroupMessages.set(statistics.totalPrivateGroupMessages, date);
-	metrics.totalDirectMessages.set(statistics.totalDirectMessages, date);
-	metrics.totalLivechatMessages.set(statistics.totalLivechatMessages, date);
+	metrics.totalMessages.set(statistics.totalMessages);
+	metrics.totalChannelMessages.set(statistics.totalChannelMessages);
+	metrics.totalPrivateGroupMessages.set(statistics.totalPrivateGroupMessages);
+	metrics.totalDirectMessages.set(statistics.totalDirectMessages);
+	metrics.totalLivechatMessages.set(statistics.totalLivechatMessages);
 
 	const oplogQueue = getOplogInfo().mongo._oplogHandle?._entryQueue?.length || 0;
-	metrics.oplogQueue.set(oplogQueue, date);
+	metrics.oplogQueue.set(oplogQueue);
 };
 
 const app = connect();
@@ -147,7 +153,12 @@ const app = connect();
 
 app.use('/metrics', (req, res) => {
 	res.setHeader('Content-Type', 'text/plain');
-	res.end(client.register.metrics());
+	const data = client.register.metrics();
+
+	metrics.metricsRequests.inc();
+	metrics.metricsSize.set(data.length);
+
+	res.end(data);
 });
 
 app.use('/', (req, res) => {
@@ -175,35 +186,79 @@ const oplogMetric = ({ collection, op }) => {
 };
 
 let timer;
-let wasEnabled = false;
+let resetTimer;
+let defaultMetricsInitiated = false;
+let gcStatsInitiated = false;
+const was = {
+	enabled: false,
+	port: 9458,
+	resetInterval: 0,
+	collectGC: false,
+};
 const updatePrometheusConfig = async () => {
-	const port = process.env.PROMETHEUS_PORT || settings.get('Prometheus_Port');
-	const enabled = Boolean(port && settings.get('Prometheus_Enabled'));
-
-	if (wasEnabled === enabled) {
+	const is = {
+		port: process.env.PROMETHEUS_PORT || settings.get('Prometheus_Port'),
+		enabled: settings.get('Prometheus_Enabled'),
+		resetInterval: settings.get('Prometheus_Reset_Interval'),
+		collectGC: settings.get('Prometheus_Garbage_Collector'),
+	};
+
+	if (Object.values(is).some((s) => s == null)) {
 		return;
 	}
 
-	wasEnabled = enabled;
+	if (Object.entries(is).every(([k, v]) => v === was[k])) {
+		return;
+	}
 
-	if (!enabled) {
-		server.close();
-		Meteor.clearInterval(timer);
-		oplogEvents.removeListener('record', oplogMetric);
+	if (!is.enabled) {
+		if (was.enabled) {
+			console.log('Disabling Prometheus');
+			server.close();
+			Meteor.clearInterval(timer);
+			oplogEvents.removeListener('record', oplogMetric);
+		}
+		Object.assign(was, is);
 		return;
 	}
 
-	server.listen({
-		port,
-		host: process.env.BIND_IP || '0.0.0.0',
-	});
+	console.log('Configuring Prometheus', is);
+
+	if (!was.enabled) {
+		server.listen({
+			port: is.port,
+			host: process.env.BIND_IP || '0.0.0.0',
+		});
 
-	timer = Meteor.setInterval(setPrometheusData, 5000);
+		timer = Meteor.setInterval(setPrometheusData, 5000);
+		oplogEvents.on('record', oplogMetric);
+	}
+
+	Meteor.clearInterval(resetTimer);
+	if (is.resetInterval) {
+		resetTimer = Meteor.setInterval(() => {
+			client.register.getMetricsAsArray().forEach((metric) => { metric.hashMap = {}; });
+		}, is.resetInterval);
+	}
+
+	// Prevent exceptions on calling those methods twice since
+	// it's not possible to stop them to be able to restart
+	try {
+		if (defaultMetricsInitiated === false) {
+			defaultMetricsInitiated = true;
+			client.collectDefaultMetrics();
+		}
+		if (is.collectGC && gcStatsInitiated === false) {
+			gcStatsInitiated = true;
+			gcStats()();
+		}
+	} catch (error) {
+		console.error(error);
+	}
 
-	oplogEvents.on('record', oplogMetric);
+	Object.assign(was, is);
 };
 
 Meteor.startup(async () => {
-	settings.get('Prometheus_Enabled', updatePrometheusConfig);
-	settings.get('Prometheus_Port', updatePrometheusConfig);
+	settings.get(/^Prometheus_.+/, updatePrometheusConfig);
 });
diff --git a/package-lock.json b/package-lock.json
index e7b92f879940..54b8e0fd8dae 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2925,17 +2925,21 @@
 		},
 		"@rocket.chat/fuselage-ui-kit": {
 			"version": "0.7.1",
+			"resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-ui-kit/-/fuselage-ui-kit-0.7.1.tgz",
+			"integrity": "sha512-3OhOJ2yA1i/npYK9BeFFLuPGh9zBXCVS9PfWpN+Mc5dlCvB3CCduYExiIfho8+JZW83IXwIm9HlYsLyqMhpBpg==",
 			"requires": {
 				"@rocket.chat/ui-kit": "^0.7.1"
 			},
 			"dependencies": {
 				"@babel/preset-react": {
-					"version": "7.9.4"
+					"version": "7.9.4",
+					"resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.9.4.tgz",
+					"integrity": "sha512-AxylVB3FXeOTQXNXyiuAQJSvss62FEotbX2Pzx3K/7c+MKJMdSg6Ose6QYllkdCFA8EInCJVw7M/o5QbLuA4ZQ=="
 				},
 				"@rocket.chat/ui-kit": {
-					"version": "0.7.0",
-					"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.7.0.tgz",
-					"integrity": "sha512-qsBRQlUJhLga30qosHmiVsdLLBi2vjqBhAfKvYPAT0Qe5FzsuTRn6vtOnYk16A4mZ8hV8gWNDleuvG46vOk+LA=="
+					"version": "0.7.1",
+					"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.7.1.tgz",
+					"integrity": "sha512-CUpJt35zq56n4lBwWs17PRa+GGY+NKILv2ydjlL+dQNbtb9peEEzTVmglLRXUJhIwNKndSAr0eqoeTkRIsWL6A=="
 				}
 			}
 		},
@@ -16132,6 +16136,493 @@
 				}
 			}
 		},
+		"gc-stats": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/gc-stats/-/gc-stats-1.4.0.tgz",
+			"integrity": "sha512-4FcCj9e8j8rCjvLkqRpGZBLgTC/xr9XEf5By3x77cDucWWB3pJK6FEwXZCTCbb4z8xdaOoi4owBNrvn3ciDdxA==",
+			"optional": true,
+			"requires": {
+				"nan": "^2.13.2",
+				"node-pre-gyp": "^0.13.0"
+			},
+			"dependencies": {
+				"abbrev": {
+					"version": "1.1.1",
+					"bundled": true,
+					"optional": true
+				},
+				"ansi-regex": {
+					"version": "2.1.1",
+					"bundled": true,
+					"optional": true
+				},
+				"aproba": {
+					"version": "1.2.0",
+					"bundled": true,
+					"optional": true
+				},
+				"are-we-there-yet": {
+					"version": "1.1.5",
+					"bundled": true,
+					"optional": true,
+					"requires": {
+						"delegates": "^1.0.0",
+						"readable-stream": "^2.0.6"
+					}
+				},
+				"balanced-match": {
+					"version": "1.0.0",
+					"bundled": true,
+					"optional": true
+				},
+				"brace-expansion": {
+					"version": "1.1.11",
+					"bundled": true,
+					"optional": true,
+					"requires": {
+						"balanced-match": "^1.0.0",
+						"concat-map": "0.0.1"
+					}
+				},
+				"chownr": {
+					"version": "1.1.1",
+					"bundled": true,
+					"optional": true
+				},
+				"code-point-at": {
+					"version": "1.1.0",
+					"bundled": true,
+					"optional": true
+				},
+				"concat-map": {
+					"version": "0.0.1",
+					"bundled": true,
+					"optional": true
+				},
+				"console-control-strings": {
+					"version": "1.1.0",
+					"bundled": true,
+					"optional": true
+				},
+				"core-util-is": {
+					"version": "1.0.2",
+					"bundled": true,
+					"optional": true
+				},
+				"debug": {
+					"version": "4.1.1",
+					"bundled": true,
+					"optional": true,
+					"requires": {
+						"ms": "^2.1.1"
+					}
+				},
+				"deep-extend": {
+					"version": "0.6.0",
+					"bundled": true,
+					"optional": true
+				},
+				"delegates": {
+					"version": "1.0.0",
+					"bundled": true,
+					"optional": true
+				},
+				"detect-libc": {
+					"version": "1.0.3",
+					"bundled": true,
+					"optional": true
+				},
+				"fs-minipass": {
+					"version": "1.2.5",
+					"bundled": true,
+					"optional": true,
+					"requires": {
+						"minipass": "^2.2.1"
+					}
+				},
+				"fs.realpath": {
+					"version": "1.0.0",
+					"bundled": true,
+					"optional": true
+				},
+				"gauge": {
+					"version": "2.7.4",
+					"bundled": true,
+					"optional": true,
+					"requires": {
+						"aproba": "^1.0.3",
+						"console-control-strings": "^1.0.0",
+						"has-unicode": "^2.0.0",
+						"object-assign": "^4.1.0",
+						"signal-exit": "^3.0.0",
+						"string-width": "^1.0.1",
+						"strip-ansi": "^3.0.1",
+						"wide-align": "^1.1.0"
+					}
+				},
+				"glob": {
+					"version": "7.1.3",
+					"bundled": true,
+					"optional": true,
+					"requires": {
+						"fs.realpath": "^1.0.0",
+						"inflight": "^1.0.4",
+						"inherits": "2",
+						"minimatch": "^3.0.4",
+						"once": "^1.3.0",
+						"path-is-absolute": "^1.0.0"
+					}
+				},
+				"has-unicode": {
+					"version": "2.0.1",
+					"bundled": true,
+					"optional": true
+				},
+				"iconv-lite": {
+					"version": "0.4.24",
+					"bundled": true,
+					"optional": true,
+					"requires": {
+						"safer-buffer": ">= 2.1.2 < 3"
+					}
+				},
+				"ignore-walk": {
+					"version": "3.0.1",
+					"bundled": true,
+					"optional": true,
+					"requires": {
+						"minimatch": "^3.0.4"
+					}
+				},
+				"inflight": {
+					"version": "1.0.6",
+					"bundled": true,
+					"optional": true,
+					"requires": {
+						"once": "^1.3.0",
+						"wrappy": "1"
+					}
+				},
+				"inherits": {
+					"version": "2.0.3",
+					"bundled": true,
+					"optional": true
+				},
+				"ini": {
+					"version": "1.3.5",
+					"bundled": true,
+					"optional": true
+				},
+				"is-fullwidth-code-point": {
+					"version": "1.0.0",
+					"bundled": true,
+					"optional": true,
+					"requires": {
+						"number-is-nan": "^1.0.0"
+					}
+				},
+				"isarray": {
+					"version": "1.0.0",
+					"bundled": true,
+					"optional": true
+				},
+				"minimatch": {
+					"version": "3.0.4",
+					"bundled": true,
+					"optional": true,
+					"requires": {
+						"brace-expansion": "^1.1.7"
+					}
+				},
+				"minimist": {
+					"version": "0.0.8",
+					"bundled": true,
+					"optional": true
+				},
+				"minipass": {
+					"version": "2.3.5",
+					"bundled": true,
+					"optional": true,
+					"requires": {
+						"safe-buffer": "^5.1.2",
+						"yallist": "^3.0.0"
+					}
+				},
+				"minizlib": {
+					"version": "1.2.1",
+					"bundled": true,
+					"optional": true,
+					"requires": {
+						"minipass": "^2.2.1"
+					}
+				},
+				"mkdirp": {
+					"version": "0.5.1",
+					"bundled": true,
+					"optional": true,
+					"requires": {
+						"minimist": "0.0.8"
+					}
+				},
+				"ms": {
+					"version": "2.1.1",
+					"bundled": true,
+					"optional": true
+				},
+				"nan": {
+					"version": "2.14.0",
+					"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+					"integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
+					"optional": true
+				},
+				"needle": {
+					"version": "2.3.1",
+					"bundled": true,
+					"optional": true,
+					"requires": {
+						"debug": "^4.1.0",
+						"iconv-lite": "^0.4.4",
+						"sax": "^1.2.4"
+					}
+				},
+				"node-pre-gyp": {
+					"version": "0.13.0",
+					"bundled": true,
+					"optional": true,
+					"requires": {
+						"detect-libc": "^1.0.2",
+						"mkdirp": "^0.5.1",
+						"needle": "^2.2.1",
+						"nopt": "^4.0.1",
+						"npm-packlist": "^1.1.6",
+						"npmlog": "^4.0.2",
+						"rc": "^1.2.7",
+						"rimraf": "^2.6.1",
+						"semver": "^5.3.0",
+						"tar": "^4"
+					}
+				},
+				"nopt": {
+					"version": "4.0.1",
+					"bundled": true,
+					"optional": true,
+					"requires": {
+						"abbrev": "1",
+						"osenv": "^0.1.4"
+					}
+				},
+				"npm-bundled": {
+					"version": "1.0.6",
+					"bundled": true,
+					"optional": true
+				},
+				"npm-packlist": {
+					"version": "1.4.1",
+					"bundled": true,
+					"optional": true,
+					"requires": {
+						"ignore-walk": "^3.0.1",
+						"npm-bundled": "^1.0.1"
+					}
+				},
+				"npmlog": {
+					"version": "4.1.2",
+					"bundled": true,
+					"optional": true,
+					"requires": {
+						"are-we-there-yet": "~1.1.2",
+						"console-control-strings": "~1.1.0",
+						"gauge": "~2.7.3",
+						"set-blocking": "~2.0.0"
+					}
+				},
+				"number-is-nan": {
+					"version": "1.0.1",
+					"bundled": true,
+					"optional": true
+				},
+				"object-assign": {
+					"version": "4.1.1",
+					"bundled": true,
+					"optional": true
+				},
+				"once": {
+					"version": "1.4.0",
+					"bundled": true,
+					"optional": true,
+					"requires": {
+						"wrappy": "1"
+					}
+				},
+				"os-homedir": {
+					"version": "1.0.2",
+					"bundled": true,
+					"optional": true
+				},
+				"os-tmpdir": {
+					"version": "1.0.2",
+					"bundled": true,
+					"optional": true
+				},
+				"osenv": {
+					"version": "0.1.5",
+					"bundled": true,
+					"optional": true,
+					"requires": {
+						"os-homedir": "^1.0.0",
+						"os-tmpdir": "^1.0.0"
+					}
+				},
+				"path-is-absolute": {
+					"version": "1.0.1",
+					"bundled": true,
+					"optional": true
+				},
+				"process-nextick-args": {
+					"version": "2.0.0",
+					"bundled": true,
+					"optional": true
+				},
+				"rc": {
+					"version": "1.2.8",
+					"bundled": true,
+					"optional": true,
+					"requires": {
+						"deep-extend": "^0.6.0",
+						"ini": "~1.3.0",
+						"minimist": "^1.2.0",
+						"strip-json-comments": "~2.0.1"
+					},
+					"dependencies": {
+						"minimist": {
+							"version": "1.2.0",
+							"bundled": true,
+							"optional": true
+						}
+					}
+				},
+				"readable-stream": {
+					"version": "2.3.6",
+					"bundled": true,
+					"optional": true,
+					"requires": {
+						"core-util-is": "~1.0.0",
+						"inherits": "~2.0.3",
+						"isarray": "~1.0.0",
+						"process-nextick-args": "~2.0.0",
+						"safe-buffer": "~5.1.1",
+						"string_decoder": "~1.1.1",
+						"util-deprecate": "~1.0.1"
+					}
+				},
+				"rimraf": {
+					"version": "2.6.3",
+					"bundled": true,
+					"optional": true,
+					"requires": {
+						"glob": "^7.1.3"
+					}
+				},
+				"safe-buffer": {
+					"version": "5.1.2",
+					"bundled": true,
+					"optional": true
+				},
+				"safer-buffer": {
+					"version": "2.1.2",
+					"bundled": true,
+					"optional": true
+				},
+				"sax": {
+					"version": "1.2.4",
+					"bundled": true,
+					"optional": true
+				},
+				"semver": {
+					"version": "5.7.0",
+					"bundled": true,
+					"optional": true
+				},
+				"set-blocking": {
+					"version": "2.0.0",
+					"bundled": true,
+					"optional": true
+				},
+				"signal-exit": {
+					"version": "3.0.2",
+					"bundled": true,
+					"optional": true
+				},
+				"string-width": {
+					"version": "1.0.2",
+					"bundled": true,
+					"optional": true,
+					"requires": {
+						"code-point-at": "^1.0.0",
+						"is-fullwidth-code-point": "^1.0.0",
+						"strip-ansi": "^3.0.0"
+					}
+				},
+				"string_decoder": {
+					"version": "1.1.1",
+					"bundled": true,
+					"optional": true,
+					"requires": {
+						"safe-buffer": "~5.1.0"
+					}
+				},
+				"strip-ansi": {
+					"version": "3.0.1",
+					"bundled": true,
+					"optional": true,
+					"requires": {
+						"ansi-regex": "^2.0.0"
+					}
+				},
+				"strip-json-comments": {
+					"version": "2.0.1",
+					"bundled": true,
+					"optional": true
+				},
+				"tar": {
+					"version": "4.4.8",
+					"bundled": true,
+					"optional": true,
+					"requires": {
+						"chownr": "^1.1.1",
+						"fs-minipass": "^1.2.5",
+						"minipass": "^2.3.4",
+						"minizlib": "^1.1.1",
+						"mkdirp": "^0.5.0",
+						"safe-buffer": "^5.1.2",
+						"yallist": "^3.0.2"
+					}
+				},
+				"util-deprecate": {
+					"version": "1.0.2",
+					"bundled": true,
+					"optional": true
+				},
+				"wide-align": {
+					"version": "1.1.3",
+					"bundled": true,
+					"optional": true,
+					"requires": {
+						"string-width": "^1.0.2 || 2"
+					}
+				},
+				"wrappy": {
+					"version": "1.0.2",
+					"bundled": true,
+					"optional": true
+				},
+				"yallist": {
+					"version": "3.0.3",
+					"bundled": true,
+					"optional": true
+				}
+			}
+		},
 		"gcp-metadata": {
 			"version": "0.7.0",
 			"resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-0.7.0.tgz",
@@ -22613,6 +23104,11 @@
 				"wordwrap": "~0.0.2"
 			}
 		},
+		"optional": {
+			"version": "0.1.4",
+			"resolved": "https://registry.npmjs.org/optional/-/optional-0.1.4.tgz",
+			"integrity": "sha512-gtvrrCfkE08wKcgXaVwQVgwEQ8vel2dc5DDBn9RLQZ3YtmtkBss6A2HY6BnJH4N/4Ku97Ri/SF8sNWE2225WJw=="
+		},
 		"optionator": {
 			"version": "0.8.2",
 			"resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
@@ -24116,13 +24612,22 @@
 			}
 		},
 		"prom-client": {
-			"version": "11.2.0",
-			"resolved": "https://registry.npmjs.org/prom-client/-/prom-client-11.2.0.tgz",
-			"integrity": "sha512-4gUAq/GR5C8q5eWxOa7tA60AtmkMpbyBd/2btCayvd3h/7HzS0p/kESKRwggJgbFrfdhTCBpOwPAwKiI01Q0VQ==",
+			"version": "12.0.0",
+			"resolved": "https://registry.npmjs.org/prom-client/-/prom-client-12.0.0.tgz",
+			"integrity": "sha512-JbzzHnw0VDwCvoqf8y1WDtq4wSBAbthMB1pcVI/0lzdqHGJI3KBJDXle70XK+c7Iv93Gihqo0a5LlOn+g8+DrQ==",
 			"requires": {
 				"tdigest": "^0.1.1"
 			}
 		},
+		"prometheus-gc-stats": {
+			"version": "0.6.2",
+			"resolved": "https://registry.npmjs.org/prometheus-gc-stats/-/prometheus-gc-stats-0.6.2.tgz",
+			"integrity": "sha512-ABSVHkAuYrMLj1WHmlLfS0hu9Vc2ELKuecwiMWPNQom+ZNiAdcILTn5yGK7sZg2ttoWc2u++W5NjdJ3IjdYJZw==",
+			"requires": {
+				"gc-stats": "^1.2.1",
+				"optional": "^0.1.3"
+			}
+		},
 		"promise": {
 			"version": "7.3.1",
 			"resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
diff --git a/package.json b/package.json
index 4b4b4763b782..adfdfa35d76f 100644
--- a/package.json
+++ b/package.json
@@ -206,7 +206,8 @@
 		"pdfjs-dist": "^2.0.943",
 		"photoswipe": "^4.1.3",
 		"poplib": "^0.1.7",
-		"prom-client": "^11.2.0",
+		"prom-client": "^12.0.0",
+		"prometheus-gc-stats": "^0.6.2",
 		"querystring": "^0.2.0",
 		"queue-fifo": "^0.2.5",
 		"react": "^16.8.6",
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index a7312db9ed0a..04aa250198e8 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -2685,6 +2685,10 @@
   "Profile_picture": "Profile Picture",
   "Profile_saved_successfully": "Profile saved successfully",
   "Prometheus": "Prometheus",
+  "Prometheus_Reset_Interval": "Reset Interval (ms)",
+  "Prometheus_Garbage_Collector": "Collect NodeJS GC",
+  "Prometheus_Garbage_Collector_Alert": "Restart required to deactivate",
+  "Prometheus_API_User_Agent": "API: Track User Agent",
   "Protocol": "Protocol",
   "Prune": "Prune",
   "Prune_finished": "Prune finished",

From 5b1e5eac55cd890de1506747e7ae9e510a90399f Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Mon, 6 Apr 2020 22:20:00 -0300
Subject: [PATCH 164/223] Regression: fix scroll after room loads (#17188)

---
 app/ui/client/views/app/room.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/ui/client/views/app/room.js b/app/ui/client/views/app/room.js
index 435cfa4ee9db..31ddf5b53b28 100644
--- a/app/ui/client/views/app/room.js
+++ b/app/ui/client/views/app/room.js
@@ -1373,6 +1373,9 @@ Template.room.onRendered(function() {
 
 		callbacks.run('onRenderRoom', template, room);
 	});
+
+	const observer = new ResizeObserver(template.sendToBottomIfNecessary);
+	observer.observe(this.firstNode.querySelector('.wrapper ul'));
 });
 
 callbacks.add('enter-room', (sub) => {

From a5e59fb77ee0817e31cda93bbe39b00e413c4dcf Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Mon, 6 Apr 2020 23:27:53 -0300
Subject: [PATCH 165/223] Regression: Admin create user button (#17186)

---
 app/ui-admin/client/users/adminUsers.js | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/app/ui-admin/client/users/adminUsers.js b/app/ui-admin/client/users/adminUsers.js
index 090b27a2f627..eddb440a1b75 100644
--- a/app/ui-admin/client/users/adminUsers.js
+++ b/app/ui-admin/client/users/adminUsers.js
@@ -84,6 +84,24 @@ Template.adminUsers.onCreated(function() {
 		order: 3,
 	});
 
+	TabBar.addButton({
+		groups: ['admin-users'],
+		id: 'invite-user',
+		i18nTitle: 'Invite_Users',
+		icon: 'send',
+		template: 'adminInviteUser',
+		order: 1,
+	});
+
+	TabBar.addButton({
+		groups: ['admin-users'],
+		id: 'add-user',
+		i18nTitle: 'Add_User',
+		icon: 'plus',
+		template: 'adminUserEdit',
+		order: 2,
+	});
+
 	this.loadUsers = async (filter, offset) => {
 		this.ready.set(false);
 

From c40c93d57f56d580819eb55856fa1aabcbed383b Mon Sep 17 00:00:00 2001
From: Andrew McGrath <andrewjohnmcgrath@gmail.com>
Date: Mon, 6 Apr 2020 22:45:13 -0400
Subject: [PATCH 166/223] [FIX] WebRTC echo while talking (#17145)

---
 app/ui/client/views/app/videoCall/videoCall.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/ui/client/views/app/videoCall/videoCall.html b/app/ui/client/views/app/videoCall/videoCall.html
index 17ccf7d66cfd..1eb68f0c2b6e 100644
--- a/app/ui/client/views/app/videoCall/videoCall.html
+++ b/app/ui/client/views/app/videoCall/videoCall.html
@@ -7,13 +7,13 @@
 		{{#if videoActive}}
 			<div class="webrtc-video {{#if overlay}}webrtc-video-overlay{{/if}}">
 				<div class="main-video">
-					{{> rcVideo src=mainVideoUrl muted="true" screen=screenShareEnabled me=($eq mainVideoUrl selfVideoUrl)}}
+					{{> rcVideo src=mainVideoUrl muted="muted" screen=screenShareEnabled me=($eq mainVideoUrl selfVideoUrl)}}
 					<div class="background-transparent-darker">{{mainVideoUsername}}</div>
 				</div>
 				<div class="videos">
 					{{#if selfVideoUrl}}
 						<div class="video-item background-transparent-darker" data-username="$self">
-							{{> rcVideo src=selfVideoUrl me=true screen=screenShareEnabled }}
+							{{> rcVideo muted="muted" src=selfVideoUrl me=true screen=screenShareEnabled }}
 							{{#unless audioAndVideoEnabled}}
 								<div class="video-muted-overlay background-transparent-darker">
 									{{#unless audioEnabled}}

From 8f9cb65350ba89cff08c66b32342dabe3037c95c Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Mon, 6 Apr 2020 23:55:16 -0300
Subject: [PATCH 167/223] Regression: Fix auditing for Multiple Direct Messages
 (#17192)

---
 .../client/templates/audit/audit.html         |  29 +++-
 .../auditing/client/templates/audit/audit.js  | 132 ++++++++++++++++--
 ee/app/auditing/server/methods.js             |   2 +-
 3 files changed, 151 insertions(+), 12 deletions(-)

diff --git a/ee/app/auditing/client/templates/audit/audit.html b/ee/app/auditing/client/templates/audit/audit.html
index 8244dc5e2158..1493064c8eed 100644
--- a/ee/app/auditing/client/templates/audit/audit.html
+++ b/ee/app/auditing/client/templates/audit/audit.html
@@ -23,8 +23,7 @@
 			</label>
 
 			{{> auditAutocomplete key='room' hide=typeD onChange=onChange prepare=prepareRoom field='name' term='name' icon='hashtag' label="room_name" placeholder='Channel_Name_Placeholder'}}
-			{{> auditAutocomplete key='user' hide=nTypeD onChange=onChange collection='UserAndRoom' modifier=modifierUser endpoint='users.autocomplete' field='username'  icon='at' label="From" placeholder='Username_Placeholder'}}
-			{{> auditAutocomplete key='user2' hide=nTypeD  onChange=onChange collection='UserAndRoom' modifier=modifierUser endpoint='users.autocomplete' field='username' icon='at' label="To" placeholder='Username_Placeholder'}}
+			{{> auditAutocompleteDirectMessage key='users' hide=nTypeD onChange=onChange collection='UserAndRoom' modifier=modifierUser endpoint='users.autocomplete' field='username' icon='at' label="From" placeholder='Username_Placeholder'}}
 
 			<div class="rc-input rc-input--small rc-audit-date">
 				<label class="rc-input__label">
@@ -97,3 +96,29 @@
 		{{/with}}
 	</div>
 </template>
+
+<template name="auditAutocompleteDirectMessage">
+	<div id="autocomplete-{{key}}" class="rc-input {{#if hide}} hidden{{/if}}">
+		<label class="rc-input__label">
+			<div class="rc-input__title">{{_ label}}</div>
+			<div class="rc-input__wrapper">
+				<div class="rc-input__icon">
+					{{> icon block="rc-input__icon-svg" icon=icon}}
+				</div>
+				<div class="rc-tags">
+					{{#each user in selected}}
+						{{> tag user}}
+					{{/each}}
+					<input type="text" class="rc-tags__input" placeholder="{{_ placeholder}}" name="filter" autocomplete="off"/>
+				</div>
+			</div>
+		</label>
+		{{#with config}}
+			{{#if autocomplete 'isShowing'}}
+				{{#if autocomplete 'isLoaded'}}
+					{{> popupList data=config items=items}}
+				{{/if}}
+			{{/if}}
+		{{/with}}
+	</div>
+</template>
diff --git a/ee/app/auditing/client/templates/audit/audit.js b/ee/app/auditing/client/templates/audit/audit.js
index f709f8fb951f..58314a9f321b 100644
--- a/ee/app/auditing/client/templates/audit/audit.js
+++ b/ee/app/auditing/client/templates/audit/audit.js
@@ -1,3 +1,4 @@
+import { Blaze } from 'meteor/blaze';
 import { Template } from 'meteor/templating';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { FlowRouter } from 'meteor/kadira:flow-router';
@@ -44,15 +45,11 @@ Template.audit.events({
 		e.currentTarget.blur();
 
 		if (t.type.get() === 'd') {
-			if (!t.user.username) {
-				return form.querySelector('#autocomplete-user').classList.add('rc-input--error');
+			if (!t.users) {
+				return form.querySelector('#autocomplete-users').classList.add('rc-input--error');
 			}
-			form.querySelector('#autocomplete-user').classList.remove('rc-input--error');
-			if (!t.user2.username) {
-				return form.querySelector('#autocomplete-user').classList.add('rc-input--error');
-			}
-			form.querySelector('#autocomplete-user').classList.remove('rc-input--error');
-			result.users = [t.user.username, t.user2.username];
+			form.querySelector('#autocomplete-users').classList.remove('rc-input--error');
+			result.users = t.users.map((user) => user.username);
 		} else {
 			if (!t.room || !t.room._id) {
 				return form.querySelector('#autocomplete-room').classList.add('rc-input--error');
@@ -151,7 +148,7 @@ const acEvents = (key/* , variable, name*/) => ({
 	},
 	'keydown input'(e, t) {
 		if ([8, 46].includes(e.keyCode) && e.target.value === '') {
-			const users = t.selectedUsers;
+			const users = t.selected;
 			const usersArr = users.get();
 			usersArr.pop();
 			return users.set(usersArr);
@@ -169,6 +166,20 @@ const acEvents = (key/* , variable, name*/) => ({
 	},
 });
 
+Template.auditAutocompleteDirectMessage.events({
+	...acEvents('ac', 'selected'),
+	'input input'(e, t) {
+		t.filter.set(e.target.value);
+	},
+	'click .rc-tags__tag-icon'(e, t) {
+		t.selected.set();
+	},
+	'click .rc-tags__tag'({ target }, t) {
+		const { onClickTag } = t;
+		return onClickTag & onClickTag(Blaze.getData(target));
+	},
+});
+
 Template.auditAutocomplete.events({
 	...acEvents('ac', 'selected'),
 	'input input'(e, t) {
@@ -177,6 +188,41 @@ Template.auditAutocomplete.events({
 	'click .rc-tags__tag-icon'(e, t) {
 		t.selected.set();
 	},
+	'click .rc-tags__tag'({ target }, t) {
+		const { onClickTag } = t;
+		return onClickTag & onClickTag(Blaze.getData(target));
+	},
+});
+
+Template.auditAutocompleteDirectMessage.helpers({
+	selected() {
+		const instance = Template.instance();
+		const selected = instance.selected.get();
+		return selected && (instance.data.prepare ? instance.data.prepare(selected) : selected);
+	},
+	config() {
+		const { filter } = Template.instance();
+		return {
+			template_item: 'popupList_item_channel',
+			// noMatchTemplate: Template.roomSearchEmpty,
+			filter: filter.get(),
+			noMatchTemplate: 'userSearchEmpty',
+			modifier: (text) => (Template.parentData(8).modifier || function(text, filter) {
+				const f = filter.get();
+				return `#${ f.length === 0 ? text : text.replace(new RegExp(f), function(part) {
+					return `<strong>${ part }</strong>`;
+				}) }`;
+			})(text, filter),
+		};
+	},
+	autocomplete(key) {
+		const instance = Template.instance();
+		const param = instance.ac[key];
+		return typeof param === 'function' ? param.apply(instance.ac) : param;
+	},
+	items() {
+		return Template.instance().ac.filteredList();
+	},
 });
 
 Template.auditAutocomplete.helpers({
@@ -221,6 +267,37 @@ Template.auditAutocomplete.onRendered(async function() {
 	});
 });
 
+Template.auditAutocomplete.helpers({
+	selected() {
+		const instance = Template.instance();
+		const selected = instance.selected.get();
+		return selected && (instance.data.prepare ? instance.data.prepare(selected) : selected);
+	},
+	config() {
+		const { filter } = Template.instance();
+		return {
+			template_item: 'popupList_item_channel',
+			// noMatchTemplate: Template.roomSearchEmpty,
+			filter: filter.get(),
+			noMatchTemplate: 'userSearchEmpty',
+			modifier: (text) => (Template.parentData(8).modifier || function(text, filter) {
+				const f = filter.get();
+				return `#${ f.length === 0 ? text : text.replace(new RegExp(f), function(part) {
+					return `<strong>${ part }</strong>`;
+				}) }`;
+			})(text, filter),
+		};
+	},
+	autocomplete(key) {
+		const instance = Template.instance();
+		const param = instance.ac[key];
+		return typeof param === 'function' ? param.apply(instance.ac) : param;
+	},
+	items() {
+		return Template.instance().ac.filteredList();
+	},
+});
+
 const autocompleteConfig = ({
 	collection,
 	endpoint,
@@ -253,6 +330,32 @@ Template.auditAutocomplete.onCreated(function() {
 	this.filter = new ReactiveVar('');
 	this.selected = new ReactiveVar('');
 
+	this.onClickTag = () => {
+		this.selected.set('');
+	};
+
+	this.autorun(() => {
+		const value = this.selected.get();
+		this.data.onChange(value, this.data.key);
+	});
+	this.ac = new AutoComplete(autocompleteConfig({
+		field: this.data.field,
+		collection: this.data.collection || 'CachedChannelList',
+		endpoint: this.data.endpoint || 'rooms.autocomplete.channelAndPrivate',
+		term: this.data.term || 'term',
+	}));
+	this.ac.tmplInst = this;
+});
+
+
+Template.auditAutocompleteDirectMessage.onCreated(function() {
+	this.filter = new ReactiveVar('');
+	this.selected = new ReactiveVar([]);
+
+	this.onClickTag = ({ username }) => {
+		this.selected.set(this.selected.get().filter((user) => user.username !== username));
+	};
+
 	this.autorun(() => {
 		const value = this.selected.get();
 		this.data.onChange(value, this.data.key);
@@ -265,3 +368,14 @@ Template.auditAutocomplete.onCreated(function() {
 	}));
 	this.ac.tmplInst = this;
 });
+
+Template.auditAutocompleteDirectMessage.onRendered(async function() {
+	const { selected } = this;
+
+	this.ac.element = this.firstNode.querySelector('input');
+	this.ac.$element = $(this.ac.element);
+
+	this.ac.$element.on('autocompleteselect', function(e, { item }) {
+		selected.set([...selected.get(), item]);
+	});
+});
diff --git a/ee/app/auditing/server/methods.js b/ee/app/auditing/server/methods.js
index 6bb38d90b84d..ea2fb997f87d 100644
--- a/ee/app/auditing/server/methods.js
+++ b/ee/app/auditing/server/methods.js
@@ -17,7 +17,7 @@ Meteor.methods({
 			throw new Meteor.Error('Not allowed');
 		}
 
-		const room = !rid ? Rooms.findOne({ t: 'd', usernames: { $all: users } }) : Rooms.findOne({ _id: rid });
+		const room = !rid ? Rooms.findDirectRoomContainingAllUsernames(users) : Rooms.findOne({ _id: rid });
 		if (!room) {
 			throw new Meteor.Error('Room doesn`t exist');
 		}

From 3cb432da4751ab8fe8a6e012f63d95fb00891593 Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Mon, 6 Apr 2020 23:55:39 -0300
Subject: [PATCH 168/223] [IMPROVE] Change sidebar sort mode to activity by
 default (#17189)

---
 app/discussion/client/views/DiscussionList.js |  2 +-
 app/lib/server/startup/settings.js            | 18 ++++++++++++++++++
 app/ui-sidenav/client/SortList.js             |  2 +-
 app/ui-sidenav/client/roomList.js             |  2 +-
 tests/end-to-end/api/00-miscellaneous.js      |  2 +-
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/discussion/client/views/DiscussionList.js b/app/discussion/client/views/DiscussionList.js
index b17b5fe66880..f4b5f6634bca 100644
--- a/app/discussion/client/views/DiscussionList.js
+++ b/app/discussion/client/views/DiscussionList.js
@@ -10,7 +10,7 @@ import './DiscussionList.html';
 Template.DiscussionList.helpers({
 	rooms() {
 		const user = Meteor.userId();
-		const sortBy = getUserPreference(user, 'sidebarSortby') || 'alphabetical';
+		const sortBy = getUserPreference(user, 'sidebarSortby') || 'activity';
 		const query = {
 			open: true,
 		};
diff --git a/app/lib/server/startup/settings.js b/app/lib/server/startup/settings.js
index f395501d02eb..19b8c7283376 100644
--- a/app/lib/server/startup/settings.js
+++ b/app/lib/server/startup/settings.js
@@ -381,11 +381,29 @@ settings.addGroup('Accounts', function() {
 			public: true,
 			i18nLabel: 'Hide_Avatars_Sidebar',
 		});
+
 		this.add('Accounts_Default_User_Preferences_sidebarShowUnread', false, {
 			type: 'boolean',
 			public: true,
 			i18nLabel: 'Unread_on_top',
 		});
+
+		this.add('Accounts_Default_User_Preferences_sidebarSortby', 'activity', {
+			type: 'select',
+			values: [
+				{
+					key: 'activity',
+					i18nLabel: 'Activity',
+				},
+				{
+					key: 'alphabetical',
+					i18nLabel: 'Alphabetical',
+				},
+			],
+			public: true,
+			i18nLabel: 'Sort_By',
+		});
+
 		this.add('Accounts_Default_User_Preferences_sidebarShowFavorites', true, {
 			type: 'boolean',
 			public: true,
diff --git a/app/ui-sidenav/client/SortList.js b/app/ui-sidenav/client/SortList.js
index bd089abb2116..75fbc3221115 100644
--- a/app/ui-sidenav/client/SortList.js
+++ b/app/ui-sidenav/client/SortList.js
@@ -45,7 +45,7 @@ SortList.displayName = 'SortList';
 function SortModeList() {
 	const t = useTranslation();
 	const saveUserPreferences = useMethod('saveUserPreferences');
-	const sidebarSortBy = useUserPreference('sidebarSortby', 'alphabetical');
+	const sidebarSortBy = useUserPreference('sidebarSortby', 'activity');
 
 	const handleChange = (value) => () => saveUserPreferences({ sidebarSortby: value });
 
diff --git a/app/ui-sidenav/client/roomList.js b/app/ui-sidenav/client/roomList.js
index 23c0661a30a0..f6a062df8d7d 100644
--- a/app/ui-sidenav/client/roomList.js
+++ b/app/ui-sidenav/client/roomList.js
@@ -30,7 +30,7 @@ Template.roomList.helpers({
 			},
 		});
 
-		const sortBy = getUserPreference(user, 'sidebarSortby') || 'alphabetical';
+		const sortBy = getUserPreference(user, 'sidebarSortby') || 'activity';
 		const query = {
 			open: true,
 		};
diff --git a/tests/end-to-end/api/00-miscellaneous.js b/tests/end-to-end/api/00-miscellaneous.js
index b4ff715ae1fd..a514b3cd7b7c 100644
--- a/tests/end-to-end/api/00-miscellaneous.js
+++ b/tests/end-to-end/api/00-miscellaneous.js
@@ -137,7 +137,7 @@ describe('miscellaneous', function() {
 					'idleTimeLimit',
 					'sidebarShowFavorites',
 					'sidebarShowUnread',
-					// 'sidebarSortby',
+					'sidebarSortby',
 					'sidebarViewMode',
 					'sidebarHideAvatar',
 					'sidebarGroupByType',

From 1ab3ae48699187fcbb1071021ec446aa3d7db584 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Tue, 7 Apr 2020 00:35:43 -0300
Subject: [PATCH 169/223] Add wrapper to make Meteor methods calls over REST
 (#17092)

---
 app/api/server/api.js                         |  6 +-
 app/api/server/settings.js                    |  6 ++
 app/api/server/v1/misc.js                     | 55 ++++++++++++++++
 .../client/views/app/tabbar/visitorInfo.js    |  2 +-
 .../client/models/CachedCollection.js         |  8 +--
 app/ui-master/server/inject.js                |  7 ++
 app/ui-utils/client/lib/RoomManager.js        |  4 +-
 app/utils/stream/constants.js                 |  2 +-
 client/lib/meteorCallWrapper.ts               | 65 +++++++++++++++++++
 client/main.js                                |  1 +
 client/meteor.d.ts                            | 28 ++++++++
 client/window.d.ts                            |  8 +++
 packages/rocketchat-i18n/i18n/en.i18n.json    |  2 +
 server/main.d.ts                              |  9 +++
 server/stream/rooms/index.js                  | 14 ++--
 15 files changed, 195 insertions(+), 22 deletions(-)
 create mode 100644 client/lib/meteorCallWrapper.ts
 create mode 100644 client/meteor.d.ts
 create mode 100644 client/window.d.ts

diff --git a/app/api/server/api.js b/app/api/server/api.js
index 8c5f77b7fd0b..d62382af8755 100644
--- a/app/api/server/api.js
+++ b/app/api/server/api.js
@@ -326,9 +326,9 @@ export class APIClass extends Restivus {
 					});
 
 					logger.debug(`${ this.request.method.toUpperCase() }: ${ this.request.url }`);
-					const requestIp = getRequestIP(this.request);
+					this.requestIp = getRequestIP(this.request);
 					const objectForRateLimitMatch = {
-						IPAddr: requestIp,
+						IPAddr: this.requestIp,
 						route: `${ this.request.route }${ this.request.method.toLowerCase() }`,
 					};
 					let result;
@@ -338,7 +338,7 @@ export class APIClass extends Restivus {
 						close() {},
 						token: this.token,
 						httpHeaders: this.request.headers,
-						clientAddress: requestIp,
+						clientAddress: this.requestIp,
 					};
 
 					try {
diff --git a/app/api/server/settings.js b/app/api/server/settings.js
index f4a7413a8fb9..9f775d2b73ca 100644
--- a/app/api/server/settings.js
+++ b/app/api/server/settings.js
@@ -11,5 +11,11 @@ settings.addGroup('General', function() {
 		this.add('API_Shield_user_require_auth', false, { type: 'boolean', public: false, enableQuery: { _id: 'API_Enable_Shields', value: true } });
 		this.add('API_Enable_CORS', false, { type: 'boolean', public: false });
 		this.add('API_CORS_Origin', '*', { type: 'string', public: false, enableQuery: { _id: 'API_Enable_CORS', value: true } });
+
+		this.add('API_Use_REST_For_DDP_Calls', false, {
+			type: 'boolean',
+			public: true,
+			alert: 'API_Use_REST_For_DDP_Calls_Alert',
+		});
 	});
 });
diff --git a/app/api/server/v1/misc.js b/app/api/server/v1/misc.js
index 4caefb489221..b975ab1201b2 100644
--- a/app/api/server/v1/misc.js
+++ b/app/api/server/v1/misc.js
@@ -1,6 +1,10 @@
+import crypto from 'crypto';
+
 import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
+import { EJSON } from 'meteor/ejson';
+import { DDPRateLimiter } from 'meteor/ddp-rate-limiter';
 import s from 'underscore.string';
 
 import { hasRole, hasPermission } from '../../../authorization/server';
@@ -216,3 +220,54 @@ API.v1.addRoute('stdout.queue', { authRequired: true }, {
 		return API.v1.success({ queue: StdOut.queue });
 	},
 });
+
+const mountResult = ({ id, error, result }) => ({
+	message: EJSON.stringify({
+		msg: 'result',
+		id,
+		error,
+		result,
+	}),
+});
+
+const methodCall = () => ({
+	post() {
+		check(this.bodyParams, {
+			message: String,
+		});
+
+		const { method, params, id } = EJSON.parse(this.bodyParams.message);
+
+		const connectionId = this.token || crypto.createHash('md5').update(this.requestIp + this.request.headers['user-agent']).digest('hex');
+
+		const rateLimiterInput = {
+			userId: this.userId,
+			clientAddress: this.requestIp,
+			type: 'method',
+			name: method,
+			connectionId,
+		};
+
+		try {
+			DDPRateLimiter._increment(rateLimiterInput);
+			const rateLimitResult = DDPRateLimiter._check(rateLimiterInput);
+			if (!rateLimitResult.allowed) {
+				throw new Meteor.Error(
+					'too-many-requests',
+					DDPRateLimiter.getErrorMessage(rateLimitResult),
+					{ timeToReset: rateLimitResult.timeToReset },
+				);
+			}
+
+			const result = Meteor.call(method, ...params);
+			return API.v1.success(mountResult({ id, result }));
+		} catch (error) {
+			return API.v1.success(mountResult({ id, error }));
+		}
+	},
+});
+
+// had to create two different endpoints for authenticated and non-authenticated calls
+// because restivus does not provide 'this.userId' if 'authRequired: false'
+API.v1.addRoute('method.call/:method', { authRequired: true, rateLimiterOptions: false }, methodCall());
+API.v1.addRoute('method.callAnon/:method', { authRequired: false, rateLimiterOptions: false }, methodCall());
diff --git a/app/livechat/client/views/app/tabbar/visitorInfo.js b/app/livechat/client/views/app/tabbar/visitorInfo.js
index 3ebc6cc66a46..24de8917bcee 100644
--- a/app/livechat/client/views/app/tabbar/visitorInfo.js
+++ b/app/livechat/client/views/app/tabbar/visitorInfo.js
@@ -344,8 +344,8 @@ Template.visitorInfo.onCreated(function() {
 	};
 
 	if (rid) {
-		loadRoomData(rid);
 		RoomManager.roomStream.on(rid, this.updateRoom);
+		loadRoomData(rid);
 	}
 
 	this.autorun(async () => {
diff --git a/app/ui-cached-collection/client/models/CachedCollection.js b/app/ui-cached-collection/client/models/CachedCollection.js
index f6c21c91049a..59929c54ce0f 100644
--- a/app/ui-cached-collection/client/models/CachedCollection.js
+++ b/app/ui-cached-collection/client/models/CachedCollection.js
@@ -11,7 +11,7 @@ import EventEmitter from 'wolfy87-eventemitter';
 import { callbacks } from '../../../callbacks';
 import Notifications from '../../../notifications/client/lib/Notifications';
 import { getConfig } from '../../../ui-utils/client/config';
-
+import { callMethod } from '../../../ui-utils/client/lib/callMethod';
 
 const fromEntries = Object.fromEntries || function fromEntries(iterable) {
 	return [...iterable].reduce((obj, { 0: key, 1: val }) => Object.assign(obj, { [key]: val }), {});
@@ -26,8 +26,6 @@ const wrap = (fn) => (...args) => new Promise((resolve, reject) => {
 	});
 });
 
-const call = wrap(Meteor.call);
-
 const localforageGetItem = wrap(localforage.getItem);
 
 class CachedCollectionManagerClass extends EventEmitter {
@@ -219,7 +217,7 @@ export class CachedCollection extends EventEmitter {
 	async loadFromServer() {
 		const startTime = new Date();
 		const lastTime = this.updatedAt;
-		const data = await call(this.methodName);
+		const data = await callMethod(this.methodName);
 		this.log(`${ data.length } records loaded from server`);
 		data.forEach((record) => {
 			callbacks.run(`cachedCollection-loadFromServer-${ this.name }`, record, 'changed');
@@ -316,7 +314,7 @@ export class CachedCollection extends EventEmitter {
 
 		this.log(`syncing from ${ this.updatedAt }`);
 
-		const data = await call(this.syncMethodName, this.updatedAt);
+		const data = await callMethod(this.syncMethodName, this.updatedAt);
 		let changes = [];
 
 		if (data.update && data.update.length > 0) {
diff --git a/app/ui-master/server/inject.js b/app/ui-master/server/inject.js
index 8b0e6b4c45fb..62b08f405849 100644
--- a/app/ui-master/server/inject.js
+++ b/app/ui-master/server/inject.js
@@ -51,6 +51,13 @@ Meteor.startup(() => {
 		`);
 	}
 
+	settings.get('API_Use_REST_For_DDP_Calls', (key, value) => {
+		if (!value) {
+			return injectIntoHead(key, '');
+		}
+		injectIntoHead(key, '<script>window.USE_REST_FOR_DDP_CALLS = true;</script>');
+	});
+
 	settings.get('Assets_SvgFavicon_Enable', (key, value) => {
 		const standardFavicons = `
 			<link rel="icon" sizes="16x16" type="image/png" href="assets/favicon_16.png" />
diff --git a/app/ui-utils/client/lib/RoomManager.js b/app/ui-utils/client/lib/RoomManager.js
index 0a9460c01b28..e6dfae8be3c4 100644
--- a/app/ui-utils/client/lib/RoomManager.js
+++ b/app/ui-utils/client/lib/RoomManager.js
@@ -15,7 +15,7 @@ import { Notifications } from '../../../notifications';
 import { CachedChatRoom, ChatMessage, ChatSubscription, CachedChatSubscription } from '../../../models';
 import { CachedCollectionManager } from '../../../ui-cached-collection';
 import { getConfig } from '../config';
-import { ROOM_DATA_STREAM_OBSERVER } from '../../../utils/stream/constants';
+import { ROOM_DATA_STREAM } from '../../../utils/stream/constants';
 
 import { call } from '..';
 
@@ -45,7 +45,7 @@ const onDeleteMessageBulkStream = ({ rid, ts, excludePinned, ignoreDiscussion, u
 export const RoomManager = new function() {
 	const openedRooms = {};
 	const msgStream = new Meteor.Streamer('room-messages');
-	const roomStream = new Meteor.Streamer(ROOM_DATA_STREAM_OBSERVER);
+	const roomStream = new Meteor.Streamer(ROOM_DATA_STREAM);
 	const onlineUsers = new ReactiveVar({});
 	const Dep = new Tracker.Dependency();
 	const Cls = class {
diff --git a/app/utils/stream/constants.js b/app/utils/stream/constants.js
index 5ae53cc865b8..9f8587b17dee 100644
--- a/app/utils/stream/constants.js
+++ b/app/utils/stream/constants.js
@@ -1 +1 @@
-export const ROOM_DATA_STREAM_OBSERVER = 'room-data-observer';
+export const ROOM_DATA_STREAM = 'room-data';
diff --git a/client/lib/meteorCallWrapper.ts b/client/lib/meteorCallWrapper.ts
new file mode 100644
index 000000000000..9feea5cfbb53
--- /dev/null
+++ b/client/lib/meteorCallWrapper.ts
@@ -0,0 +1,65 @@
+import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
+import { DDPCommon } from 'meteor/ddp-common';
+
+import { APIClient } from '../../app/utils/client';
+
+const bypassMethods: string[] = [
+	'setUserStatus',
+];
+
+function shouldBypass({ method, params }: Meteor.IDDPMessage): boolean {
+	if (method === 'login' && params[0]?.resume) {
+		return true;
+	}
+
+	if (method.startsWith('UserPresence:') || bypassMethods.includes(method)) {
+		return true;
+	}
+
+	if (method.startsWith('stream-')) {
+		return true;
+	}
+
+	return false;
+}
+
+function wrapMeteorDDPCalls(): void {
+	const { _send } = Meteor.connection;
+
+	Meteor.connection._send = function _DDPSendOverREST(message): void {
+		if (message.msg !== 'method' || shouldBypass(message)) {
+			return _send.call(Meteor.connection, message);
+		}
+
+		const endpoint = Tracker.nonreactive(() => (!Meteor.userId() ? 'method.callAnon' : 'method.call'));
+
+		const restParams = {
+			message: DDPCommon.stringifyDDP(message),
+		};
+
+		const processResult = (_message: any): void => {
+			Meteor.connection._livedata_data({
+				msg: 'updated',
+				methods: [message.id],
+			});
+			Meteor.connection.onMessage(_message);
+		};
+
+		APIClient.v1.post(`${ endpoint }/${ encodeURIComponent(message.method) }`, restParams)
+			.then(({ message: _message }) => {
+				processResult(_message);
+				if (message.method === 'login') {
+					const parsedMessage = DDPCommon.parseDDP(_message);
+					if (parsedMessage.result?.token) {
+						Meteor.loginWithToken(parsedMessage.result.token);
+					}
+				}
+			})
+			.catch((error) => {
+				console.error(error);
+			});
+	};
+}
+
+window.USE_REST_FOR_DDP_CALLS && wrapMeteorDDPCalls();
diff --git a/client/main.js b/client/main.js
index 33ce4ec3a119..bf3471094d55 100644
--- a/client/main.js
+++ b/client/main.js
@@ -1,6 +1,7 @@
 import '@rocket.chat/fuselage-polyfills';
 import 'url-polyfill';
 
+import './lib/meteorCallWrapper';
 import './importsCss';
 import './importPackages';
 import '../imports/startup/client';
diff --git a/client/meteor.d.ts b/client/meteor.d.ts
new file mode 100644
index 000000000000..023a7d17e689
--- /dev/null
+++ b/client/meteor.d.ts
@@ -0,0 +1,28 @@
+/* eslint-disable @typescript-eslint/camelcase */
+import { EJSON } from 'meteor/ejson';
+
+declare module 'meteor/meteor' {
+	namespace Meteor {
+		interface IDDPMessage {
+			msg: 'method';
+			method: string;
+			params: EJSON[];
+			id: string;
+		}
+
+		interface IDDPUpdatedMessage {
+			msg: 'updated';
+			methods: string[];
+		}
+
+		interface IMeteorConnection {
+			_send(message: IDDPMessage): void;
+
+			_livedata_data(message: IDDPUpdatedMessage): void;
+
+			onMessage(message: string): void;
+		}
+
+		const connection: IMeteorConnection;
+	}
+}
diff --git a/client/window.d.ts b/client/window.d.ts
new file mode 100644
index 000000000000..fec2a52813a7
--- /dev/null
+++ b/client/window.d.ts
@@ -0,0 +1,8 @@
+export {};
+
+declare global {
+	// eslint-disable-next-line @typescript-eslint/interface-name-prefix
+	interface Window {
+		USE_REST_FOR_DDP_CALLS?: boolean;
+	}
+}
diff --git a/packages/rocketchat-i18n/i18n/en.i18n.json b/packages/rocketchat-i18n/i18n/en.i18n.json
index 04aa250198e8..bef4385c60a0 100644
--- a/packages/rocketchat-i18n/i18n/en.i18n.json
+++ b/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -359,6 +359,8 @@
   "API_Tokenpass_URL_Description": "Example: https://domain.com (excluding trailing slash)",
   "API_Upper_Count_Limit": "Max Record Amount",
   "API_Upper_Count_Limit_Description": "What is the maximum number of records the REST API should return (when not unlimited)?",
+  "API_Use_REST_For_DDP_Calls": "Use REST instead of websocket for Meteor calls",
+  "API_Use_REST_For_DDP_Calls_Alert": "This is an experimental and temporary feature. It forces web client and mobile app to use REST requests instead of using websockets for Meteor method calls.",
   "API_User_Limit": "User Limit for Adding All Users to Channel",
   "API_Wordpress_URL": "WordPress URL",
   "Apiai_Key": "Api.ai Key",
diff --git a/server/main.d.ts b/server/main.d.ts
index f248e333a28a..16772014e5f6 100644
--- a/server/main.d.ts
+++ b/server/main.d.ts
@@ -1,3 +1,5 @@
+import { EJSON } from 'meteor/ejson';
+
 /* eslint-disable @typescript-eslint/interface-name-prefix */
 declare module 'meteor/random' {
 	namespace Random {
@@ -33,6 +35,13 @@ declare module 'meteor/meteor' {
 	}
 }
 
+declare module 'meteor/ddp-common' {
+	namespace DDPCommon {
+		function stringifyDDP(msg: EJSON): string;
+		function parseDDP(msg: string): EJSON;
+	}
+}
+
 declare module 'meteor/rocketchat:tap-i18n' {
 	namespace TAPi18n {
 		function __(s: string, options: { lng: string }): string;
diff --git a/server/stream/rooms/index.js b/server/stream/rooms/index.js
index 5b33c403111c..7ea683f290a2 100644
--- a/server/stream/rooms/index.js
+++ b/server/stream/rooms/index.js
@@ -1,11 +1,9 @@
 import { Meteor } from 'meteor/meteor';
 
 import { roomTypes } from '../../../app/utils';
-import { ROOM_DATA_STREAM_OBSERVER } from '../../../app/utils/stream/constants';
+import { ROOM_DATA_STREAM } from '../../../app/utils/stream/constants';
 
-export const roomDataStream = new Meteor.Streamer(ROOM_DATA_STREAM_OBSERVER);
-
-const isEmitAllowed = (t) => roomTypes.getConfig(t).isEmitAllowed();
+export const roomDataStream = new Meteor.Streamer(ROOM_DATA_STREAM);
 
 roomDataStream.allowWrite('none');
 
@@ -16,11 +14,7 @@ roomDataStream.allowRead(function(rid) {
 			return false;
 		}
 
-		if (isEmitAllowed(room.t) === false) {
-			return false;
-		}
-
-		return true;
+		return roomTypes.getConfig(room.t).isEmitAllowed();
 	} catch (error) {
 		return false;
 	}
@@ -31,7 +25,7 @@ export function emitRoomDataEvent(id, data) {
 		return;
 	}
 
-	if (isEmitAllowed(data.t) === false) {
+	if (!roomTypes.getConfig(data.t).isEmitAllowed()) {
 		return;
 	}
 

From d86587a225f4f4295c114442b06eb22130b19ec0 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 7 Apr 2020 00:36:15 -0300
Subject: [PATCH 170/223] [IMPROVE] Increase the push throughput to prevent
 queuing (#17194)

---
 app/lib/server/startup/settings.js       |  4 ++--
 server/lib/{cordova.js => pushConfig.js} |  0
 server/main.js                           |  2 +-
 server/startup/migrations/index.js       |  1 +
 server/startup/migrations/v181.js        | 18 ++++++++++++++++++
 5 files changed, 22 insertions(+), 3 deletions(-)
 rename server/lib/{cordova.js => pushConfig.js} (100%)
 create mode 100644 server/startup/migrations/v181.js

diff --git a/app/lib/server/startup/settings.js b/app/lib/server/startup/settings.js
index 19b8c7283376..f067b03c12b3 100644
--- a/app/lib/server/startup/settings.js
+++ b/app/lib/server/startup/settings.js
@@ -1193,7 +1193,7 @@ settings.addGroup('Push', function() {
 			value: true,
 		},
 	});
-	this.add('Push_send_interval', 5000, {
+	this.add('Push_send_interval', 2000, {
 		type: 'int',
 		public: true,
 		alert: 'Push_Setting_Requires_Restart_Alert',
@@ -1202,7 +1202,7 @@ settings.addGroup('Push', function() {
 			value: true,
 		},
 	});
-	this.add('Push_send_batch_size', 10, {
+	this.add('Push_send_batch_size', 100, {
 		type: 'int',
 		public: true,
 		alert: 'Push_Setting_Requires_Restart_Alert',
diff --git a/server/lib/cordova.js b/server/lib/pushConfig.js
similarity index 100%
rename from server/lib/cordova.js
rename to server/lib/pushConfig.js
diff --git a/server/main.js b/server/main.js
index b096109e3e92..fd0439b8d890 100644
--- a/server/main.js
+++ b/server/main.js
@@ -5,7 +5,7 @@ import '../lib/RegExp';
 
 import '../ee/server';
 import './lib/accounts';
-import './lib/cordova';
+import './lib/pushConfig';
 import './lib/roomFiles';
 import './startup/migrations';
 import './startup/appcache';
diff --git a/server/startup/migrations/index.js b/server/startup/migrations/index.js
index da1f016bf8f2..6eca0c2df49a 100644
--- a/server/startup/migrations/index.js
+++ b/server/startup/migrations/index.js
@@ -178,4 +178,5 @@ import './v177';
 import './v178';
 import './v179';
 import './v180';
+import './v181';
 import './xrun';
diff --git a/server/startup/migrations/v181.js b/server/startup/migrations/v181.js
new file mode 100644
index 000000000000..4d00b5ab7397
--- /dev/null
+++ b/server/startup/migrations/v181.js
@@ -0,0 +1,18 @@
+import { Push } from 'meteor/rocketchat:push';
+
+import { Migrations } from '../../../app/migrations/server';
+import { Settings } from '../../../app/models/server';
+
+Migrations.add({
+	version: 181,
+	async up() {
+		Settings.update({ _id: 'Push_send_interval', value: 5000 }, { $set: { value: 2000 } });
+		Settings.update({ _id: 'Push_send_batch_size', value: 10 }, { $set: { value: 100 } });
+
+		const date = new Date();
+		date.setHours(date.getHours() - 2); // 2 hours ago;
+
+		// Remove all records older than 2h
+		await Push.notifications.rawCollection().removeMany({ createdAt: { $lt: date } });
+	},
+});

From 2a091fa4a4bd610dd3f54aa166b3c02c295ce02f Mon Sep 17 00:00:00 2001
From: Guilherme Gazzo <guilhermegazzo@gmail.com>
Date: Tue, 7 Apr 2020 00:43:10 -0300
Subject: [PATCH 171/223] Regression: Fix calling readmessage after mark as
 unread (#17193)

---
 app/ui/client/views/app/room.js  | 8 ++++++++
 app/utils/lib/RoomTypesCommon.js | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/app/ui/client/views/app/room.js b/app/ui/client/views/app/room.js
index 31ddf5b53b28..188132a18ccf 100644
--- a/app/ui/client/views/app/room.js
+++ b/app/ui/client/views/app/room.js
@@ -1291,6 +1291,14 @@ Template.room.onRendered(function() {
 	}, 500);
 
 	this.autorun(() => {
+		if (!Object.values(roomTypes.roomTypes).map(({ route }) => route && route.name).filter(Boolean).includes(FlowRouter.getRouteName())) {
+			return;
+		}
+
+		if (rid !== Session.get('openedRoom')) {
+			return;
+		}
+
 		const subscription = Subscriptions.findOne({ rid }, { fields: { alert: 1, unread: 1 } });
 		read();
 		return subscription && (subscription.alert || subscription.unread) && readMessage.refreshUnreadMark(rid);
diff --git a/app/utils/lib/RoomTypesCommon.js b/app/utils/lib/RoomTypesCommon.js
index 7125764139f1..887ae2fae62a 100644
--- a/app/utils/lib/RoomTypesCommon.js
+++ b/app/utils/lib/RoomTypesCommon.js
@@ -1,4 +1,5 @@
 import { Meteor } from 'meteor/meteor';
+import { Session } from 'meteor/session';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 
 import { RoomTypeConfig } from './RoomTypeConfig';
@@ -46,6 +47,7 @@ export class RoomTypesCommon {
 			const routeConfig = {
 				name: roomConfig.route.name,
 				action: roomConfig.route.action,
+				triggersExit: [() => Session.set('openedRoom', '')],
 			};
 
 			if (Meteor.isClient) {

From 757c473942bc7a5dfbca3655b92eddbd85a31dbb Mon Sep 17 00:00:00 2001
From: Marcos Spessatto Defendi <marcos.defendi@ulbra.inf.br>
Date: Tue, 7 Apr 2020 02:17:45 -0300
Subject: [PATCH 172/223] [IMPROVE] First data load from existing data on
 engagement dashboard (#17035)

---
 app/models/server/index.js                    |  2 +
 app/models/server/raw/Analytics.js            |  4 ++
 app/models/server/raw/Messages.js             | 66 +++++++++++++++++++
 app/models/server/raw/Users.js                | 45 +++++++++++++
 .../components/Directory/DirectoryTable.js    |  2 +-
 .../components/EngagementDashboardRoute.js    |  1 +
 .../MessagesTab/MessagesSentSection.js        | 12 ++--
 .../UsersTab/BusiestChatTimesSection.js       | 13 ++--
 .../components/UsersTab/NewUsersSection.js    |  4 +-
 ee/app/engagement-dashboard/client/routes.js  | 51 ++++----------
 ee/app/engagement-dashboard/server/index.js   | 10 +++
 .../server/lib/messages.js                    | 31 +++++++--
 .../engagement-dashboard/server/lib/users.js  | 25 +++++--
 server/startup/migrations/index.js            |  1 +
 server/startup/migrations/v182.js             |  9 +++
 15 files changed, 213 insertions(+), 63 deletions(-)
 create mode 100644 server/startup/migrations/v182.js

diff --git a/app/models/server/index.js b/app/models/server/index.js
index f7bbb89c97a8..911268506af1 100644
--- a/app/models/server/index.js
+++ b/app/models/server/index.js
@@ -38,6 +38,7 @@ import LivechatAgentActivity from './models/LivechatAgentActivity';
 import LivechatInquiry from './models/LivechatInquiry';
 import ReadReceipts from './models/ReadReceipts';
 import LivechatExternalMessage from './models/LivechatExternalMessages';
+import Analytics from './models/Analytics';
 
 export { AppsLogsModel } from './models/apps-logs-model';
 export { AppsPersistenceModel } from './models/apps-persistence-model';
@@ -88,4 +89,5 @@ export {
 	ReadReceipts,
 	LivechatExternalMessage,
 	LivechatInquiry,
+	Analytics,
 };
diff --git a/app/models/server/raw/Analytics.js b/app/models/server/raw/Analytics.js
index 7544d897fbd7..9fc929795f2b 100644
--- a/app/models/server/raw/Analytics.js
+++ b/app/models/server/raw/Analytics.js
@@ -140,6 +140,10 @@ export class AnalyticsRaw extends BaseRaw {
 		}
 		return this.col.aggregate(params).toArray();
 	}
+
+	findByTypeBeforeDate({ type, date }) {
+		return this.find({ type, date: { $lte: date } });
+	}
 }
 
 export default new AnalyticsRaw(Analytics.model.rawCollection());
diff --git a/app/models/server/raw/Messages.js b/app/models/server/raw/Messages.js
index fcda4e0c85ca..6326293c4142 100644
--- a/app/models/server/raw/Messages.js
+++ b/app/models/server/raw/Messages.js
@@ -106,4 +106,70 @@ export class MessagesRaw extends BaseRaw {
 		}
 		return this.col.aggregate(params, { allowDiskUse: true });
 	}
+
+	getTotalOfMessagesSentByDate({ start, end, options = {} }) {
+		const params = [
+			{ $match: { t: { $exists: false }, ts: { $gte: start, $lte: end } } },
+			{
+				$lookup: {
+					from: 'rocketchat_room',
+					localField: 'rid',
+					foreignField: '_id',
+					as: 'room',
+				},
+			},
+			{
+				$unwind: {
+					path: '$room',
+				},
+			},
+			{
+				$group: {
+					_id: {
+						_id: '$room._id',
+						name: {
+							$cond: [{ $ifNull: ['$room.fname', false] },
+								'$room.fname',
+								'$room.name'],
+						},
+						t: '$room.t',
+						usernames: {
+							$cond: [{ $ifNull: ['$room.usernames', false] },
+								'$room.usernames',
+								[]],
+						},
+						date: {
+							$concat: [
+								{ $substr: ['$ts', 0, 4] },
+								{ $substr: ['$ts', 5, 2] },
+								{ $substr: ['$ts', 8, 2] },
+							],
+						},
+					},
+					messages: { $sum: 1 },
+				},
+			},
+			{
+				$project: {
+					_id: 0,
+					date: { $toInt: '$_id.date' },
+					room: {
+						_id: '$_id._id',
+						name: '$_id.name',
+						t: '$_id.t',
+						usernames: '$_id.usernames',
+					},
+					type: 'messages',
+					messages: 1,
+				},
+			},
+		];
+		if (options.sort) {
+			params.push({ $sort: options.sort });
+		}
+		if (options.count) {
+			params.push({ $limit: options.count });
+		}
+		return this.col.aggregate(params).toArray();
+	}
 }
diff --git a/app/models/server/raw/Users.js b/app/models/server/raw/Users.js
index fcb6b9955bce..f42be432eb21 100644
--- a/app/models/server/raw/Users.js
+++ b/app/models/server/raw/Users.js
@@ -215,6 +215,51 @@ export class UsersRaw extends BaseRaw {
 		return this.col.aggregate(params).toArray();
 	}
 
+	getTotalOfRegisteredUsersByDate({ start, end, options = {} }) {
+		const params = [
+			{
+				$match: {
+					createdAt: { $gte: start, $lte: end },
+				},
+			},
+			{
+				$group: {
+					_id: {
+						$concat: [
+							{ $substr: ['$createdAt', 0, 4] },
+							{ $substr: ['$createdAt', 5, 2] },
+							{ $substr: ['$createdAt', 8, 2] },
+						],
+					},
+					users: { $sum: 1 },
+				},
+			},
+			{
+				$group: {
+					_id: {
+						$toInt: '$_id',
+					},
+					users: { $sum: '$users' },
+				},
+			},
+			{
+				$project: {
+					_id: 0,
+					date: '$_id',
+					users: 1,
+					type: 'users',
+				},
+			},
+		];
+		if (options.sort) {
+			params.push({ $sort: options.sort });
+		}
+		if (options.count) {
+			params.push({ $limit: options.count });
+		}
+		return this.col.aggregate(params).toArray();
+	}
+
 	updateStatusText(_id, statusText) {
 		const update = {
 			$set: {
diff --git a/app/ui/client/views/app/components/Directory/DirectoryTable.js b/app/ui/client/views/app/components/Directory/DirectoryTable.js
index 44ea34de3350..09925c92e407 100644
--- a/app/ui/client/views/app/components/Directory/DirectoryTable.js
+++ b/app/ui/client/views/app/components/Directory/DirectoryTable.js
@@ -79,7 +79,7 @@ export function DirectoryTable({
 	return <>
 		<Flex.Container direction='column'>
 			<Box>
-				<Box mb='x16' display='flex'>
+				<Box mb='x16' display='flex' flexDirection='column'>
 					<TextInput placeholder={searchPlaceholder} addon={<Icon name='magnifier' size='x20'/>} onChange={handleChange} value={text} />
 				</Box>
 				{channels && !channels.length
diff --git a/ee/app/engagement-dashboard/client/components/EngagementDashboardRoute.js b/ee/app/engagement-dashboard/client/components/EngagementDashboardRoute.js
index 4d232810240a..1761ddfdd81c 100644
--- a/ee/app/engagement-dashboard/client/components/EngagementDashboardRoute.js
+++ b/ee/app/engagement-dashboard/client/components/EngagementDashboardRoute.js
@@ -22,3 +22,4 @@ export function EngagementDashboardRoute() {
 		onSelectTab={(tab) => goToEngagementDashboard({ tab })}
 	/>;
 }
+EngagementDashboardRoute.displayName = 'EngagementDashboardRoute';
diff --git a/ee/app/engagement-dashboard/client/components/MessagesTab/MessagesSentSection.js b/ee/app/engagement-dashboard/client/components/MessagesTab/MessagesSentSection.js
index aefd34d74885..e3d96d4271c2 100644
--- a/ee/app/engagement-dashboard/client/components/MessagesTab/MessagesSentSection.js
+++ b/ee/app/engagement-dashboard/client/components/MessagesTab/MessagesSentSection.js
@@ -63,11 +63,13 @@ export function MessagesSentSection() {
 
 		const values = Array.from({ length: moment(period.end).diff(period.start, 'days') + 1 }, (_, i) => ({
 			date: moment(period.start).add(i, 'days').toISOString(),
-			newUsers: 0,
+			newMessages: 0,
 		}));
-		for (const { day, users } of data.days) {
+		for (const { day, messages } of data.days) {
 			const i = moment(day).diff(period.start, 'days');
-			values[i].newUsers += users;
+			if (i >= 0) {
+				values[i].newMessages += messages;
+			}
 		}
 
 		return [
@@ -106,7 +108,7 @@ export function MessagesSentSection() {
 								<ResponsiveBar
 									data={values}
 									indexBy='date'
-									keys={['newUsers']}
+									keys={['newMessages']}
 									groupMode='grouped'
 									padding={0.25}
 									margin={{
@@ -156,7 +158,7 @@ export function MessagesSentSection() {
 										},
 									}}
 									tooltip={({ value }) => <Box textStyle='p2' textColor='alternative'>
-										{t('Value_users', { value })}
+										{t('Value_messages', { value })}
 									</Box>}
 								/>
 							</Box>
diff --git a/ee/app/engagement-dashboard/client/components/UsersTab/BusiestChatTimesSection.js b/ee/app/engagement-dashboard/client/components/UsersTab/BusiestChatTimesSection.js
index 86091bd74095..445ef0cb60b1 100644
--- a/ee/app/engagement-dashboard/client/components/UsersTab/BusiestChatTimesSection.js
+++ b/ee/app/engagement-dashboard/client/components/UsersTab/BusiestChatTimesSection.js
@@ -22,12 +22,12 @@ function ContentForHours({ displacement, onPreviousDateClick, onNextDateClick })
 
 		const divider = 2;
 		const values = Array.from({ length: 24 / divider }, (_, i) => ({
-			hour: divider * i,
+			hour: String(divider * i),
 			users: 0,
 		}));
 		for (const { hour, users } of data.hours) {
 			const i = Math.floor(hour / divider);
-			values[i] = values[i] || { hour: divider * i, users: 0 };
+			values[i] = values[i] || { hour: String(divider * i), users: 0 };
 			values[i].users += users;
 		}
 
@@ -134,7 +134,7 @@ function ContentForDays({ displacement, onPreviousDateClick, onNextDateClick })
 	const data = useEndpointData('GET', 'engagement-dashboard/users/chat-busier/weekly-data', params);
 	const values = useMemo(() => (data ? data.month.map(({ users, day, month, year }) => ({
 		users,
-		day: moment.utc([year, month - 1, day, 0, 0, 0]).valueOf(),
+		day: String(moment.utc([year, month - 1, day, 0, 0, 0]).valueOf()),
 	})).sort(({ day: a }, { day: b }) => a - b) : []), [data]);
 
 	return <>
@@ -185,7 +185,7 @@ function ContentForDays({ displacement, onPreviousDateClick, onNextDateClick })
 										tickPadding: 4,
 										tickRotation: 0,
 										tickValues: 'every 3 days',
-										format: (timestamp) => moment(timestamp).format('L'),
+										format: (timestamp) => moment(parseInt(timestamp, 10)).format('L'),
 									}}
 									axisLeft={null}
 									animate={true}
@@ -226,12 +226,13 @@ export function BusiestChatTimesSection() {
 		['days', t('Days')],
 	], [t]);
 
+	const [displacement, setDisplacement] = useState(0);
+
 	const handleTimeUnitChange = (timeUnit) => {
 		setTimeUnit(timeUnit);
+		setDisplacement(0);
 	};
 
-	const [displacement, setDisplacement] = useState(0);
-
 	const handlePreviousDateClick = () => setDisplacement((displacement) => displacement + 1);
 	const handleNextDateClick = () => setDisplacement((displacement) => displacement - 1);
 
diff --git a/ee/app/engagement-dashboard/client/components/UsersTab/NewUsersSection.js b/ee/app/engagement-dashboard/client/components/UsersTab/NewUsersSection.js
index 3ffb763f91cb..8fcd11a91bdd 100644
--- a/ee/app/engagement-dashboard/client/components/UsersTab/NewUsersSection.js
+++ b/ee/app/engagement-dashboard/client/components/UsersTab/NewUsersSection.js
@@ -67,7 +67,9 @@ export function NewUsersSection() {
 		}));
 		for (const { day, users } of data.days) {
 			const i = moment(day).diff(period.start, 'days');
-			values[i].newUsers += users;
+			if (i >= 0) {
+				values[i].newUsers += users;
+			}
 		}
 
 		return [
diff --git a/ee/app/engagement-dashboard/client/routes.js b/ee/app/engagement-dashboard/client/routes.js
index d4d966f5fd92..f8735786bbaf 100644
--- a/ee/app/engagement-dashboard/client/routes.js
+++ b/ee/app/engagement-dashboard/client/routes.js
@@ -1,55 +1,30 @@
-import { Blaze } from 'meteor/blaze';
 import { HTML } from 'meteor/htmljs';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
-import { Template } from 'meteor/templating';
+
 
 import { hasAllPermission } from '../../../../app/authorization';
 import { AdminBox } from '../../../../app/ui-utils';
 import { hasLicense } from '../../license/client';
+import { createTemplateForComponent } from '../../../../client/createTemplateForComponent';
 
-Template.EngagementDashboardRoute = new Blaze.Template('EngagementDashboardRoute',
-	() => HTML.DIV.call(null, { style: 'overflow: hidden; flex: 1 1 auto; height: 1%;' }));
-
-Template.EngagementDashboardRoute.onRendered(async function() {
-	const [
-		{ createElement },
-		{ render, unmountComponentAtNode },
-		{ MeteorProvider },
-		{ EngagementDashboardRoute },
-	] = await Promise.all([
-		import('react'),
-		import('react-dom'),
-		import('../../../../client/providers/MeteorProvider'),
-		import('./components/EngagementDashboardRoute'),
-	]);
-
-	const container = this.firstNode;
-
-	if (!container) {
-		return;
-	}
-
-	this.autorun(() => {
-		const routeName = FlowRouter.getRouteName();
-		if (routeName !== 'engagement-dashboard') {
-			unmountComponentAtNode(container);
-		}
-	});
-
-	render(createElement(MeteorProvider, { children: createElement(EngagementDashboardRoute) }), container);
-});
-
-let licensed = false;
 
 FlowRouter.route('/admin/engagement-dashboard/:tab?', {
 	name: 'engagement-dashboard',
-	action: () => {
+	action: async () => {
+		const licensed = await hasLicense('engagement-dashboard');
 		if (!licensed) {
 			return;
 		}
 
-		BlazeLayout.render('main', { center: 'EngagementDashboardRoute' });
+		const { EngagementDashboardRoute } = await import('./components/EngagementDashboardRoute');
+
+		BlazeLayout.render('main', { center: await createTemplateForComponent(EngagementDashboardRoute,
+			{},
+			// eslint-disable-next-line new-cap
+			() => HTML.DIV.call(null, { style: 'overflow: hidden; flex: 1 1 auto; height: 1%;' }),
+			'engagement-dashboard'),
+		});
 	},
 });
 
@@ -58,8 +33,6 @@ hasLicense('engagement-dashboard').then((enabled) => {
 		return;
 	}
 
-	licensed = true;
-
 	AdminBox.addOption({
 		href: 'engagement-dashboard',
 		i18nLabel: 'Engagement Dashboard',
diff --git a/ee/app/engagement-dashboard/server/index.js b/ee/app/engagement-dashboard/server/index.js
index 0083bfabbf5f..4be65208b093 100644
--- a/ee/app/engagement-dashboard/server/index.js
+++ b/ee/app/engagement-dashboard/server/index.js
@@ -1,6 +1,16 @@
+import { Meteor } from 'meteor/meteor';
+
 import { onLicense } from '../../license/server';
+import { fillFirstDaysOfMessagesIfNeeded } from './lib/messages';
+import { fillFirstDaysOfUsersIfNeeded } from './lib/users';
 
 onLicense('engagement-dashboard', async () => {
 	await import('./listeners');
 	await import('./api');
+
+	Meteor.startup(async () => {
+		const date = new Date();
+		fillFirstDaysOfUsersIfNeeded(date);
+		fillFirstDaysOfMessagesIfNeeded(date);
+	});
 });
diff --git a/ee/app/engagement-dashboard/server/lib/messages.js b/ee/app/engagement-dashboard/server/lib/messages.js
index e6f0d621dcc3..8bfb9fe95f4c 100644
--- a/ee/app/engagement-dashboard/server/lib/messages.js
+++ b/ee/app/engagement-dashboard/server/lib/messages.js
@@ -1,7 +1,9 @@
 import moment from 'moment';
 
-import Analytics from '../../../../../app/models/server/raw/Analytics';
+import AnalyticsRaw from '../../../../../app/models/server/raw/Analytics';
 import { roomTypes } from '../../../../../app/utils';
+import { Messages } from '../../../../../app/models/server/raw';
+import { Analytics } from '../../../../../app/models/server';
 import { convertDateToInt, diffBetweenDaysInclusive, convertIntToDate, getTotalOfWeekItems } from './date';
 
 export const handleMessagesSent = (message, room) => {
@@ -9,7 +11,7 @@ export const handleMessagesSent = (message, room) => {
 	if (!roomTypesToShow.includes(room.t)) {
 		return;
 	}
-	Promise.await(Analytics.saveMessageSent({
+	Promise.await(AnalyticsRaw.saveMessageSent({
 		date: convertDateToInt(message.ts),
 		room,
 	}));
@@ -21,25 +23,40 @@ export const handleMessagesDeleted = (message, room) => {
 	if (!roomTypesToShow.includes(room.t)) {
 		return;
 	}
-	Promise.await(Analytics.saveMessageDeleted({
+	Promise.await(AnalyticsRaw.saveMessageDeleted({
 		date: convertDateToInt(message.ts),
 		room,
 	}));
 	return message;
 };
 
+export const fillFirstDaysOfMessagesIfNeeded = async (date) => {
+	const messagesFromAnalytics = await AnalyticsRaw.findByTypeBeforeDate({
+		type: 'messages',
+		date: convertDateToInt(date),
+	}).toArray();
+	if (!messagesFromAnalytics.length) {
+		const startOfPeriod = moment(convertIntToDate(date)).subtract(90, 'days').toDate();
+		const messages = await Messages.getTotalOfMessagesSentByDate({
+			start: startOfPeriod,
+			end: date,
+		});
+		messages.forEach((message) => Analytics.insert(message));
+	}
+};
+
 export const findWeeklyMessagesSentData = async ({ start, end }) => {
 	const daysBetweenDates = diffBetweenDaysInclusive(end, start);
 	const endOfLastWeek = moment(start).clone().subtract(1, 'days').toDate();
 	const startOfLastWeek = moment(endOfLastWeek).clone().subtract(daysBetweenDates, 'days').toDate();
 	const today = convertDateToInt(end);
 	const yesterday = convertDateToInt(moment(end).clone().subtract(1, 'days').toDate());
-	const currentPeriodMessages = await Analytics.getMessagesSentTotalByDate({
+	const currentPeriodMessages = await AnalyticsRaw.getMessagesSentTotalByDate({
 		start: convertDateToInt(start),
 		end: convertDateToInt(end),
 		options: { count: daysBetweenDates, sort: { _id: -1 } },
 	});
-	const lastPeriodMessages = await Analytics.getMessagesSentTotalByDate({
+	const lastPeriodMessages = await AnalyticsRaw.getMessagesSentTotalByDate({
 		start: convertDateToInt(startOfLastWeek),
 		end: convertDateToInt(endOfLastWeek),
 		options: { count: daysBetweenDates, sort: { _id: -1 } },
@@ -62,7 +79,7 @@ export const findWeeklyMessagesSentData = async ({ start, end }) => {
 };
 
 export const findMessagesSentOrigin = async ({ start, end }) => {
-	const origins = await Analytics.getMessagesOrigin({
+	const origins = await AnalyticsRaw.getMessagesOrigin({
 		start: convertDateToInt(start),
 		end: convertDateToInt(end),
 	});
@@ -76,7 +93,7 @@ export const findMessagesSentOrigin = async ({ start, end }) => {
 };
 
 export const findTopFivePopularChannelsByMessageSentQuantity = async ({ start, end }) => {
-	const channels = await Analytics.getMostPopularChannelsByMessagesSentQuantity({
+	const channels = await AnalyticsRaw.getMostPopularChannelsByMessagesSentQuantity({
 		start: convertDateToInt(start),
 		end: convertDateToInt(end),
 		options: { count: 5, sort: { messages: -1 } },
diff --git a/ee/app/engagement-dashboard/server/lib/users.js b/ee/app/engagement-dashboard/server/lib/users.js
index 5ea0a8b5ee5b..9e7403862d71 100644
--- a/ee/app/engagement-dashboard/server/lib/users.js
+++ b/ee/app/engagement-dashboard/server/lib/users.js
@@ -1,29 +1,46 @@
 import moment from 'moment';
 
-import Analytics from '../../../../../app/models/server/raw/Analytics';
+import AnalyticsRaw from '../../../../../app/models/server/raw/Analytics';
 import Sessions from '../../../../../app/models/server/raw/Sessions';
+import { Users } from '../../../../../app/models/server/raw';
+import { Analytics } from '../../../../../app/models/server';
 import { convertDateToInt, diffBetweenDaysInclusive, getTotalOfWeekItems, convertIntToDate } from './date';
 
 export const handleUserCreated = (user) => {
-	Promise.await(Analytics.saveUserData({
+	Promise.await(AnalyticsRaw.saveUserData({
 		date: convertDateToInt(user.ts),
 		user,
 	}));
 	return user;
 };
 
+export const fillFirstDaysOfUsersIfNeeded = async (date) => {
+	const usersFromAnalytics = await AnalyticsRaw.findByTypeBeforeDate({
+		type: 'users',
+		date: convertDateToInt(date),
+	}).toArray();
+	if (!usersFromAnalytics.length) {
+		const startOfPeriod = moment(date).subtract(90, 'days').toDate();
+		const users = await Users.getTotalOfRegisteredUsersByDate({
+			start: startOfPeriod,
+			end: date,
+		});
+		users.forEach((user) => Analytics.insert(user));
+	}
+};
+
 export const findWeeklyUsersRegisteredData = async ({ start, end }) => {
 	const daysBetweenDates = diffBetweenDaysInclusive(end, start);
 	const endOfLastWeek = moment(start).clone().subtract(1, 'days').toDate();
 	const startOfLastWeek = moment(endOfLastWeek).clone().subtract(daysBetweenDates, 'days').toDate();
 	const today = convertDateToInt(end);
 	const yesterday = convertDateToInt(moment(end).clone().subtract(1, 'days').toDate());
-	const currentPeriodUsers = await Analytics.getTotalOfRegisteredUsersByDate({
+	const currentPeriodUsers = await AnalyticsRaw.getTotalOfRegisteredUsersByDate({
 		start: convertDateToInt(start),
 		end: convertDateToInt(end),
 		options: { count: daysBetweenDates, sort: { _id: -1 } },
 	});
-	const lastPeriodUsers = await Analytics.getTotalOfRegisteredUsersByDate({
+	const lastPeriodUsers = await AnalyticsRaw.getTotalOfRegisteredUsersByDate({
 		start: convertDateToInt(startOfLastWeek),
 		end: convertDateToInt(endOfLastWeek),
 		options: { count: daysBetweenDates, sort: { _id: -1 } },
diff --git a/server/startup/migrations/index.js b/server/startup/migrations/index.js
index 6eca0c2df49a..60ee4afe9979 100644
--- a/server/startup/migrations/index.js
+++ b/server/startup/migrations/index.js
@@ -179,4 +179,5 @@ import './v178';
 import './v179';
 import './v180';
 import './v181';
+import './v182';
 import './xrun';
diff --git a/server/startup/migrations/v182.js b/server/startup/migrations/v182.js
new file mode 100644
index 000000000000..06f19f56801f
--- /dev/null
+++ b/server/startup/migrations/v182.js
@@ -0,0 +1,9 @@
+import { Migrations } from '../../../app/migrations';
+import { Analytics } from '../../../app/models/server';
+
+Migrations.add({
+	version: 182,
+	up() {
+		Analytics.remove({});
+	},
+});

From 7c93bd309e03ca13d6858becb6ff72683256effd Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Tue, 7 Apr 2020 02:21:23 -0300
Subject: [PATCH 173/223] Bump version to 3.1.0-rc.9

---
 .docker/Dockerfile.rhel   |   2 +-
 .github/history.json      | 240 ++++++++++++++++++++++++++++++++++++++
 HISTORY.md                | 119 +++++++++++++++++++
 app/utils/rocketchat.info |   2 +-
 package.json              |   2 +-
 5 files changed, 362 insertions(+), 3 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 83945222de60..fd2f6ad1e80f 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.1.0-rc.8
+ENV RC_VERSION 3.1.0-rc.9
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index 90cc4848e5e3..edd063897e03 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -42006,6 +42006,246 @@
           ]
         }
       ]
+    },
+    "3.0.11": {
+      "node_version": "12.14.0",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "17148",
+          "title": "Release 3.0.11",
+          "userLogin": "sampaiodiego",
+          "contributors": [
+            "rodrigok",
+            "sampaiodiego",
+            "renatobecker"
+          ]
+        },
+        {
+          "pr": "17132",
+          "title": "[FIX] Omnichannel endpoint `inquiries.getOne` returning only queued inquiries",
+          "userLogin": "renatobecker",
+          "milestone": "3.0.11",
+          "contributors": [
+            "renatobecker"
+          ]
+        },
+        {
+          "pr": "17143",
+          "title": "[FIX] Option BYPASS_OPLOG_VALIDATION not working",
+          "userLogin": "rodrigok",
+          "milestone": "3.0.11",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "17142",
+          "title": "New metric to track oplog queue",
+          "userLogin": "rodrigok",
+          "milestone": "3.0.11",
+          "contributors": [
+            "rodrigok"
+          ]
+        }
+      ]
+    },
+    "3.0.12": {
+      "node_version": "12.14.0",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "17158",
+          "title": "Release 3.0.12",
+          "userLogin": "sampaiodiego",
+          "contributors": [
+            "rodrigok",
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "17155",
+          "title": "Fix: Missing checks for Troubleshoot > Disable Notifications",
+          "userLogin": "rodrigok",
+          "milestone": "3.0.12",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "17152",
+          "title": "Fix: Error message on startup of multiple instances related to the metrics’ server",
+          "userLogin": "rodrigok",
+          "milestone": "3.0.12",
+          "contributors": [
+            "rodrigok"
+          ]
+        }
+      ]
+    },
+    "3.1.0-rc.9": {
+      "node_version": "12.16.1",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "17035",
+          "title": "[IMPROVE] First data load from existing data on engagement dashboard",
+          "userLogin": "MarcosSpessatto",
+          "milestone": "3.1.0",
+          "contributors": [
+            "MarcosSpessatto",
+            "ggazzo",
+            "tassoevan"
+          ]
+        },
+        {
+          "pr": "17193",
+          "title": "Regression: Fix calling readmessage after mark as unread",
+          "userLogin": "ggazzo",
+          "milestone": "3.1.0",
+          "contributors": [
+            "ggazzo",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "17194",
+          "title": "[IMPROVE] Increase the push throughput to prevent queuing",
+          "userLogin": "rodrigok",
+          "milestone": "3.1.0",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "17092",
+          "title": "Add wrapper to make Meteor methods calls over REST",
+          "userLogin": "sampaiodiego",
+          "milestone": "3.1.0",
+          "contributors": [
+            "sampaiodiego",
+            "ggazzo",
+            "rodrigok",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "17189",
+          "title": "[IMPROVE] Change sidebar sort mode to activity by default",
+          "userLogin": "ggazzo",
+          "milestone": "3.1.0",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "17192",
+          "title": "Regression: Fix auditing for Multiple Direct Messages",
+          "userLogin": "ggazzo",
+          "milestone": "3.1.0",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "17145",
+          "title": "[FIX] WebRTC echo while talking",
+          "userLogin": "ndroo",
+          "milestone": "3.1.0",
+          "contributors": [
+            "sampaiodiego",
+            "web-flow",
+            "1rV1N-git",
+            "rodrigok",
+            "d-gubert",
+            "ndroo",
+            "renatobecker",
+            "engelgabriel",
+            "gabriellsh"
+          ]
+        },
+        {
+          "pr": "17186",
+          "title": "Regression: Admin create user button",
+          "userLogin": "ggazzo",
+          "milestone": "3.1.0",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "17188",
+          "title": "Regression: fix scroll after room loads",
+          "userLogin": "ggazzo",
+          "milestone": "3.1.0",
+          "contributors": [
+            "ggazzo"
+          ]
+        },
+        {
+          "pr": "17183",
+          "title": "Metrics: New metrics, performance and size improvements",
+          "userLogin": "rodrigok",
+          "milestone": "3.1.0",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "17169",
+          "title": "Fix: Huge amount of hasLicense calls to the server",
+          "userLogin": "rodrigok",
+          "milestone": "3.1.0",
+          "contributors": [
+            "rodrigok",
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "17155",
+          "title": "Fix: Missing checks for Troubleshoot > Disable Notifications",
+          "userLogin": "rodrigok",
+          "milestone": "3.0.12",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "17038",
+          "title": "[NEW] Add omnichannel external frame feature",
+          "userLogin": "d-gubert",
+          "milestone": "3.1.0",
+          "contributors": [
+            "d-gubert",
+            "rodrigok",
+            "web-flow"
+          ]
+        },
+        {
+          "pr": "17152",
+          "title": "Fix: Error message on startup of multiple instances related to the metrics’ server",
+          "userLogin": "rodrigok",
+          "milestone": "3.0.12",
+          "contributors": [
+            "rodrigok"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/HISTORY.md b/HISTORY.md
index f9555521eb6e..1d993f57e987 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,6 +1,69 @@
 
 # 3.1.0 (Under Release Candidate Process)
 
+## 3.1.0-rc.9
+`2020-04-07  ·  1 🎉  ·  3 🚀  ·  1 🐛  ·  9 🔍  ·  11 👩‍💻👨‍💻`
+
+### 🎉 New features
+
+
+- Add omnichannel external frame feature ([#17038](https://github.com/RocketChat/Rocket.Chat/pull/17038))
+
+### 🚀 Improvements
+
+
+- First data load from existing data on engagement dashboard ([#17035](https://github.com/RocketChat/Rocket.Chat/pull/17035))
+
+- Increase the push throughput to prevent queuing ([#17194](https://github.com/RocketChat/Rocket.Chat/pull/17194))
+
+- Change sidebar sort mode to activity by default ([#17189](https://github.com/RocketChat/Rocket.Chat/pull/17189))
+
+### 🐛 Bug fixes
+
+
+- WebRTC echo while talking ([#17145](https://github.com/RocketChat/Rocket.Chat/pull/17145) by [@1rV1N-git](https://github.com/1rV1N-git) & [@ndroo](https://github.com/ndroo))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Regression: Fix calling readmessage after mark as unread ([#17193](https://github.com/RocketChat/Rocket.Chat/pull/17193))
+
+- Add wrapper to make Meteor methods calls over REST ([#17092](https://github.com/RocketChat/Rocket.Chat/pull/17092))
+
+- Regression: Fix auditing for Multiple Direct Messages ([#17192](https://github.com/RocketChat/Rocket.Chat/pull/17192))
+
+- Regression: Admin create user button ([#17186](https://github.com/RocketChat/Rocket.Chat/pull/17186))
+
+- Regression: fix scroll after room loads ([#17188](https://github.com/RocketChat/Rocket.Chat/pull/17188))
+
+- Metrics: New metrics, performance and size improvements ([#17183](https://github.com/RocketChat/Rocket.Chat/pull/17183))
+
+- Fix: Huge amount of hasLicense calls to the server ([#17169](https://github.com/RocketChat/Rocket.Chat/pull/17169))
+
+- Fix: Missing checks for Troubleshoot > Disable Notifications ([#17155](https://github.com/RocketChat/Rocket.Chat/pull/17155))
+
+- Fix: Error message on startup of multiple instances related to the metrics’ server ([#17152](https://github.com/RocketChat/Rocket.Chat/pull/17152))
+
+</details>
+
+### 👩‍💻👨‍💻 Contributors 😍
+
+- [@1rV1N-git](https://github.com/1rV1N-git)
+- [@ndroo](https://github.com/ndroo)
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+- [@d-gubert](https://github.com/d-gubert)
+- [@engelgabriel](https://github.com/engelgabriel)
+- [@gabriellsh](https://github.com/gabriellsh)
+- [@ggazzo](https://github.com/ggazzo)
+- [@renatobecker](https://github.com/renatobecker)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+- [@tassoevan](https://github.com/tassoevan)
+
 ## 3.1.0-rc.8
 `2020-04-02  ·  2 🐛  ·  2 🔍  ·  3 👩‍💻👨‍💻`
 
@@ -579,6 +642,62 @@
 - [@sampaiodiego](https://github.com/sampaiodiego)
 - [@tassoevan](https://github.com/tassoevan)
 
+# 3.0.12
+`2020-04-03  ·  3 🔍  ·  2 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `12.14.0`
+- NPM: `6.13.4`
+- MongoDB: `3.4, 3.6, 4.0`
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Release 3.0.12 ([#17158](https://github.com/RocketChat/Rocket.Chat/pull/17158))
+
+- Fix: Missing checks for Troubleshoot > Disable Notifications ([#17155](https://github.com/RocketChat/Rocket.Chat/pull/17155))
+
+- Fix: Error message on startup of multiple instances related to the metrics’ server ([#17152](https://github.com/RocketChat/Rocket.Chat/pull/17152))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
+# 3.0.11
+`2020-04-02  ·  2 🐛  ·  2 🔍  ·  3 👩‍💻👨‍💻`
+
+### Engine versions
+- Node: `12.14.0`
+- NPM: `6.13.4`
+- MongoDB: `3.4, 3.6, 4.0`
+
+### 🐛 Bug fixes
+
+
+- Omnichannel endpoint `inquiries.getOne` returning only queued inquiries ([#17132](https://github.com/RocketChat/Rocket.Chat/pull/17132))
+
+- Option BYPASS_OPLOG_VALIDATION not working ([#17143](https://github.com/RocketChat/Rocket.Chat/pull/17143))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Release 3.0.11 ([#17148](https://github.com/RocketChat/Rocket.Chat/pull/17148))
+
+- New metric to track oplog queue ([#17142](https://github.com/RocketChat/Rocket.Chat/pull/17142))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@renatobecker](https://github.com/renatobecker)
+- [@rodrigok](https://github.com/rodrigok)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 # 3.0.10
 `2020-04-01  ·  1 🚀  ·  2 🐛  ·  4 🔍  ·  4 👩‍💻👨‍💻`
 
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index 26844756d935..e7b659b5a2fb 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.1.0-rc.8"
+	"version": "3.1.0-rc.9"
 }
diff --git a/package.json b/package.json
index 4c772d6deda9..36b4a5e7c7ce 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.1.0-rc.8",
+	"version": "3.1.0-rc.9",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

From e0fcd754b6d72a2fed8e0e02e409a18d88d7f533 Mon Sep 17 00:00:00 2001
From: shubhsherl <shubham.singh094@yahoo.com>
Date: Thu, 2 Apr 2020 13:17:11 +0530
Subject: [PATCH 174/223] fix message retain issue

---
 app/models/client/models/ChatMessage.js       |  3 +
 app/utils/client/index.js                     |  1 +
 .../utils/client/lib}/offlineMessages.js      | 85 +++++++++----------
 client/main.js                                |  1 -
 4 files changed, 46 insertions(+), 44 deletions(-)
 rename {client/startup => app/utils/client/lib}/offlineMessages.js (61%)

diff --git a/app/models/client/models/ChatMessage.js b/app/models/client/models/ChatMessage.js
index cfa62729b74b..a5c32b1244c2 100644
--- a/app/models/client/models/ChatMessage.js
+++ b/app/models/client/models/ChatMessage.js
@@ -6,6 +6,7 @@ import { CachedCollection } from '../../../ui-cached-collection';
 import { CachedChatSubscription } from './CachedChatSubscription';
 import { ChatSubscription } from './ChatSubscription';
 import { getConfig } from '../../../ui-utils/client/config';
+import { cleanMessagesAtStartup } from '../../../utils';
 import { renderMessageBody } from '../../../ui-utils/client/lib/renderMessageBody';
 import { promises } from '../../../promises/client';
 import { callbacks } from '../../../callbacks';
@@ -91,6 +92,7 @@ const messagePreFetch = () => {
 		if (!messagesFetched && CachedChatSubscription.ready.get()) {
 			const status = Meteor.status();
 			if (status.status !== 'connected') {
+				cleanMessagesAtStartup();
 				return;
 			}
 			messagesFetched = true;
@@ -120,6 +122,7 @@ const messagePreFetch = () => {
 					});
 				});
 			});
+			cleanMessagesAtStartup(false);
 		}
 	});
 };
diff --git a/app/utils/client/index.js b/app/utils/client/index.js
index f40b8a8dc5ef..c5d012ee9cf3 100644
--- a/app/utils/client/index.js
+++ b/app/utils/client/index.js
@@ -20,6 +20,7 @@ export { templateVarHandler } from '../lib/templateVarHandler';
 export { APIClient } from './lib/RestApiClient';
 export { canDeleteMessage } from './lib/canDeleteMessage';
 export { SWCache } from './lib/swCache';
+export { cleanMessagesAtStartup } from './lib/offlineMessages';
 export { mime } from '../lib/mimeTypes';
 export { secondsToHHMMSS } from '../lib/timeConverter';
 export { isMobile } from './lib/isMobile';
diff --git a/client/startup/offlineMessages.js b/app/utils/client/lib/offlineMessages.js
similarity index 61%
rename from client/startup/offlineMessages.js
rename to app/utils/client/lib/offlineMessages.js
index 3ea449400691..e86ebf6dc384 100644
--- a/client/startup/offlineMessages.js
+++ b/app/utils/client/lib/offlineMessages.js
@@ -1,15 +1,13 @@
-import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import { Session } from 'meteor/session';
 import { sortBy } from 'underscore';
 import localforage from 'localforage';
 
-import { call } from '../../app/ui-utils/client';
-import { getConfig } from '../../app/ui-utils/client/config';
-import { SWCache } from '../../app/utils/client';
-import { fileUploadHandler } from '../../app/file-upload';
-import { ChatMessage, CachedChatMessage } from '../../app/models/client';
-import { callbacks } from '../../app/callbacks';
+import { call } from '../../../ui-utils/client';
+import { getConfig } from '../../../ui-utils/client/config';
+import { ChatMessage, CachedChatMessage } from '../../../models/client';
+
+import { SWCache, APIClient } from '..';
 
 const action = {
 	clean: (msg) => {
@@ -28,7 +26,7 @@ const action = {
 
 	sendFile: async (msg) => {
 		const file = await SWCache.getFileFromCache(msg.file);
-		const uploading = {
+		const upload = {
 			id: msg.file._id,
 			name: msg.file.name,
 			percentage: 0,
@@ -36,45 +34,48 @@ const action = {
 
 		if (!file) { return; }
 
-		const upload = fileUploadHandler('Uploads', msg.meta, file);
-
-		// Session.set(`uploading-${msg.file._id}`, uploading);
-
-		upload.onProgress = (progress) => {
-			const uploads = uploading;
-			uploads.percentage = Math.round(progress * 100) || 0;
-			ChatMessage.setProgress(msg._id, uploads);
-		};
-
-		upload.start((error, file, storage) => {
-			if (error) {
-				ChatMessage.setProgress(msg._id, uploading);
-				return;
-			}
-
-			if (!file) {
-				return;
-			}
-
-			const msgData = { id: msg._id, msg: msg.msg, tmid: msg.tmid };
-
-			Meteor.call('sendFileMessage', msg.rid, storage, file, msgData, () => {
-				SWCache.removeFromCache(msg.file);
-			});
+		const data = new FormData();
+		msg.meta.description && data.append('description', msg.meta.description);
+		data.append('id', msg._id);
+		msg.msg && data.append('msg', msg.msg);
+		msg.tmid && data.append('tmid', msg.tmid);
+		data.append('file', file, msg.file.name);
+
+		const { xhr, promise } = APIClient.upload(`v1/rooms.upload/${ msg.rid }`, {}, data, {
+			progress(progress) {
+				if (progress === 100) {
+					return;
+				}
+				const uploads = upload;
+				uploads.percentage = Math.round(progress * 100) || 0;
+				ChatMessage.setProgress(msg._id, uploads);
+			},
+			error() {
+				ChatMessage.setProgress(msg._id, upload);
+			},
 		});
 
 		Tracker.autorun((computation) => {
-			// using file._id as initial upload id, as messsageAttachment have access to file._id
-			const isCanceling = Session.get(`uploading-cancel-${ msg.file._id }`);
+			const isCanceling = Session.get(`uploading-cancel-${ upload.id }`);
+
 			if (!isCanceling) {
 				return;
 			}
-
 			computation.stop();
-			upload.stop();
+			Session.delete(`uploading-cancel-${ upload.id }`);
 
-			ChatMessage.setProgress(msg._id, uploading);
+			xhr.abort();
 		});
+
+		try {
+			await promise;
+			SWCache.removeFromCache(msg.file);
+		} catch (error) {
+			const uploads = upload;
+			uploads.error = (error.xhr && error.xhr.responseJSON && error.xhr.responseJSON.error) || error.message;
+			uploads.percentage = 0;
+			ChatMessage.setProgress(msg._id, uploads);
+		}
 	},
 
 	update: (msg) => {
@@ -137,16 +138,14 @@ function clearOldMessages({ records: messages, ...value }) {
 	value.updatedAt = new Date();
 	localforage.setItem('chatMessage', value).then(() => {
 		CachedChatMessage.loadFromCache();
-		triggerOfflineMsgs(retain);
 	});
 }
 
-const cleanMessagesAtStartup = () => {
+export const cleanMessagesAtStartup = (offline = true) => {
 	localforage.getItem('chatMessage').then((value) => {
 		if (value && value.records) {
-			clearOldMessages(value);
+			triggerOfflineMsgs(value.records);
+			offline && clearOldMessages(value);
 		}
 	});
 };
-
-callbacks.add('afterMainReady', cleanMessagesAtStartup, callbacks.priority.MEDIUM, 'cleanMessagesAtStartup');
diff --git a/client/main.js b/client/main.js
index ee82fd2aaf29..c855143be58e 100644
--- a/client/main.js
+++ b/client/main.js
@@ -24,7 +24,6 @@ import './routes';
 import './startup/emailVerification';
 import './startup/i18n';
 import './startup/loginViaQuery';
-import './startup/offlineMessages';
 import './startup/roomObserve';
 import './startup/startup';
 import './startup/unread';

From 39d3812296ba445891d6367e85200eb6e749ad6c Mon Sep 17 00:00:00 2001
From: shubhsherl <shubham.singh094@yahoo.com>
Date: Tue, 7 Apr 2020 17:03:44 +0530
Subject: [PATCH 175/223] fix message issue

---
 app/models/client/models/ChatMessage.js | 6 +++++-
 app/utils/client/lib/offlineMessages.js | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/models/client/models/ChatMessage.js b/app/models/client/models/ChatMessage.js
index a5c32b1244c2..187356064b2c 100644
--- a/app/models/client/models/ChatMessage.js
+++ b/app/models/client/models/ChatMessage.js
@@ -15,6 +15,8 @@ export const CachedChatMessage = new CachedCollection({ name: 'chatMessage' });
 
 export const ChatMessage = CachedChatMessage.collection;
 
+let timeout;
+
 ChatMessage.setReactions = function(messageId, reactions, tempActions) {
 	this.update({ _id: messageId }, { $set: { temp: true, tempActions, reactions } });
 	return CachedChatMessage.save();
@@ -92,7 +94,8 @@ const messagePreFetch = () => {
 		if (!messagesFetched && CachedChatSubscription.ready.get()) {
 			const status = Meteor.status();
 			if (status.status !== 'connected') {
-				cleanMessagesAtStartup();
+				clearTimeout(timeout);
+				timeout = setTimeout(cleanMessagesAtStartup, 3000);
 				return;
 			}
 			messagesFetched = true;
@@ -122,6 +125,7 @@ const messagePreFetch = () => {
 					});
 				});
 			});
+			clearTimeout(timeout);
 			cleanMessagesAtStartup(false);
 		}
 	});
diff --git a/app/utils/client/lib/offlineMessages.js b/app/utils/client/lib/offlineMessages.js
index e86ebf6dc384..a31c41149985 100644
--- a/app/utils/client/lib/offlineMessages.js
+++ b/app/utils/client/lib/offlineMessages.js
@@ -138,14 +138,14 @@ function clearOldMessages({ records: messages, ...value }) {
 	value.updatedAt = new Date();
 	localforage.setItem('chatMessage', value).then(() => {
 		CachedChatMessage.loadFromCache();
+		triggerOfflineMsgs(retain);
 	});
 }
 
 export const cleanMessagesAtStartup = (offline = true) => {
 	localforage.getItem('chatMessage').then((value) => {
 		if (value && value.records) {
-			triggerOfflineMsgs(value.records);
-			offline && clearOldMessages(value);
+			offline ? clearOldMessages(value) : triggerOfflineMsgs(value.records);
 		}
 	});
 };

From 64cf92eca5fde0011ea3f4b36daa97aaec6d885d Mon Sep 17 00:00:00 2001
From: shubhsherl <shubham.singh094@yahoo.com>
Date: Fri, 27 Mar 2020 20:45:35 +0530
Subject: [PATCH 176/223] fix double attachment issue

---
 app/lib/server/methods/sendMessage.js         | 15 +--
 .../client/messageAttachment.js               | 10 +-
 app/ui/client/lib/fileUpload.js               | 94 +++++--------------
 3 files changed, 26 insertions(+), 93 deletions(-)

diff --git a/app/lib/server/methods/sendMessage.js b/app/lib/server/methods/sendMessage.js
index d25284a3639f..87a8451b34f1 100644
--- a/app/lib/server/methods/sendMessage.js
+++ b/app/lib/server/methods/sendMessage.js
@@ -22,20 +22,7 @@ export function executeSendMessage(uid, message) {
 		});
 	}
 
-	if (message.ts) {
-		const tsDiff = Math.abs(moment(message.ts).diff());
-		if (tsDiff > 60000) {
-			throw new Meteor.Error('error-message-ts-out-of-sync', 'Message timestamp is out of sync', {
-				method: 'sendMessage',
-				message_ts: message.ts,
-				server_ts: new Date().getTime(),
-			});
-		} else if (tsDiff > 10000) {
-			message.ts = new Date();
-		}
-	} else {
-		message.ts = new Date();
-	}
+	message.ts = new Date();
 
 	if (message.msg) {
 		const adjustedMessage = messageProperties.messageWithoutEmojiShortnames(message.msg);
diff --git a/app/message-attachments/client/messageAttachment.js b/app/message-attachments/client/messageAttachment.js
index 2b70b6083933..65a3005ac084 100644
--- a/app/message-attachments/client/messageAttachment.js
+++ b/app/message-attachments/client/messageAttachment.js
@@ -41,15 +41,9 @@ Template.messageAttachment.helpers({
 		return true;
 	},
 	uploading() {
-		return Template.parentData().msg.uploads;
+		console.log(Template.parentData(2).msg.uploads);
+		return Template.parentData(2).msg.uploads;
 	},
-	// cancel() {
-	// 	console.log(Template.parentData());
-	// 	Session.set(`uploading-cancel-${ Template.parentData().msg.file._id }`, true);
-	// },
-	// retry() {
-	// 	Session.set(`uploading-cancel-${ Template.parentData().msg.file._id }`, true);
-	// },
 	getImageHeight(height = 200) {
 		return height;
 	},
diff --git a/app/ui/client/lib/fileUpload.js b/app/ui/client/lib/fileUpload.js
index 0fbd96c0683b..7177950e087a 100644
--- a/app/ui/client/lib/fileUpload.js
+++ b/app/ui/client/lib/fileUpload.js
@@ -5,27 +5,12 @@ import { Session } from 'meteor/session';
 import s from 'underscore.string';
 import { Handlebars } from 'meteor/ui';
 
-import { fileUploadHandler } from '../../../file-upload';
 import { settings } from '../../../settings/client';
 import { ChatMessage } from '../../../models/client';
 import { t, fileUploadIsValidContentType, SWCache, APIClient } from '../../../utils';
 import { modal, prependReplies } from '../../../ui-utils';
 import { sendOfflineFileMessage } from './sendOfflineFileMessage';
 
-const setMsgId = (msgData = {}) => {
-	let id;
-	if (msgData.id) {
-		id = msgData.id;
-	} else {
-		id = Random.id();
-	}
-	return Object.assign({
-		id,
-		msg: '',
-		groupable: false,
-	}, msgData);
-};
-
 const readAsDataURL = (file, callback) => {
 	const reader = new FileReader();
 	reader.onload = (e) => callback(e.target.result, file);
@@ -172,7 +157,7 @@ export const fileUpload = async (files, input, { rid, tmid }) => {
 		tmid = replies[0]._id;
 	}
 
-	const msgData = setMsgId({ msg, tmid });
+	const msgData = { id: Random.id(), msg: msg, tmid: tmid };
 	let offlineFile = null;
 
 	const uploadNextFile = () => {
@@ -228,71 +213,41 @@ export const fileUpload = async (files, input, { rid, tmid }) => {
 
 			const data = new FormData();
 			record.description && data.append('description', record.description);
+			data.append('id', msgData.id);
 			msg && data.append('msg', msg);
 			tmid && data.append('tmid', tmid);
 			data.append('file', file.file, fileName);
 
-			const upload = fileUploadHandler('Uploads', record, file.file);
-			const uploading = {
-				id: upload.id,
-				name: upload.getFileName(),
+			const upload = {
+				id: Random.id(),
+				name: fileName,
 				percentage: 0,
 			};
 			file.file._id = upload.id;
 			uploadNextFile();
 
-			// Session.set(`uploading-${ upload.id }`, uploading);
-
-			upload.onProgress = (progress) => {
-				const uploads = uploading;
-				uploads.percentage = Math.round(progress * 100) || 0;
-				ChatMessage.setProgress(msgData.id, uploads);
-			};
-
-			const offlineUpload = (file, meta) => sendOfflineFileMessage(rid, msgData, file, meta, (file) => {
+			sendOfflineFileMessage(rid, msgData, file.file, record, (file) => {
 				offlineFile = file;
 			});
 
-			upload.start((error, file, storage) => {
-				if (error) {
-					ChatMessage.setProgress(msgData.id, uploading);
-					return;
-				}
-
-				if (!file) {
-					return;
-				}
-
-				Meteor.call('sendFileMessage', rid, storage, file, msgData, () => {
-					$(input)
-						.removeData('reply')
-						.trigger('dataChange');
-
-					if (offlineFile) {
-						SWCache.removeFromCache(offlineFile);
-					}
-				});
-			}, offlineUpload);
-
 			const { xhr, promise } = APIClient.upload(`v1/rooms.upload/${ rid }`, {}, data, {
 				progress(progress) {
-					const uploads = Session.get('uploading') || [];
-
 					if (progress === 100) {
+						console.log('done');
+						offlineFile && SWCache.removeFromCache(offlineFile);
 						return;
 					}
-					uploads.filter((u) => u.id === upload.id).forEach((u) => {
-						u.percentage = Math.round(progress) || 0;
-					});
-					Session.set('uploading', uploads);
+					
+					const uploads = upload;
+					uploads.percentage = Math.round(progress * 100) || 0;
+					console.log(uploads);
+					ChatMessage.setProgress(msgData.id, uploads);
+
+
 				},
 				error(error) {
-					const uploads = Session.get('uploading') || [];
-					uploads.filter((u) => u.id === upload.id).forEach((u) => {
-						u.error = error.message;
-						u.percentage = 0;
-					});
-					Session.set('uploading', uploads);
+					ChatMessage.setProgress(msgData.id, upload);
+					return;
 				},
 			});
 
@@ -307,20 +262,17 @@ export const fileUpload = async (files, input, { rid, tmid }) => {
 
 				xhr.abort();
 
-				ChatMessage.setProgress(msgData.id, uploading);
+				ChatMessage.setProgress(msgData.id, upload);
 			});
 
 			try {
 				await promise;
-				const uploads = Session.get('uploading') || [];
-				return Session.set('uploading', uploads.filter((u) => u.id !== upload.id));
+				console.log('quick done');
 			} catch (error) {
-				const uploads = Session.get('uploading') || [];
-				uploads.filter((u) => u.id === upload.id).forEach((u) => {
-					u.error = (error.xhr && error.xhr.responseJSON && error.xhr.responseJSON.error) || error.message;
-					u.percentage = 0;
-				});
-				Session.set('uploading', uploads);
+				const uploads = upload;
+				uploads.error = (error.xhr && error.xhr.responseJSON && error.xhr.responseJSON.error) || error.message;
+				uploads.percentage = 0;
+				ChatMessage.setProgress(msgData.id, uploads);
 			}
 		}));
 	};

From 12fdcb4af15160753ebd546ffd602bdf1a98b97d Mon Sep 17 00:00:00 2001
From: shubhsherl <shubham.singh094@yahoo.com>
Date: Mon, 30 Mar 2020 23:21:13 +0530
Subject: [PATCH 177/223] fix sw cache and remove logs

---
 app/lib/server/methods/deleteMessage.js        |  6 +++++-
 app/lib/server/methods/sendMessage.js          |  1 -
 .../client/messageAttachment.js                |  1 -
 app/ui/client/lib/fileUpload.js                | 18 ++++--------------
 app/utils/client/lib/swCache.js                |  5 +++--
 5 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/app/lib/server/methods/deleteMessage.js b/app/lib/server/methods/deleteMessage.js
index 086b9caee7f9..067fcef7b03f 100644
--- a/app/lib/server/methods/deleteMessage.js
+++ b/app/lib/server/methods/deleteMessage.js
@@ -28,7 +28,11 @@ Meteor.methods({
 			},
 		});
 
-		if (!originalMessage || !canDeleteMessage(uid, originalMessage)) {
+		if (!originalMessage) {
+			return;
+		}
+
+		if (!canDeleteMessage(uid, originalMessage)) {
 			throw new Meteor.Error('error-action-not-allowed', 'Not allowed', {
 				method: 'deleteMessage',
 				action: 'Delete_message',
diff --git a/app/lib/server/methods/sendMessage.js b/app/lib/server/methods/sendMessage.js
index 87a8451b34f1..6c9f08f26033 100644
--- a/app/lib/server/methods/sendMessage.js
+++ b/app/lib/server/methods/sendMessage.js
@@ -2,7 +2,6 @@ import { Meteor } from 'meteor/meteor';
 import { check } from 'meteor/check';
 import { Random } from 'meteor/random';
 import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
-import moment from 'moment';
 
 import { hasPermission } from '../../../authorization';
 import { metrics } from '../../../metrics';
diff --git a/app/message-attachments/client/messageAttachment.js b/app/message-attachments/client/messageAttachment.js
index 65a3005ac084..770c7cab6a10 100644
--- a/app/message-attachments/client/messageAttachment.js
+++ b/app/message-attachments/client/messageAttachment.js
@@ -41,7 +41,6 @@ Template.messageAttachment.helpers({
 		return true;
 	},
 	uploading() {
-		console.log(Template.parentData(2).msg.uploads);
 		return Template.parentData(2).msg.uploads;
 	},
 	getImageHeight(height = 200) {
diff --git a/app/ui/client/lib/fileUpload.js b/app/ui/client/lib/fileUpload.js
index 7177950e087a..0900111fd6b1 100644
--- a/app/ui/client/lib/fileUpload.js
+++ b/app/ui/client/lib/fileUpload.js
@@ -1,4 +1,3 @@
-import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import { Random } from 'meteor/random';
 import { Session } from 'meteor/session';
@@ -157,7 +156,7 @@ export const fileUpload = async (files, input, { rid, tmid }) => {
 		tmid = replies[0]._id;
 	}
 
-	const msgData = { id: Random.id(), msg: msg, tmid: tmid };
+	const msgData = { id: Random.id(), msg, tmid };
 	let offlineFile = null;
 
 	const uploadNextFile = () => {
@@ -233,27 +232,20 @@ export const fileUpload = async (files, input, { rid, tmid }) => {
 			const { xhr, promise } = APIClient.upload(`v1/rooms.upload/${ rid }`, {}, data, {
 				progress(progress) {
 					if (progress === 100) {
-						console.log('done');
-						offlineFile && SWCache.removeFromCache(offlineFile);
 						return;
 					}
-					
+
 					const uploads = upload;
 					uploads.percentage = Math.round(progress * 100) || 0;
-					console.log(uploads);
 					ChatMessage.setProgress(msgData.id, uploads);
-
-
 				},
-				error(error) {
+				error() {
 					ChatMessage.setProgress(msgData.id, upload);
-					return;
 				},
 			});
 
 			Tracker.autorun((computation) => {
 				const isCanceling = Session.get(`uploading-cancel-${ upload.id }`);
-
 				if (!isCanceling) {
 					return;
 				}
@@ -261,13 +253,11 @@ export const fileUpload = async (files, input, { rid, tmid }) => {
 				Session.delete(`uploading-cancel-${ upload.id }`);
 
 				xhr.abort();
-
-				ChatMessage.setProgress(msgData.id, upload);
 			});
 
 			try {
 				await promise;
-				console.log('quick done');
+				offlineFile && SWCache.removeFromCache(offlineFile);
 			} catch (error) {
 				const uploads = upload;
 				uploads.error = (error.xhr && error.xhr.responseJSON && error.xhr.responseJSON.error) || error.message;
diff --git a/app/utils/client/lib/swCache.js b/app/utils/client/lib/swCache.js
index 502e2e70a103..93912dde9ad7 100644
--- a/app/utils/client/lib/swCache.js
+++ b/app/utils/client/lib/swCache.js
@@ -11,8 +11,9 @@ export const SWCache = {
 				statusText: 'No connection to the server',
 				headers: new Headers({ 'Content-Type': file.type }),
 			});
-			cache.put(getFileUrl(file), res);
-			callback();
+			cache.put(getFileUrl(file), res).then(() => {
+				callback();
+			});
 		}).catch((err) => {
 			callback(err);
 		});

From 81b50a39ec10802a3227bd59894ae62441c80a0f Mon Sep 17 00:00:00 2001
From: shubhsherl <shubham.singh094@yahoo.com>
Date: Thu, 2 Apr 2020 13:17:11 +0530
Subject: [PATCH 178/223] fix message retain issue

---
 app/models/client/models/ChatMessage.js       |  3 +
 app/utils/client/index.js                     |  1 +
 .../utils/client/lib}/offlineMessages.js      | 85 +++++++++----------
 client/main.js                                |  1 -
 4 files changed, 46 insertions(+), 44 deletions(-)
 rename {client/startup => app/utils/client/lib}/offlineMessages.js (61%)

diff --git a/app/models/client/models/ChatMessage.js b/app/models/client/models/ChatMessage.js
index cfa62729b74b..a5c32b1244c2 100644
--- a/app/models/client/models/ChatMessage.js
+++ b/app/models/client/models/ChatMessage.js
@@ -6,6 +6,7 @@ import { CachedCollection } from '../../../ui-cached-collection';
 import { CachedChatSubscription } from './CachedChatSubscription';
 import { ChatSubscription } from './ChatSubscription';
 import { getConfig } from '../../../ui-utils/client/config';
+import { cleanMessagesAtStartup } from '../../../utils';
 import { renderMessageBody } from '../../../ui-utils/client/lib/renderMessageBody';
 import { promises } from '../../../promises/client';
 import { callbacks } from '../../../callbacks';
@@ -91,6 +92,7 @@ const messagePreFetch = () => {
 		if (!messagesFetched && CachedChatSubscription.ready.get()) {
 			const status = Meteor.status();
 			if (status.status !== 'connected') {
+				cleanMessagesAtStartup();
 				return;
 			}
 			messagesFetched = true;
@@ -120,6 +122,7 @@ const messagePreFetch = () => {
 					});
 				});
 			});
+			cleanMessagesAtStartup(false);
 		}
 	});
 };
diff --git a/app/utils/client/index.js b/app/utils/client/index.js
index f40b8a8dc5ef..c5d012ee9cf3 100644
--- a/app/utils/client/index.js
+++ b/app/utils/client/index.js
@@ -20,6 +20,7 @@ export { templateVarHandler } from '../lib/templateVarHandler';
 export { APIClient } from './lib/RestApiClient';
 export { canDeleteMessage } from './lib/canDeleteMessage';
 export { SWCache } from './lib/swCache';
+export { cleanMessagesAtStartup } from './lib/offlineMessages';
 export { mime } from '../lib/mimeTypes';
 export { secondsToHHMMSS } from '../lib/timeConverter';
 export { isMobile } from './lib/isMobile';
diff --git a/client/startup/offlineMessages.js b/app/utils/client/lib/offlineMessages.js
similarity index 61%
rename from client/startup/offlineMessages.js
rename to app/utils/client/lib/offlineMessages.js
index 3ea449400691..e86ebf6dc384 100644
--- a/client/startup/offlineMessages.js
+++ b/app/utils/client/lib/offlineMessages.js
@@ -1,15 +1,13 @@
-import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import { Session } from 'meteor/session';
 import { sortBy } from 'underscore';
 import localforage from 'localforage';
 
-import { call } from '../../app/ui-utils/client';
-import { getConfig } from '../../app/ui-utils/client/config';
-import { SWCache } from '../../app/utils/client';
-import { fileUploadHandler } from '../../app/file-upload';
-import { ChatMessage, CachedChatMessage } from '../../app/models/client';
-import { callbacks } from '../../app/callbacks';
+import { call } from '../../../ui-utils/client';
+import { getConfig } from '../../../ui-utils/client/config';
+import { ChatMessage, CachedChatMessage } from '../../../models/client';
+
+import { SWCache, APIClient } from '..';
 
 const action = {
 	clean: (msg) => {
@@ -28,7 +26,7 @@ const action = {
 
 	sendFile: async (msg) => {
 		const file = await SWCache.getFileFromCache(msg.file);
-		const uploading = {
+		const upload = {
 			id: msg.file._id,
 			name: msg.file.name,
 			percentage: 0,
@@ -36,45 +34,48 @@ const action = {
 
 		if (!file) { return; }
 
-		const upload = fileUploadHandler('Uploads', msg.meta, file);
-
-		// Session.set(`uploading-${msg.file._id}`, uploading);
-
-		upload.onProgress = (progress) => {
-			const uploads = uploading;
-			uploads.percentage = Math.round(progress * 100) || 0;
-			ChatMessage.setProgress(msg._id, uploads);
-		};
-
-		upload.start((error, file, storage) => {
-			if (error) {
-				ChatMessage.setProgress(msg._id, uploading);
-				return;
-			}
-
-			if (!file) {
-				return;
-			}
-
-			const msgData = { id: msg._id, msg: msg.msg, tmid: msg.tmid };
-
-			Meteor.call('sendFileMessage', msg.rid, storage, file, msgData, () => {
-				SWCache.removeFromCache(msg.file);
-			});
+		const data = new FormData();
+		msg.meta.description && data.append('description', msg.meta.description);
+		data.append('id', msg._id);
+		msg.msg && data.append('msg', msg.msg);
+		msg.tmid && data.append('tmid', msg.tmid);
+		data.append('file', file, msg.file.name);
+
+		const { xhr, promise } = APIClient.upload(`v1/rooms.upload/${ msg.rid }`, {}, data, {
+			progress(progress) {
+				if (progress === 100) {
+					return;
+				}
+				const uploads = upload;
+				uploads.percentage = Math.round(progress * 100) || 0;
+				ChatMessage.setProgress(msg._id, uploads);
+			},
+			error() {
+				ChatMessage.setProgress(msg._id, upload);
+			},
 		});
 
 		Tracker.autorun((computation) => {
-			// using file._id as initial upload id, as messsageAttachment have access to file._id
-			const isCanceling = Session.get(`uploading-cancel-${ msg.file._id }`);
+			const isCanceling = Session.get(`uploading-cancel-${ upload.id }`);
+
 			if (!isCanceling) {
 				return;
 			}
-
 			computation.stop();
-			upload.stop();
+			Session.delete(`uploading-cancel-${ upload.id }`);
 
-			ChatMessage.setProgress(msg._id, uploading);
+			xhr.abort();
 		});
+
+		try {
+			await promise;
+			SWCache.removeFromCache(msg.file);
+		} catch (error) {
+			const uploads = upload;
+			uploads.error = (error.xhr && error.xhr.responseJSON && error.xhr.responseJSON.error) || error.message;
+			uploads.percentage = 0;
+			ChatMessage.setProgress(msg._id, uploads);
+		}
 	},
 
 	update: (msg) => {
@@ -137,16 +138,14 @@ function clearOldMessages({ records: messages, ...value }) {
 	value.updatedAt = new Date();
 	localforage.setItem('chatMessage', value).then(() => {
 		CachedChatMessage.loadFromCache();
-		triggerOfflineMsgs(retain);
 	});
 }
 
-const cleanMessagesAtStartup = () => {
+export const cleanMessagesAtStartup = (offline = true) => {
 	localforage.getItem('chatMessage').then((value) => {
 		if (value && value.records) {
-			clearOldMessages(value);
+			triggerOfflineMsgs(value.records);
+			offline && clearOldMessages(value);
 		}
 	});
 };
-
-callbacks.add('afterMainReady', cleanMessagesAtStartup, callbacks.priority.MEDIUM, 'cleanMessagesAtStartup');
diff --git a/client/main.js b/client/main.js
index ee82fd2aaf29..c855143be58e 100644
--- a/client/main.js
+++ b/client/main.js
@@ -24,7 +24,6 @@ import './routes';
 import './startup/emailVerification';
 import './startup/i18n';
 import './startup/loginViaQuery';
-import './startup/offlineMessages';
 import './startup/roomObserve';
 import './startup/startup';
 import './startup/unread';

From 062bb48d3bc5f30cc89b4eeae4f29028dbc46d7b Mon Sep 17 00:00:00 2001
From: shubhsherl <shubham.singh094@yahoo.com>
Date: Tue, 7 Apr 2020 17:03:44 +0530
Subject: [PATCH 179/223] fix message issue

---
 app/models/client/models/ChatMessage.js | 6 +++++-
 app/utils/client/lib/offlineMessages.js | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/models/client/models/ChatMessage.js b/app/models/client/models/ChatMessage.js
index a5c32b1244c2..187356064b2c 100644
--- a/app/models/client/models/ChatMessage.js
+++ b/app/models/client/models/ChatMessage.js
@@ -15,6 +15,8 @@ export const CachedChatMessage = new CachedCollection({ name: 'chatMessage' });
 
 export const ChatMessage = CachedChatMessage.collection;
 
+let timeout;
+
 ChatMessage.setReactions = function(messageId, reactions, tempActions) {
 	this.update({ _id: messageId }, { $set: { temp: true, tempActions, reactions } });
 	return CachedChatMessage.save();
@@ -92,7 +94,8 @@ const messagePreFetch = () => {
 		if (!messagesFetched && CachedChatSubscription.ready.get()) {
 			const status = Meteor.status();
 			if (status.status !== 'connected') {
-				cleanMessagesAtStartup();
+				clearTimeout(timeout);
+				timeout = setTimeout(cleanMessagesAtStartup, 3000);
 				return;
 			}
 			messagesFetched = true;
@@ -122,6 +125,7 @@ const messagePreFetch = () => {
 					});
 				});
 			});
+			clearTimeout(timeout);
 			cleanMessagesAtStartup(false);
 		}
 	});
diff --git a/app/utils/client/lib/offlineMessages.js b/app/utils/client/lib/offlineMessages.js
index e86ebf6dc384..a31c41149985 100644
--- a/app/utils/client/lib/offlineMessages.js
+++ b/app/utils/client/lib/offlineMessages.js
@@ -138,14 +138,14 @@ function clearOldMessages({ records: messages, ...value }) {
 	value.updatedAt = new Date();
 	localforage.setItem('chatMessage', value).then(() => {
 		CachedChatMessage.loadFromCache();
+		triggerOfflineMsgs(retain);
 	});
 }
 
 export const cleanMessagesAtStartup = (offline = true) => {
 	localforage.getItem('chatMessage').then((value) => {
 		if (value && value.records) {
-			triggerOfflineMsgs(value.records);
-			offline && clearOldMessages(value);
+			offline ? clearOldMessages(value) : triggerOfflineMsgs(value.records);
 		}
 	});
 };

From 136dc46302ad2b021ef978344cdf838e47939ee7 Mon Sep 17 00:00:00 2001
From: shubhsherl <shubham.singh094@yahoo.com>
Date: Tue, 24 Mar 2020 16:14:56 +0530
Subject: [PATCH 180/223] migrate pwa test to cypress

---
 .../client/messageBox/messageBox.html         |   2 +-
 cypress.json                                  |   1 +
 cypress/fixtures/example.json                 |   5 +
 cypress/integration/examples/actions.spec.js  | 298 ++++++++++++++++++
 cypress/integration/examples/aliasing.spec.js |  42 +++
 .../integration/examples/assertions.spec.js   | 168 ++++++++++
 .../integration/examples/connectors.spec.js   |  97 ++++++
 cypress/integration/examples/cookies.spec.js  |  78 +++++
 .../integration/examples/cypress_api.spec.js  | 222 +++++++++++++
 cypress/integration/examples/files.spec.js    | 114 +++++++
 .../examples/local_storage.spec.js            |  52 +++
 cypress/integration/examples/location.spec.js |  32 ++
 cypress/integration/examples/misc.spec.js     |  83 +++++
 .../integration/examples/navigation.spec.js   |  56 ++++
 .../examples/network_requests.spec.js         | 195 ++++++++++++
 cypress/integration/examples/querying.spec.js | 114 +++++++
 .../examples/spies_stubs_clocks.spec.js       |  95 ++++++
 .../integration/examples/traversal.spec.js    | 121 +++++++
 .../integration/examples/utilities.spec.js    | 133 ++++++++
 cypress/integration/examples/viewport.spec.js |  59 ++++
 cypress/integration/examples/waiting.spec.js  |  34 ++
 cypress/integration/examples/window.spec.js   |  22 ++
 cypress/plugins/index.js                      |  17 +
 cypress/support/commands.js                   |  25 ++
 cypress/support/index.js                      |  20 ++
 package.json                                  |   1 +
 tests/cypress/fixtures/1024x1024.png          | Bin 0 -> 40084 bytes
 tests/cypress/integration/06-messaging.js     |  10 +-
 .../integration/pwa/00-service-worker.js      |  39 +++
 tests/cypress/integration/pwa/01-login.js     | 273 ++++++++++++++++
 tests/cypress/integration/pwa/02-messaging.js | 277 ++++++++++++++++
 tests/cypress/pageobjects/Page.js             |   8 +-
 tests/cypress/pageobjects/global.js           |   2 +-
 tests/cypress/pageobjects/login.page.js       |  10 +-
 .../cypress/pageobjects/main-content.page.js  |  45 ++-
 tests/data/interactions.js                    |   1 +
 36 files changed, 2736 insertions(+), 15 deletions(-)
 create mode 100644 cypress.json
 create mode 100644 cypress/fixtures/example.json
 create mode 100644 cypress/integration/examples/actions.spec.js
 create mode 100644 cypress/integration/examples/aliasing.spec.js
 create mode 100644 cypress/integration/examples/assertions.spec.js
 create mode 100644 cypress/integration/examples/connectors.spec.js
 create mode 100644 cypress/integration/examples/cookies.spec.js
 create mode 100644 cypress/integration/examples/cypress_api.spec.js
 create mode 100644 cypress/integration/examples/files.spec.js
 create mode 100644 cypress/integration/examples/local_storage.spec.js
 create mode 100644 cypress/integration/examples/location.spec.js
 create mode 100644 cypress/integration/examples/misc.spec.js
 create mode 100644 cypress/integration/examples/navigation.spec.js
 create mode 100644 cypress/integration/examples/network_requests.spec.js
 create mode 100644 cypress/integration/examples/querying.spec.js
 create mode 100644 cypress/integration/examples/spies_stubs_clocks.spec.js
 create mode 100644 cypress/integration/examples/traversal.spec.js
 create mode 100644 cypress/integration/examples/utilities.spec.js
 create mode 100644 cypress/integration/examples/viewport.spec.js
 create mode 100644 cypress/integration/examples/waiting.spec.js
 create mode 100644 cypress/integration/examples/window.spec.js
 create mode 100644 cypress/plugins/index.js
 create mode 100644 cypress/support/commands.js
 create mode 100644 cypress/support/index.js
 create mode 100644 tests/cypress/fixtures/1024x1024.png
 create mode 100644 tests/cypress/integration/pwa/00-service-worker.js
 create mode 100644 tests/cypress/integration/pwa/01-login.js
 create mode 100644 tests/cypress/integration/pwa/02-messaging.js

diff --git a/app/ui-message/client/messageBox/messageBox.html b/app/ui-message/client/messageBox/messageBox.html
index 23ff6213cccc..d86ea647e186 100644
--- a/app/ui-message/client/messageBox/messageBox.html
+++ b/app/ui-message/client/messageBox/messageBox.html
@@ -34,7 +34,7 @@
 							{{> messageBoxAudioMessage rid=rid tmid=tmid}}
 							<span class="rc-message-box__action-menu js-action-menu" data-desktop aria-haspopup="true">
 								{{#if actions}}
-									<span class="rc-message-box__icon">
+									<span class="rc-message-box__icon js-plus">
 										{{> icon block="rc-input__icon-svg" icon="plus"}}
 									</span>
 								{{/if}}
diff --git a/cypress.json b/cypress.json
new file mode 100644
index 000000000000..0967ef424bce
--- /dev/null
+++ b/cypress.json
@@ -0,0 +1 @@
+{}
diff --git a/cypress/fixtures/example.json b/cypress/fixtures/example.json
new file mode 100644
index 000000000000..da18d9352a17
--- /dev/null
+++ b/cypress/fixtures/example.json
@@ -0,0 +1,5 @@
+{
+  "name": "Using fixtures to represent data",
+  "email": "hello@cypress.io",
+  "body": "Fixtures are a great way to mock data for responses to routes"
+}
\ No newline at end of file
diff --git a/cypress/integration/examples/actions.spec.js b/cypress/integration/examples/actions.spec.js
new file mode 100644
index 000000000000..96e5b0ed2aaa
--- /dev/null
+++ b/cypress/integration/examples/actions.spec.js
@@ -0,0 +1,298 @@
+/// <reference types="Cypress" />
+
+context('Actions', () => {
+  beforeEach(() => {
+    cy.visit('https://example.cypress.io/commands/actions')
+  })
+
+  // https://on.cypress.io/interacting-with-elements
+
+  it('.type() - type into a DOM element', () => {
+    // https://on.cypress.io/type
+    cy.get('.action-email')
+      .type('fake@email.com').should('have.value', 'fake@email.com')
+
+      // .type() with special character sequences
+      .type('{leftarrow}{rightarrow}{uparrow}{downarrow}')
+      .type('{del}{selectall}{backspace}')
+
+      // .type() with key modifiers
+      .type('{alt}{option}') //these are equivalent
+      .type('{ctrl}{control}') //these are equivalent
+      .type('{meta}{command}{cmd}') //these are equivalent
+      .type('{shift}')
+
+      // Delay each keypress by 0.1 sec
+      .type('slow.typing@email.com', { delay: 100 })
+      .should('have.value', 'slow.typing@email.com')
+
+    cy.get('.action-disabled')
+      // Ignore error checking prior to type
+      // like whether the input is visible or disabled
+      .type('disabled error checking', { force: true })
+      .should('have.value', 'disabled error checking')
+  })
+
+  it('.focus() - focus on a DOM element', () => {
+    // https://on.cypress.io/focus
+    cy.get('.action-focus').focus()
+      .should('have.class', 'focus')
+      .prev().should('have.attr', 'style', 'color: orange;')
+  })
+
+  it('.blur() - blur off a DOM element', () => {
+    // https://on.cypress.io/blur
+    cy.get('.action-blur').type('About to blur').blur()
+      .should('have.class', 'error')
+      .prev().should('have.attr', 'style', 'color: red;')
+  })
+
+  it('.clear() - clears an input or textarea element', () => {
+    // https://on.cypress.io/clear
+    cy.get('.action-clear').type('Clear this text')
+      .should('have.value', 'Clear this text')
+      .clear()
+      .should('have.value', '')
+  })
+
+  it('.submit() - submit a form', () => {
+    // https://on.cypress.io/submit
+    cy.get('.action-form')
+      .find('[type="text"]').type('HALFOFF')
+    cy.get('.action-form').submit()
+      .next().should('contain', 'Your form has been submitted!')
+  })
+
+  it('.click() - click on a DOM element', () => {
+    // https://on.cypress.io/click
+    cy.get('.action-btn').click()
+
+    // You can click on 9 specific positions of an element:
+    //  -----------------------------------
+    // | topLeft        top       topRight |
+    // |                                   |
+    // |                                   |
+    // |                                   |
+    // | left          center        right |
+    // |                                   |
+    // |                                   |
+    // |                                   |
+    // | bottomLeft   bottom   bottomRight |
+    //  -----------------------------------
+
+    // clicking in the center of the element is the default
+    cy.get('#action-canvas').click()
+
+    cy.get('#action-canvas').click('topLeft')
+    cy.get('#action-canvas').click('top')
+    cy.get('#action-canvas').click('topRight')
+    cy.get('#action-canvas').click('left')
+    cy.get('#action-canvas').click('right')
+    cy.get('#action-canvas').click('bottomLeft')
+    cy.get('#action-canvas').click('bottom')
+    cy.get('#action-canvas').click('bottomRight')
+
+    // .click() accepts an x and y coordinate
+    // that controls where the click occurs :)
+
+    cy.get('#action-canvas')
+      .click(80, 75) // click 80px on x coord and 75px on y coord
+      .click(170, 75)
+      .click(80, 165)
+      .click(100, 185)
+      .click(125, 190)
+      .click(150, 185)
+      .click(170, 165)
+
+    // click multiple elements by passing multiple: true
+    cy.get('.action-labels>.label').click({ multiple: true })
+
+    // Ignore error checking prior to clicking
+    cy.get('.action-opacity>.btn').click({ force: true })
+  })
+
+  it('.dblclick() - double click on a DOM element', () => {
+    // https://on.cypress.io/dblclick
+
+    // Our app has a listener on 'dblclick' event in our 'scripts.js'
+    // that hides the div and shows an input on double click
+    cy.get('.action-div').dblclick().should('not.be.visible')
+    cy.get('.action-input-hidden').should('be.visible')
+  })
+
+  it('.rightclick() - right click on a DOM element', () => {
+    // https://on.cypress.io/rightclick
+
+    // Our app has a listener on 'contextmenu' event in our 'scripts.js'
+    // that hides the div and shows an input on right click
+    cy.get('.rightclick-action-div').rightclick().should('not.be.visible')
+    cy.get('.rightclick-action-input-hidden').should('be.visible')
+  })
+
+  it('.check() - check a checkbox or radio element', () => {
+    // https://on.cypress.io/check
+
+    // By default, .check() will check all
+    // matching checkbox or radio elements in succession, one after another
+    cy.get('.action-checkboxes [type="checkbox"]').not('[disabled]')
+      .check().should('be.checked')
+
+    cy.get('.action-radios [type="radio"]').not('[disabled]')
+      .check().should('be.checked')
+
+    // .check() accepts a value argument
+    cy.get('.action-radios [type="radio"]')
+      .check('radio1').should('be.checked')
+
+    // .check() accepts an array of values
+    cy.get('.action-multiple-checkboxes [type="checkbox"]')
+      .check(['checkbox1', 'checkbox2']).should('be.checked')
+
+    // Ignore error checking prior to checking
+    cy.get('.action-checkboxes [disabled]')
+      .check({ force: true }).should('be.checked')
+
+    cy.get('.action-radios [type="radio"]')
+      .check('radio3', { force: true }).should('be.checked')
+  })
+
+  it('.uncheck() - uncheck a checkbox element', () => {
+    // https://on.cypress.io/uncheck
+
+    // By default, .uncheck() will uncheck all matching
+    // checkbox elements in succession, one after another
+    cy.get('.action-check [type="checkbox"]')
+      .not('[disabled]')
+      .uncheck().should('not.be.checked')
+
+    // .uncheck() accepts a value argument
+    cy.get('.action-check [type="checkbox"]')
+      .check('checkbox1')
+      .uncheck('checkbox1').should('not.be.checked')
+
+    // .uncheck() accepts an array of values
+    cy.get('.action-check [type="checkbox"]')
+      .check(['checkbox1', 'checkbox3'])
+      .uncheck(['checkbox1', 'checkbox3']).should('not.be.checked')
+
+    // Ignore error checking prior to unchecking
+    cy.get('.action-check [disabled]')
+      .uncheck({ force: true }).should('not.be.checked')
+  })
+
+  it('.select() - select an option in a <select> element', () => {
+    // https://on.cypress.io/select
+
+    // at first, no option should be selected
+    cy.get('.action-select')
+      .should('have.value', '--Select a fruit--')
+
+    // Select option(s) with matching text content
+    cy.get('.action-select').select('apples')
+    // confirm the apples were selected
+    // note that each value starts with "fr-" in our HTML
+    cy.get('.action-select').should('have.value', 'fr-apples')
+
+    cy.get('.action-select-multiple')
+      .select(['apples', 'oranges', 'bananas'])
+      // when getting multiple values, invoke "val" method first
+      .invoke('val')
+      .should('deep.equal', ['fr-apples', 'fr-oranges', 'fr-bananas'])
+
+    // Select option(s) with matching value
+    cy.get('.action-select').select('fr-bananas')
+      // can attach an assertion right away to the element
+      .should('have.value', 'fr-bananas')
+
+    cy.get('.action-select-multiple')
+      .select(['fr-apples', 'fr-oranges', 'fr-bananas'])
+      .invoke('val')
+      .should('deep.equal', ['fr-apples', 'fr-oranges', 'fr-bananas'])
+    // assert the selected values include oranges
+    cy.get('.action-select-multiple')
+      .invoke('val').should('include', 'fr-oranges')
+  })
+
+  it('.scrollIntoView() - scroll an element into view', () => {
+    // https://on.cypress.io/scrollintoview
+
+    // normally all of these buttons are hidden,
+    // because they're not within
+    // the viewable area of their parent
+    // (we need to scroll to see them)
+    cy.get('#scroll-horizontal button')
+      .should('not.be.visible')
+
+    // scroll the button into view, as if the user had scrolled
+    cy.get('#scroll-horizontal button').scrollIntoView()
+      .should('be.visible')
+
+    cy.get('#scroll-vertical button')
+      .should('not.be.visible')
+
+    // Cypress handles the scroll direction needed
+    cy.get('#scroll-vertical button').scrollIntoView()
+      .should('be.visible')
+
+    cy.get('#scroll-both button')
+      .should('not.be.visible')
+
+    // Cypress knows to scroll to the right and down
+    cy.get('#scroll-both button').scrollIntoView()
+      .should('be.visible')
+  })
+
+  it('.trigger() - trigger an event on a DOM element', () => {
+    // https://on.cypress.io/trigger
+
+    // To interact with a range input (slider)
+    // we need to set its value & trigger the
+    // event to signal it changed
+
+    // Here, we invoke jQuery's val() method to set
+    // the value and trigger the 'change' event
+    cy.get('.trigger-input-range')
+      .invoke('val', 25)
+      .trigger('change')
+      .get('input[type=range]').siblings('p')
+      .should('have.text', '25')
+  })
+
+  it('cy.scrollTo() - scroll the window or element to a position', () => {
+
+    // https://on.cypress.io/scrollTo
+
+    // You can scroll to 9 specific positions of an element:
+    //  -----------------------------------
+    // | topLeft        top       topRight |
+    // |                                   |
+    // |                                   |
+    // |                                   |
+    // | left          center        right |
+    // |                                   |
+    // |                                   |
+    // |                                   |
+    // | bottomLeft   bottom   bottomRight |
+    //  -----------------------------------
+
+    // if you chain .scrollTo() off of cy, we will
+    // scroll the entire window
+    cy.scrollTo('bottom')
+
+    cy.get('#scrollable-horizontal').scrollTo('right')
+
+    // or you can scroll to a specific coordinate:
+    // (x axis, y axis) in pixels
+    cy.get('#scrollable-vertical').scrollTo(250, 250)
+
+    // or you can scroll to a specific percentage
+    // of the (width, height) of the element
+    cy.get('#scrollable-both').scrollTo('75%', '25%')
+
+    // control the easing of the scroll (default is 'swing')
+    cy.get('#scrollable-vertical').scrollTo('center', { easing: 'linear' })
+
+    // control the duration of the scroll (in ms)
+    cy.get('#scrollable-both').scrollTo('center', { duration: 2000 })
+  })
+})
diff --git a/cypress/integration/examples/aliasing.spec.js b/cypress/integration/examples/aliasing.spec.js
new file mode 100644
index 000000000000..95bac735c44b
--- /dev/null
+++ b/cypress/integration/examples/aliasing.spec.js
@@ -0,0 +1,42 @@
+/// <reference types="Cypress" />
+
+context('Aliasing', () => {
+  beforeEach(() => {
+    cy.visit('https://example.cypress.io/commands/aliasing')
+  })
+
+  it('.as() - alias a DOM element for later use', () => {
+    // https://on.cypress.io/as
+
+    // Alias a DOM element for use later
+    // We don't have to traverse to the element
+    // later in our code, we reference it with @
+
+    cy.get('.as-table').find('tbody>tr')
+      .first().find('td').first()
+      .find('button').as('firstBtn')
+
+    // when we reference the alias, we place an
+    // @ in front of its name
+    cy.get('@firstBtn').click()
+
+    cy.get('@firstBtn')
+      .should('have.class', 'btn-success')
+      .and('contain', 'Changed')
+  })
+
+  it('.as() - alias a route for later use', () => {
+
+    // Alias the route to wait for its response
+    cy.server()
+    cy.route('GET', 'comments/*').as('getComment')
+
+    // we have code that gets a comment when
+    // the button is clicked in scripts.js
+    cy.get('.network-btn').click()
+
+    // https://on.cypress.io/wait
+    cy.wait('@getComment').its('status').should('eq', 200)
+
+  })
+})
diff --git a/cypress/integration/examples/assertions.spec.js b/cypress/integration/examples/assertions.spec.js
new file mode 100644
index 000000000000..791383b66518
--- /dev/null
+++ b/cypress/integration/examples/assertions.spec.js
@@ -0,0 +1,168 @@
+/// <reference types="Cypress" />
+
+context('Assertions', () => {
+  beforeEach(() => {
+    cy.visit('https://example.cypress.io/commands/assertions')
+  })
+
+  describe('Implicit Assertions', () => {
+    it('.should() - make an assertion about the current subject', () => {
+      // https://on.cypress.io/should
+      cy.get('.assertion-table')
+        .find('tbody tr:last')
+        .should('have.class', 'success')
+        .find('td')
+        .first()
+        // checking the text of the <td> element in various ways
+        .should('have.text', 'Column content')
+        .should('contain', 'Column content')
+        .should('have.html', 'Column content')
+        // chai-jquery uses "is()" to check if element matches selector
+        .should('match', 'td')
+        // to match text content against a regular expression
+        // first need to invoke jQuery method text()
+        // and then match using regular expression
+        .invoke('text')
+        .should('match', /column content/i)
+
+      // a better way to check element's text content against a regular expression
+      // is to use "cy.contains"
+      // https://on.cypress.io/contains
+      cy.get('.assertion-table')
+        .find('tbody tr:last')
+        // finds first <td> element with text content matching regular expression
+        .contains('td', /column content/i)
+        .should('be.visible')
+
+      // for more information about asserting element's text
+      // see https://on.cypress.io/using-cypress-faq#How-do-I-get-an-element’s-text-contents
+    })
+
+    it('.and() - chain multiple assertions together', () => {
+      // https://on.cypress.io/and
+      cy.get('.assertions-link')
+        .should('have.class', 'active')
+        .and('have.attr', 'href')
+        .and('include', 'cypress.io')
+    })
+  })
+
+  describe('Explicit Assertions', () => {
+    // https://on.cypress.io/assertions
+    it('expect - make an assertion about a specified subject', () => {
+      // We can use Chai's BDD style assertions
+      expect(true).to.be.true
+      const o = { foo: 'bar' }
+
+      expect(o).to.equal(o)
+      expect(o).to.deep.equal({ foo: 'bar' })
+      // matching text using regular expression
+      expect('FooBar').to.match(/bar$/i)
+    })
+
+    it('pass your own callback function to should()', () => {
+      // Pass a function to should that can have any number
+      // of explicit assertions within it.
+      // The ".should(cb)" function will be retried
+      // automatically until it passes all your explicit assertions or times out.
+      cy.get('.assertions-p')
+        .find('p')
+        .should(($p) => {
+          // https://on.cypress.io/$
+          // return an array of texts from all of the p's
+          // @ts-ignore TS6133 unused variable
+          const texts = $p.map((i, el) => Cypress.$(el).text())
+
+          // jquery map returns jquery object
+          // and .get() convert this to simple array
+          const paragraphs = texts.get()
+
+          // array should have length of 3
+          expect(paragraphs, 'has 3 paragraphs').to.have.length(3)
+
+          // use second argument to expect(...) to provide clear
+          // message with each assertion
+          expect(paragraphs, 'has expected text in each paragraph').to.deep.eq([
+            'Some text from first p',
+            'More text from second p',
+            'And even more text from third p',
+          ])
+        })
+    })
+
+    it('finds element by class name regex', () => {
+      cy.get('.docs-header')
+        .find('div')
+        // .should(cb) callback function will be retried
+        .should(($div) => {
+          expect($div).to.have.length(1)
+
+          const className = $div[0].className
+
+          expect(className).to.match(/heading-/)
+        })
+        // .then(cb) callback is not retried,
+        // it either passes or fails
+        .then(($div) => {
+          expect($div, 'text content').to.have.text('Introduction')
+        })
+    })
+
+    it('can throw any error', () => {
+      cy.get('.docs-header')
+        .find('div')
+        .should(($div) => {
+          if ($div.length !== 1) {
+            // you can throw your own errors
+            throw new Error('Did not find 1 element')
+          }
+
+          const className = $div[0].className
+
+          if (!className.match(/heading-/)) {
+            throw new Error(`Could not find class "heading-" in ${className}`)
+          }
+        })
+    })
+
+    it('matches unknown text between two elements', () => {
+      /**
+       * Text from the first element.
+       * @type {string}
+      */
+      let text
+
+      /**
+       * Normalizes passed text,
+       * useful before comparing text with spaces and different capitalization.
+       * @param {string} s Text to normalize
+      */
+      const normalizeText = (s) => s.replace(/\s/g, '').toLowerCase()
+
+      cy.get('.two-elements')
+        .find('.first')
+        .then(($first) => {
+          // save text from the first element
+          text = normalizeText($first.text())
+        })
+
+      cy.get('.two-elements')
+        .find('.second')
+        .should(($div) => {
+          // we can massage text before comparing
+          const secondText = normalizeText($div.text())
+
+          expect(secondText, 'second text').to.equal(text)
+        })
+    })
+
+    it('assert - assert shape of an object', () => {
+      const person = {
+        name: 'Joe',
+        age: 20,
+      }
+
+      assert.isObject(person, 'value is object')
+    })
+  })
+})
diff --git a/cypress/integration/examples/connectors.spec.js b/cypress/integration/examples/connectors.spec.js
new file mode 100644
index 000000000000..dc8e2864d26c
--- /dev/null
+++ b/cypress/integration/examples/connectors.spec.js
@@ -0,0 +1,97 @@
+/// <reference types="Cypress" />
+
+context('Connectors', () => {
+  beforeEach(() => {
+    cy.visit('https://example.cypress.io/commands/connectors')
+  })
+
+  it('.each() - iterate over an array of elements', () => {
+    // https://on.cypress.io/each
+    cy.get('.connectors-each-ul>li')
+      .each(($el, index, $list) => {
+        console.log($el, index, $list)
+      })
+  })
+
+  it('.its() - get properties on the current subject', () => {
+    // https://on.cypress.io/its
+    cy.get('.connectors-its-ul>li')
+      // calls the 'length' property yielding that value
+      .its('length')
+      .should('be.gt', 2)
+  })
+
+  it('.invoke() - invoke a function on the current subject', () => {
+    // our div is hidden in our script.js
+    // $('.connectors-div').hide()
+
+    // https://on.cypress.io/invoke
+    cy.get('.connectors-div').should('be.hidden')
+      // call the jquery method 'show' on the 'div.container'
+      .invoke('show')
+      .should('be.visible')
+  })
+
+  it('.spread() - spread an array as individual args to callback function', () => {
+    // https://on.cypress.io/spread
+    const arr = ['foo', 'bar', 'baz']
+
+    cy.wrap(arr).spread((foo, bar, baz) => {
+      expect(foo).to.eq('foo')
+      expect(bar).to.eq('bar')
+      expect(baz).to.eq('baz')
+    })
+  })
+
+  describe('.then()', () => {
+    it('invokes a callback function with the current subject', () => {
+      // https://on.cypress.io/then
+      cy.get('.connectors-list > li')
+        .then(($lis) => {
+          expect($lis, '3 items').to.have.length(3)
+          expect($lis.eq(0), 'first item').to.contain('Walk the dog')
+          expect($lis.eq(1), 'second item').to.contain('Feed the cat')
+          expect($lis.eq(2), 'third item').to.contain('Write JavaScript')
+        })
+    })
+
+    it('yields the returned value to the next command', () => {
+      cy.wrap(1)
+        .then((num) => {
+          expect(num).to.equal(1)
+
+          return 2
+        })
+        .then((num) => {
+          expect(num).to.equal(2)
+        })
+    })
+
+    it('yields the original subject without return', () => {
+      cy.wrap(1)
+        .then((num) => {
+          expect(num).to.equal(1)
+          // note that nothing is returned from this callback
+        })
+        .then((num) => {
+          // this callback receives the original unchanged value 1
+          expect(num).to.equal(1)
+        })
+    })
+
+    it('yields the value yielded by the last Cypress command inside', () => {
+      cy.wrap(1)
+        .then((num) => {
+          expect(num).to.equal(1)
+          // note how we run a Cypress command
+          // the result yielded by this Cypress command
+          // will be passed to the second ".then"
+          cy.wrap(2)
+        })
+        .then((num) => {
+          // this callback receives the value yielded by "cy.wrap(2)"
+          expect(num).to.equal(2)
+        })
+    })
+  })
+})
diff --git a/cypress/integration/examples/cookies.spec.js b/cypress/integration/examples/cookies.spec.js
new file mode 100644
index 000000000000..bb540e95eb0a
--- /dev/null
+++ b/cypress/integration/examples/cookies.spec.js
@@ -0,0 +1,78 @@
+/// <reference types="Cypress" />
+
+context('Cookies', () => {
+  beforeEach(() => {
+    Cypress.Cookies.debug(true)
+
+    cy.visit('https://example.cypress.io/commands/cookies')
+
+    // clear cookies again after visiting to remove
+    // any 3rd party cookies picked up such as cloudflare
+    cy.clearCookies()
+  })
+
+  it('cy.getCookie() - get a browser cookie', () => {
+    // https://on.cypress.io/getcookie
+    cy.get('#getCookie .set-a-cookie').click()
+
+    // cy.getCookie() yields a cookie object
+    cy.getCookie('token').should('have.property', 'value', '123ABC')
+  })
+
+  it('cy.getCookies() - get browser cookies', () => {
+    // https://on.cypress.io/getcookies
+    cy.getCookies().should('be.empty')
+
+    cy.get('#getCookies .set-a-cookie').click()
+
+    // cy.getCookies() yields an array of cookies
+    cy.getCookies().should('have.length', 1).should((cookies) => {
+
+      // each cookie has these properties
+      expect(cookies[0]).to.have.property('name', 'token')
+      expect(cookies[0]).to.have.property('value', '123ABC')
+      expect(cookies[0]).to.have.property('httpOnly', false)
+      expect(cookies[0]).to.have.property('secure', false)
+      expect(cookies[0]).to.have.property('domain')
+      expect(cookies[0]).to.have.property('path')
+    })
+  })
+
+  it('cy.setCookie() - set a browser cookie', () => {
+    // https://on.cypress.io/setcookie
+    cy.getCookies().should('be.empty')
+
+    cy.setCookie('foo', 'bar')
+
+    // cy.getCookie() yields a cookie object
+    cy.getCookie('foo').should('have.property', 'value', 'bar')
+  })
+
+  it('cy.clearCookie() - clear a browser cookie', () => {
+    // https://on.cypress.io/clearcookie
+    cy.getCookie('token').should('be.null')
+
+    cy.get('#clearCookie .set-a-cookie').click()
+
+    cy.getCookie('token').should('have.property', 'value', '123ABC')
+
+    // cy.clearCookies() yields null
+    cy.clearCookie('token').should('be.null')
+
+    cy.getCookie('token').should('be.null')
+  })
+
+  it('cy.clearCookies() - clear browser cookies', () => {
+    // https://on.cypress.io/clearcookies
+    cy.getCookies().should('be.empty')
+
+    cy.get('#clearCookies .set-a-cookie').click()
+
+    cy.getCookies().should('have.length', 1)
+
+    // cy.clearCookies() yields null
+    cy.clearCookies()
+
+    cy.getCookies().should('be.empty')
+  })
+})
diff --git a/cypress/integration/examples/cypress_api.spec.js b/cypress/integration/examples/cypress_api.spec.js
new file mode 100644
index 000000000000..0e46520cd161
--- /dev/null
+++ b/cypress/integration/examples/cypress_api.spec.js
@@ -0,0 +1,222 @@
+/// <reference types="Cypress" />
+
+context('Cypress.Commands', () => {
+  beforeEach(() => {
+    cy.visit('https://example.cypress.io/cypress-api')
+  })
+
+  // https://on.cypress.io/custom-commands
+
+  it('.add() - create a custom command', () => {
+    Cypress.Commands.add('console', {
+      prevSubject: true,
+    }, (subject, method) => {
+      // the previous subject is automatically received
+      // and the commands arguments are shifted
+
+      // allow us to change the console method used
+      method = method || 'log'
+
+      // log the subject to the console
+      // @ts-ignore TS7017
+      console[method]('The subject is', subject)
+
+      // whatever we return becomes the new subject
+      // we don't want to change the subject so
+      // we return whatever was passed in
+      return subject
+    })
+
+    // @ts-ignore TS2339
+    cy.get('button').console('info').then(($button) => {
+      // subject is still $button
+    })
+  })
+})
+
+
+context('Cypress.Cookies', () => {
+  beforeEach(() => {
+    cy.visit('https://example.cypress.io/cypress-api')
+  })
+
+  // https://on.cypress.io/cookies
+  it('.debug() - enable or disable debugging', () => {
+    Cypress.Cookies.debug(true)
+
+    // Cypress will now log in the console when
+    // cookies are set or cleared
+    cy.setCookie('fakeCookie', '123ABC')
+    cy.clearCookie('fakeCookie')
+    cy.setCookie('fakeCookie', '123ABC')
+    cy.clearCookie('fakeCookie')
+    cy.setCookie('fakeCookie', '123ABC')
+  })
+
+  it('.preserveOnce() - preserve cookies by key', () => {
+    // normally cookies are reset after each test
+    cy.getCookie('fakeCookie').should('not.be.ok')
+
+    // preserving a cookie will not clear it when
+    // the next test starts
+    cy.setCookie('lastCookie', '789XYZ')
+    Cypress.Cookies.preserveOnce('lastCookie')
+  })
+
+  it('.defaults() - set defaults for all cookies', () => {
+    // now any cookie with the name 'session_id' will
+    // not be cleared before each new test runs
+    Cypress.Cookies.defaults({
+      whitelist: 'session_id',
+    })
+  })
+})
+
+
+context('Cypress.Server', () => {
+  beforeEach(() => {
+    cy.visit('https://example.cypress.io/cypress-api')
+  })
+
+  // Permanently override server options for
+  // all instances of cy.server()
+
+  // https://on.cypress.io/cypress-server
+  it('.defaults() - change default config of server', () => {
+    Cypress.Server.defaults({
+      delay: 0,
+      force404: false,
+    })
+  })
+})
+
+context('Cypress.arch', () => {
+  beforeEach(() => {
+    cy.visit('https://example.cypress.io/cypress-api')
+  })
+
+  it('Get CPU architecture name of underlying OS', () => {
+    // https://on.cypress.io/arch
+    expect(Cypress.arch).to.exist
+  })
+})
+
+context('Cypress.config()', () => {
+  beforeEach(() => {
+    cy.visit('https://example.cypress.io/cypress-api')
+  })
+
+  it('Get and set configuration options', () => {
+    // https://on.cypress.io/config
+    let myConfig = Cypress.config()
+
+    expect(myConfig).to.have.property('animationDistanceThreshold', 5)
+    expect(myConfig).to.have.property('baseUrl', null)
+    expect(myConfig).to.have.property('defaultCommandTimeout', 4000)
+    expect(myConfig).to.have.property('requestTimeout', 5000)
+    expect(myConfig).to.have.property('responseTimeout', 30000)
+    expect(myConfig).to.have.property('viewportHeight', 660)
+    expect(myConfig).to.have.property('viewportWidth', 1000)
+    expect(myConfig).to.have.property('pageLoadTimeout', 60000)
+    expect(myConfig).to.have.property('waitForAnimations', true)
+
+    expect(Cypress.config('pageLoadTimeout')).to.eq(60000)
+
+    // this will change the config for the rest of your tests!
+    Cypress.config('pageLoadTimeout', 20000)
+
+    expect(Cypress.config('pageLoadTimeout')).to.eq(20000)
+
+    Cypress.config('pageLoadTimeout', 60000)
+  })
+})
+
+context('Cypress.dom', () => {
+  beforeEach(() => {
+    cy.visit('https://example.cypress.io/cypress-api')
+  })
+
+  // https://on.cypress.io/dom
+  it('.isHidden() - determine if a DOM element is hidden', () => {
+    let hiddenP = Cypress.$('.dom-p p.hidden').get(0)
+    let visibleP = Cypress.$('.dom-p p.visible').get(0)
+
+    // our first paragraph has css class 'hidden'
+    expect(Cypress.dom.isHidden(hiddenP)).to.be.true
+    expect(Cypress.dom.isHidden(visibleP)).to.be.false
+  })
+})
+
+context('Cypress.env()', () => {
+  beforeEach(() => {
+    cy.visit('https://example.cypress.io/cypress-api')
+  })
+
+  // We can set environment variables for highly dynamic values
+
+  // https://on.cypress.io/environment-variables
+  it('Get environment variables', () => {
+    // https://on.cypress.io/env
+    // set multiple environment variables
+    Cypress.env({
+      host: 'veronica.dev.local',
+      api_server: 'http://localhost:8888/v1/',
+    })
+
+    // get environment variable
+    expect(Cypress.env('host')).to.eq('veronica.dev.local')
+
+    // set environment variable
+    Cypress.env('api_server', 'http://localhost:8888/v2/')
+    expect(Cypress.env('api_server')).to.eq('http://localhost:8888/v2/')
+
+    // get all environment variable
+    expect(Cypress.env()).to.have.property('host', 'veronica.dev.local')
+    expect(Cypress.env()).to.have.property('api_server', 'http://localhost:8888/v2/')
+  })
+})
+
+context('Cypress.log', () => {
+  beforeEach(() => {
+    cy.visit('https://example.cypress.io/cypress-api')
+  })
+
+  it('Control what is printed to the Command Log', () => {
+    // https://on.cypress.io/cypress-log
+  })
+})
+
+
+context('Cypress.platform', () => {
+  beforeEach(() => {
+    cy.visit('https://example.cypress.io/cypress-api')
+  })
+
+  it('Get underlying OS name', () => {
+    // https://on.cypress.io/platform
+    expect(Cypress.platform).to.be.exist
+  })
+})
+
+context('Cypress.version', () => {
+  beforeEach(() => {
+    cy.visit('https://example.cypress.io/cypress-api')
+  })
+
+  it('Get current version of Cypress being run', () => {
+    // https://on.cypress.io/version
+    expect(Cypress.version).to.be.exist
+  })
+})
+
+context('Cypress.spec', () => {
+  beforeEach(() => {
+    cy.visit('https://example.cypress.io/cypress-api')
+  })
+
+  it('Get current spec information', () => {
+    // https://on.cypress.io/spec
+    // wrap the object so we can inspect it easily by clicking in the command log
+    cy.wrap(Cypress.spec).should('have.keys', ['name', 'relative', 'absolute'])
+  })
+})
diff --git a/cypress/integration/examples/files.spec.js b/cypress/integration/examples/files.spec.js
new file mode 100644
index 000000000000..6f41c637c8f8
--- /dev/null
+++ b/cypress/integration/examples/files.spec.js
@@ -0,0 +1,114 @@
+/// <reference types="Cypress" />
+
+/// JSON fixture file can be loaded directly using
+// the built-in JavaScript bundler
+// @ts-ignore
+const requiredExample = require('../../fixtures/example')
+
+context('Files', () => {
+  beforeEach(() => {
+    cy.visit('https://example.cypress.io/commands/files')
+  })
+
+  beforeEach(() => {
+    // load example.json fixture file and store
+    // in the test context object
+    cy.fixture('example.json').as('example')
+  })
+
+  it('cy.fixture() - load a fixture', () => {
+    // https://on.cypress.io/fixture
+
+    // Instead of writing a response inline you can
+    // use a fixture file's content.
+
+    cy.server()
+    cy.fixture('example.json').as('comment')
+    // when application makes an Ajax request matching "GET comments/*"
+    // Cypress will intercept it and reply with object
+    // from the "comment" alias
+    cy.route('GET', 'comments/*', '@comment').as('getComment')
+
+    // we have code that gets a comment when
+    // the button is clicked in scripts.js
+    cy.get('.fixture-btn').click()
+
+    cy.wait('@getComment').its('responseBody')
+      .should('have.property', 'name')
+      .and('include', 'Using fixtures to represent data')
+
+    // you can also just write the fixture in the route
+    cy.route('GET', 'comments/*', 'fixture:example.json').as('getComment')
+
+    // we have code that gets a comment when
+    // the button is clicked in scripts.js
+    cy.get('.fixture-btn').click()
+
+    cy.wait('@getComment').its('responseBody')
+      .should('have.property', 'name')
+      .and('include', 'Using fixtures to represent data')
+
+    // or write fx to represent fixture
+    // by default it assumes it's .json
+    cy.route('GET', 'comments/*', 'fx:example').as('getComment')
+
+    // we have code that gets a comment when
+    // the button is clicked in scripts.js
+    cy.get('.fixture-btn').click()
+
+    cy.wait('@getComment').its('responseBody')
+      .should('have.property', 'name')
+      .and('include', 'Using fixtures to represent data')
+  })
+
+  it('cy.fixture() or require - load a fixture', function () {
+    // we are inside the "function () { ... }"
+    // callback and can use test context object "this"
+    // "this.example" was loaded in "beforeEach" function callback
+    expect(this.example, 'fixture in the test context')
+      .to.deep.equal(requiredExample)
+
+    // or use "cy.wrap" and "should('deep.equal', ...)" assertion
+    // @ts-ignore
+    cy.wrap(this.example, 'fixture vs require')
+      .should('deep.equal', requiredExample)
+  })
+
+  it('cy.readFile() - read file contents', () => {
+    // https://on.cypress.io/readfile
+
+    // You can read a file and yield its contents
+    // The filePath is relative to your project's root.
+    cy.readFile('cypress.json').then((json) => {
+      expect(json).to.be.an('object')
+    })
+  })
+
+  it('cy.writeFile() - write to a file', () => {
+    // https://on.cypress.io/writefile
+
+    // You can write to a file
+
+    // Use a response from a request to automatically
+    // generate a fixture file for use later
+    cy.request('https://jsonplaceholder.cypress.io/users')
+      .then((response) => {
+        cy.writeFile('cypress/fixtures/users.json', response.body)
+      })
+    cy.fixture('users').should((users) => {
+      expect(users[0].name).to.exist
+    })
+
+    // JavaScript arrays and objects are stringified
+    // and formatted into text.
+    cy.writeFile('cypress/fixtures/profile.json', {
+      id: 8739,
+      name: 'Jane',
+      email: 'jane@example.com',
+    })
+
+    cy.fixture('profile').should((profile) => {
+      expect(profile.name).to.eq('Jane')
+    })
+  })
+})
diff --git a/cypress/integration/examples/local_storage.spec.js b/cypress/integration/examples/local_storage.spec.js
new file mode 100644
index 000000000000..076b096fc373
--- /dev/null
+++ b/cypress/integration/examples/local_storage.spec.js
@@ -0,0 +1,52 @@
+/// <reference types="Cypress" />
+
+context('Local Storage', () => {
+  beforeEach(() => {
+    cy.visit('https://example.cypress.io/commands/local-storage')
+  })
+  // Although local storage is automatically cleared
+  // in between tests to maintain a clean state
+  // sometimes we need to clear the local storage manually
+
+  it('cy.clearLocalStorage() - clear all data in local storage', () => {
+    // https://on.cypress.io/clearlocalstorage
+    cy.get('.ls-btn').click().should(() => {
+      expect(localStorage.getItem('prop1')).to.eq('red')
+      expect(localStorage.getItem('prop2')).to.eq('blue')
+      expect(localStorage.getItem('prop3')).to.eq('magenta')
+    })
+
+    // clearLocalStorage() yields the localStorage object
+    cy.clearLocalStorage().should((ls) => {
+      expect(ls.getItem('prop1')).to.be.null
+      expect(ls.getItem('prop2')).to.be.null
+      expect(ls.getItem('prop3')).to.be.null
+    })
+
+    // Clear key matching string in Local Storage
+    cy.get('.ls-btn').click().should(() => {
+      expect(localStorage.getItem('prop1')).to.eq('red')
+      expect(localStorage.getItem('prop2')).to.eq('blue')
+      expect(localStorage.getItem('prop3')).to.eq('magenta')
+    })
+
+    cy.clearLocalStorage('prop1').should((ls) => {
+      expect(ls.getItem('prop1')).to.be.null
+      expect(ls.getItem('prop2')).to.eq('blue')
+      expect(ls.getItem('prop3')).to.eq('magenta')
+    })
+
+    // Clear keys matching regex in Local Storage
+    cy.get('.ls-btn').click().should(() => {
+      expect(localStorage.getItem('prop1')).to.eq('red')
+      expect(localStorage.getItem('prop2')).to.eq('blue')
+      expect(localStorage.getItem('prop3')).to.eq('magenta')
+    })
+
+    cy.clearLocalStorage(/prop1|2/).should((ls) => {
+      expect(ls.getItem('prop1')).to.be.null
+      expect(ls.getItem('prop2')).to.be.null
+      expect(ls.getItem('prop3')).to.eq('magenta')
+    })
+  })
+})
diff --git a/cypress/integration/examples/location.spec.js b/cypress/integration/examples/location.spec.js
new file mode 100644
index 000000000000..68e755c101ca
--- /dev/null
+++ b/cypress/integration/examples/location.spec.js
@@ -0,0 +1,32 @@
+/// <reference types="Cypress" />
+
+context('Location', () => {
+  beforeEach(() => {
+    cy.visit('https://example.cypress.io/commands/location')
+  })
+
+  it('cy.hash() - get the current URL hash', () => {
+    // https://on.cypress.io/hash
+    cy.hash().should('be.empty')
+  })
+
+  it('cy.location() - get window.location', () => {
+    // https://on.cypress.io/location
+    cy.location().should((location) => {
+      expect(location.hash).to.be.empty
+      expect(location.href).to.eq('https://example.cypress.io/commands/location')
+      expect(location.host).to.eq('example.cypress.io')
+      expect(location.hostname).to.eq('example.cypress.io')
+      expect(location.origin).to.eq('https://example.cypress.io')
+      expect(location.pathname).to.eq('/commands/location')
+      expect(location.port).to.eq('')
+      expect(location.protocol).to.eq('https:')
+      expect(location.search).to.be.empty
+    })
+  })
+
+  it('cy.url() - get the current URL', () => {
+    // https://on.cypress.io/url
+    cy.url().should('eq', 'https://example.cypress.io/commands/location')
+  })
+})
diff --git a/cypress/integration/examples/misc.spec.js b/cypress/integration/examples/misc.spec.js
new file mode 100644
index 000000000000..97edd8be0a47
--- /dev/null
+++ b/cypress/integration/examples/misc.spec.js
@@ -0,0 +1,83 @@
+/// <reference types="Cypress" />
+
+context('Misc', () => {
+  beforeEach(() => {
+    cy.visit('https://example.cypress.io/commands/misc')
+  })
+
+  it('.end() - end the command chain', () => {
+    // https://on.cypress.io/end
+
+    // cy.end is useful when you want to end a chain of commands
+    // and force Cypress to re-query from the root element
+    cy.get('.misc-table').within(() => {
+      // ends the current chain and yields null
+      cy.contains('Cheryl').click().end()
+
+      // queries the entire table again
+      cy.contains('Charles').click()
+    })
+  })
+
+  it('cy.exec() - execute a system command', () => {
+    // https://on.cypress.io/exec
+
+    // execute a system command.
+    // so you can take actions necessary for
+    // your test outside the scope of Cypress.
+    cy.exec('echo Jane Lane')
+      .its('stdout').should('contain', 'Jane Lane')
+
+    // we can use Cypress.platform string to
+    // select appropriate command
+    // https://on.cypress/io/platform
+    cy.log(`Platform ${Cypress.platform} architecture ${Cypress.arch}`)
+
+    if (Cypress.platform === 'win32') {
+      cy.exec('print cypress.json')
+        .its('stderr').should('be.empty')
+    } else {
+      cy.exec('cat cypress.json')
+        .its('stderr').should('be.empty')
+
+      cy.exec('pwd')
+        .its('code').should('eq', 0)
+    }
+  })
+
+  it('cy.focused() - get the DOM element that has focus', () => {
+    // https://on.cypress.io/focused
+    cy.get('.misc-form').find('#name').click()
+    cy.focused().should('have.id', 'name')
+
+    cy.get('.misc-form').find('#description').click()
+    cy.focused().should('have.id', 'description')
+  })
+
+  context('Cypress.Screenshot', function () {
+    it('cy.screenshot() - take a screenshot', () => {
+      // https://on.cypress.io/screenshot
+      cy.screenshot('my-image')
+    })
+
+    it('Cypress.Screenshot.defaults() - change default config of screenshots', function () {
+      Cypress.Screenshot.defaults({
+        blackout: ['.foo'],
+        capture: 'viewport',
+        clip: { x: 0, y: 0, width: 200, height: 200 },
+        scale: false,
+        disableTimersAndAnimations: true,
+        screenshotOnRunFailure: true,
+        beforeScreenshot () { },
+        afterScreenshot () { },
+      })
+    })
+  })
+
+  it('cy.wrap() - wrap an object', () => {
+    // https://on.cypress.io/wrap
+    cy.wrap({ foo: 'bar' })
+      .should('have.property', 'foo')
+      .and('include', 'bar')
+  })
+})
diff --git a/cypress/integration/examples/navigation.spec.js b/cypress/integration/examples/navigation.spec.js
new file mode 100644
index 000000000000..bbd9d479c811
--- /dev/null
+++ b/cypress/integration/examples/navigation.spec.js
@@ -0,0 +1,56 @@
+/// <reference types="Cypress" />
+
+context('Navigation', () => {
+  beforeEach(() => {
+    cy.visit('https://example.cypress.io')
+    cy.get('.navbar-nav').contains('Commands').click()
+    cy.get('.dropdown-menu').contains('Navigation').click()
+  })
+
+  it('cy.go() - go back or forward in the browser\'s history', () => {
+    // https://on.cypress.io/go
+
+    cy.location('pathname').should('include', 'navigation')
+
+    cy.go('back')
+    cy.location('pathname').should('not.include', 'navigation')
+
+    cy.go('forward')
+    cy.location('pathname').should('include', 'navigation')
+
+    // clicking back
+    cy.go(-1)
+    cy.location('pathname').should('not.include', 'navigation')
+
+    // clicking forward
+    cy.go(1)
+    cy.location('pathname').should('include', 'navigation')
+  })
+
+  it('cy.reload() - reload the page', () => {
+    // https://on.cypress.io/reload
+    cy.reload()
+
+    // reload the page without using the cache
+    cy.reload(true)
+  })
+
+  it('cy.visit() - visit a remote url', () => {
+    // https://on.cypress.io/visit
+
+    // Visit any sub-domain of your current domain
+
+    // Pass options to the visit
+    cy.visit('https://example.cypress.io/commands/navigation', {
+      timeout: 50000, // increase total time for the visit to resolve
+      onBeforeLoad (contentWindow) {
+        // contentWindow is the remote page's window object
+        expect(typeof contentWindow === 'object').to.be.true
+      },
+      onLoad (contentWindow) {
+        // contentWindow is the remote page's window object
+        expect(typeof contentWindow === 'object').to.be.true
+      },
+    })
+    })
+})
diff --git a/cypress/integration/examples/network_requests.spec.js b/cypress/integration/examples/network_requests.spec.js
new file mode 100644
index 000000000000..ca4b404b72a7
--- /dev/null
+++ b/cypress/integration/examples/network_requests.spec.js
@@ -0,0 +1,195 @@
+/// <reference types="Cypress" />
+
+context('Network Requests', () => {
+  beforeEach(() => {
+    cy.visit('https://example.cypress.io/commands/network-requests')
+  })
+
+  // Manage AJAX / XHR requests in your app
+
+  it('cy.server() - control behavior of network requests and responses', () => {
+    // https://on.cypress.io/server
+
+    cy.server().should((server) => {
+      // the default options on server
+      // you can override any of these options
+      expect(server.delay).to.eq(0)
+      expect(server.method).to.eq('GET')
+      expect(server.status).to.eq(200)
+      expect(server.headers).to.be.null
+      expect(server.response).to.be.null
+      expect(server.onRequest).to.be.undefined
+      expect(server.onResponse).to.be.undefined
+      expect(server.onAbort).to.be.undefined
+
+      // These options control the server behavior
+      // affecting all requests
+
+      // pass false to disable existing route stubs
+      expect(server.enable).to.be.true
+      // forces requests that don't match your routes to 404
+      expect(server.force404).to.be.false
+      // whitelists requests from ever being logged or stubbed
+      expect(server.whitelist).to.be.a('function')
+    })
+
+    cy.server({
+      method: 'POST',
+      delay: 1000,
+      status: 422,
+      response: {},
+    })
+
+    // any route commands will now inherit the above options
+    // from the server. anything we pass specifically
+    // to route will override the defaults though.
+  })
+
+  it('cy.request() - make an XHR request', () => {
+    // https://on.cypress.io/request
+    cy.request('https://jsonplaceholder.cypress.io/comments')
+      .should((response) => {
+        expect(response.status).to.eq(200)
+        expect(response.body).to.have.length(500)
+        expect(response).to.have.property('headers')
+        expect(response).to.have.property('duration')
+      })
+  })
+
+
+  it('cy.request() - verify response using BDD syntax', () => {
+    cy.request('https://jsonplaceholder.cypress.io/comments')
+    .then((response) => {
+      // https://on.cypress.io/assertions
+      expect(response).property('status').to.equal(200)
+      expect(response).property('body').to.have.length(500)
+      expect(response).to.include.keys('headers', 'duration')
+    })
+  })
+
+  it('cy.request() with query parameters', () => {
+    // will execute request
+    // https://jsonplaceholder.cypress.io/comments?postId=1&id=3
+    cy.request({
+      url: 'https://jsonplaceholder.cypress.io/comments',
+      qs: {
+        postId: 1,
+        id: 3,
+      },
+    })
+    .its('body')
+    .should('be.an', 'array')
+    .and('have.length', 1)
+    .its('0') // yields first element of the array
+    .should('contain', {
+      postId: 1,
+      id: 3,
+    })
+  })
+
+  it('cy.request() - pass result to the second request', () => {
+    // first, let's find out the userId of the first user we have
+    cy.request('https://jsonplaceholder.cypress.io/users?_limit=1')
+      .its('body') // yields the response object
+      .its('0') // yields the first element of the returned list
+      // the above two commands its('body').its('0')
+      // can be written as its('body.0')
+      // if you do not care about TypeScript checks
+      .then((user) => {
+        expect(user).property('id').to.be.a('number')
+        // make a new post on behalf of the user
+        cy.request('POST', 'https://jsonplaceholder.cypress.io/posts', {
+          userId: user.id,
+          title: 'Cypress Test Runner',
+          body: 'Fast, easy and reliable testing for anything that runs in a browser.',
+        })
+      })
+      // note that the value here is the returned value of the 2nd request
+      // which is the new post object
+      .then((response) => {
+        expect(response).property('status').to.equal(201) // new entity created
+        expect(response).property('body').to.contain({
+          id: 101, // there are already 100 posts, so new entity gets id 101
+          title: 'Cypress Test Runner',
+        })
+        // we don't know the user id here - since it was in above closure
+        // so in this test just confirm that the property is there
+        expect(response.body).property('userId').to.be.a('number')
+      })
+  })
+
+  it('cy.request() - save response in the shared test context', () => {
+    // https://on.cypress.io/variables-and-aliases
+    cy.request('https://jsonplaceholder.cypress.io/users?_limit=1')
+      .its('body').its('0') // yields the first element of the returned list
+      .as('user') // saves the object in the test context
+      .then(function () {
+        // NOTE 👀
+        //  By the time this callback runs the "as('user')" command
+        //  has saved the user object in the test context.
+        //  To access the test context we need to use
+        //  the "function () { ... }" callback form,
+        //  otherwise "this" points at a wrong or undefined object!
+        cy.request('POST', 'https://jsonplaceholder.cypress.io/posts', {
+          userId: this.user.id,
+          title: 'Cypress Test Runner',
+          body: 'Fast, easy and reliable testing for anything that runs in a browser.',
+        })
+        .its('body').as('post') // save the new post from the response
+      })
+      .then(function () {
+        // When this callback runs, both "cy.request" API commands have finished
+        // and the test context has "user" and "post" objects set.
+        // Let's verify them.
+        expect(this.post, 'post has the right user id').property('userId').to.equal(this.user.id)
+      })
+  })
+
+  it('cy.route() - route responses to matching requests', () => {
+    // https://on.cypress.io/route
+
+    let message = 'whoa, this comment does not exist'
+
+    cy.server()
+
+    // Listen to GET to comments/1
+    cy.route('GET', 'comments/*').as('getComment')
+
+    // we have code that gets a comment when
+    // the button is clicked in scripts.js
+    cy.get('.network-btn').click()
+
+    // https://on.cypress.io/wait
+    cy.wait('@getComment').its('status').should('eq', 200)
+
+    // Listen to POST to comments
+    cy.route('POST', '/comments').as('postComment')
+
+    // we have code that posts a comment when
+    // the button is clicked in scripts.js
+    cy.get('.network-post').click()
+    cy.wait('@postComment').should((xhr) => {
+      expect(xhr.requestBody).to.include('email')
+      expect(xhr.requestHeaders).to.have.property('Content-Type')
+      expect(xhr.responseBody).to.have.property('name', 'Using POST in cy.route()')
+    })
+
+    // Stub a response to PUT comments/ ****
+    cy.route({
+      method: 'PUT',
+      url: 'comments/*',
+      status: 404,
+      response: { error: message },
+      delay: 500,
+    }).as('putComment')
+
+    // we have code that puts a comment when
+    // the button is clicked in scripts.js
+    cy.get('.network-put').click()
+
+    cy.wait('@putComment')
+
+    // our 404 statusCode logic in scripts.js executed
+    cy.get('.network-put-comment').should('contain', message)
+  })
+})
diff --git a/cypress/integration/examples/querying.spec.js b/cypress/integration/examples/querying.spec.js
new file mode 100644
index 000000000000..e3f7c9b67f16
--- /dev/null
+++ b/cypress/integration/examples/querying.spec.js
@@ -0,0 +1,114 @@
+/// <reference types="Cypress" />
+
+context('Querying', () => {
+  beforeEach(() => {
+    cy.visit('https://example.cypress.io/commands/querying')
+  })
+
+  // The most commonly used query is 'cy.get()', you can
+  // think of this like the '$' in jQuery
+
+  it('cy.get() - query DOM elements', () => {
+    // https://on.cypress.io/get
+
+    cy.get('#query-btn').should('contain', 'Button')
+
+    cy.get('.query-btn').should('contain', 'Button')
+
+    cy.get('#querying .well>button:first').should('contain', 'Button')
+    //              ↲
+    // Use CSS selectors just like jQuery
+
+    cy.get('[data-test-id="test-example"]').should('have.class', 'example')
+
+    // 'cy.get()' yields jQuery object, you can get its attribute
+    // by invoking `.attr()` method
+    cy.get('[data-test-id="test-example"]')
+      .invoke('attr', 'data-test-id')
+      .should('equal', 'test-example')
+
+    // or you can get element's CSS property
+    cy.get('[data-test-id="test-example"]')
+      .invoke('css', 'position')
+      .should('equal', 'static')
+
+    // or use assertions directly during 'cy.get()'
+    // https://on.cypress.io/assertions
+    cy.get('[data-test-id="test-example"]')
+      .should('have.attr', 'data-test-id', 'test-example')
+      .and('have.css', 'position', 'static')
+  })
+
+  it('cy.contains() - query DOM elements with matching content', () => {
+    // https://on.cypress.io/contains
+    cy.get('.query-list')
+      .contains('bananas')
+      .should('have.class', 'third')
+
+    // we can pass a regexp to `.contains()`
+    cy.get('.query-list')
+      .contains(/^b\w+/)
+      .should('have.class', 'third')
+
+    cy.get('.query-list')
+      .contains('apples')
+      .should('have.class', 'first')
+
+    // passing a selector to contains will
+    // yield the selector containing the text
+    cy.get('#querying')
+      .contains('ul', 'oranges')
+      .should('have.class', 'query-list')
+
+    cy.get('.query-button')
+      .contains('Save Form')
+      .should('have.class', 'btn')
+  })
+
+  it('.within() - query DOM elements within a specific element', () => {
+    // https://on.cypress.io/within
+    cy.get('.query-form').within(() => {
+      cy.get('input:first').should('have.attr', 'placeholder', 'Email')
+      cy.get('input:last').should('have.attr', 'placeholder', 'Password')
+    })
+  })
+
+  it('cy.root() - query the root DOM element', () => {
+    // https://on.cypress.io/root
+
+    // By default, root is the document
+    cy.root().should('match', 'html')
+
+    cy.get('.query-ul').within(() => {
+      // In this within, the root is now the ul DOM element
+      cy.root().should('have.class', 'query-ul')
+    })
+  })
+
+  it('best practices - selecting elements', () => {
+    // https://on.cypress.io/best-practices#Selecting-Elements
+    cy.get('[data-cy=best-practices-selecting-elements]').within(() => {
+      // Worst - too generic, no context
+      cy.get('button').click()
+
+      // Bad. Coupled to styling. Highly subject to change.
+      cy.get('.btn.btn-large').click()
+
+      // Average. Coupled to the `name` attribute which has HTML semantics.
+      cy.get('[name=submission]').click()
+
+      // Better. But still coupled to styling or JS event listeners.
+      cy.get('#main').click()
+
+      // Slightly better. Uses an ID but also ensures the element
+      // has an ARIA role attribute
+      cy.get('#main[role=button]').click()
+
+      // Much better. But still coupled to text content that may change.
+      cy.contains('Submit').click()
+
+      // Best. Insulated from all changes.
+      cy.get('[data-cy=submit]').click()
+    })
+  })
+})
diff --git a/cypress/integration/examples/spies_stubs_clocks.spec.js b/cypress/integration/examples/spies_stubs_clocks.spec.js
new file mode 100644
index 000000000000..ee677e6a2042
--- /dev/null
+++ b/cypress/integration/examples/spies_stubs_clocks.spec.js
@@ -0,0 +1,95 @@
+/// <reference types="Cypress" />
+
+context('Spies, Stubs, and Clock', () => {
+  it('cy.spy() - wrap a method in a spy', () => {
+    // https://on.cypress.io/spy
+    cy.visit('https://example.cypress.io/commands/spies-stubs-clocks')
+
+    const obj = {
+      foo () {},
+    }
+
+    const spy = cy.spy(obj, 'foo').as('anyArgs')
+
+    obj.foo()
+
+    expect(spy).to.be.called
+  })
+
+  it('cy.spy() retries until assertions pass', () => {
+    cy.visit('https://example.cypress.io/commands/spies-stubs-clocks')
+
+    const obj = {
+      /**
+       * Prints the argument passed
+       * @param x {any}
+      */
+      foo (x) {
+        console.log('obj.foo called with', x)
+      },
+    }
+
+    cy.spy(obj, 'foo').as('foo')
+
+    setTimeout(() => {
+      obj.foo('first')
+    }, 500)
+
+    setTimeout(() => {
+      obj.foo('second')
+    }, 2500)
+
+    cy.get('@foo').should('have.been.calledTwice')
+  })
+
+  it('cy.stub() - create a stub and/or replace a function with stub', () => {
+    // https://on.cypress.io/stub
+    cy.visit('https://example.cypress.io/commands/spies-stubs-clocks')
+
+    const obj = {
+      /**
+       * prints both arguments to the console
+       * @param a {string}
+       * @param b {string}
+      */
+      foo (a, b) {
+        console.log('a', a, 'b', b)
+      },
+    }
+
+    const stub = cy.stub(obj, 'foo').as('foo')
+
+    obj.foo('foo', 'bar')
+
+    expect(stub).to.be.called
+  })
+
+  it('cy.clock() - control time in the browser', () => {
+    // https://on.cypress.io/clock
+
+    // create the date in UTC so its always the same
+    // no matter what local timezone the browser is running in
+    const now = new Date(Date.UTC(2017, 2, 14)).getTime()
+
+    cy.clock(now)
+    cy.visit('https://example.cypress.io/commands/spies-stubs-clocks')
+    cy.get('#clock-div').click()
+      .should('have.text', '1489449600')
+  })
+
+  it('cy.tick() - move time in the browser', () => {
+    // https://on.cypress.io/tick
+
+    // create the date in UTC so its always the same
+    // no matter what local timezone the browser is running in
+    const now = new Date(Date.UTC(2017, 2, 14)).getTime()
+
+    cy.clock(now)
+    cy.visit('https://example.cypress.io/commands/spies-stubs-clocks')
+    cy.get('#tick-div').click()
+      .should('have.text', '1489449600')
+    cy.tick(10000) // 10 seconds passed
+    cy.get('#tick-div').click()
+      .should('have.text', '1489449610')
+  })
+})
diff --git a/cypress/integration/examples/traversal.spec.js b/cypress/integration/examples/traversal.spec.js
new file mode 100644
index 000000000000..1082eca6cc13
--- /dev/null
+++ b/cypress/integration/examples/traversal.spec.js
@@ -0,0 +1,121 @@
+/// <reference types="Cypress" />
+
+context('Traversal', () => {
+  beforeEach(() => {
+    cy.visit('https://example.cypress.io/commands/traversal')
+  })
+
+  it('.children() - get child DOM elements', () => {
+    // https://on.cypress.io/children
+    cy.get('.traversal-breadcrumb')
+      .children('.active')
+      .should('contain', 'Data')
+  })
+
+  it('.closest() - get closest ancestor DOM element', () => {
+    // https://on.cypress.io/closest
+    cy.get('.traversal-badge')
+      .closest('ul')
+      .should('have.class', 'list-group')
+  })
+
+  it('.eq() - get a DOM element at a specific index', () => {
+    // https://on.cypress.io/eq
+    cy.get('.traversal-list>li')
+      .eq(1).should('contain', 'siamese')
+  })
+
+  it('.filter() - get DOM elements that match the selector', () => {
+    // https://on.cypress.io/filter
+    cy.get('.traversal-nav>li')
+      .filter('.active').should('contain', 'About')
+  })
+
+  it('.find() - get descendant DOM elements of the selector', () => {
+    // https://on.cypress.io/find
+    cy.get('.traversal-pagination')
+      .find('li').find('a')
+      .should('have.length', 7)
+  })
+
+  it('.first() - get first DOM element', () => {
+    // https://on.cypress.io/first
+    cy.get('.traversal-table td')
+      .first().should('contain', '1')
+  })
+
+  it('.last() - get last DOM element', () => {
+    // https://on.cypress.io/last
+    cy.get('.traversal-buttons .btn')
+      .last().should('contain', 'Submit')
+  })
+
+  it('.next() - get next sibling DOM element', () => {
+    // https://on.cypress.io/next
+    cy.get('.traversal-ul')
+      .contains('apples').next().should('contain', 'oranges')
+  })
+
+  it('.nextAll() - get all next sibling DOM elements', () => {
+    // https://on.cypress.io/nextall
+    cy.get('.traversal-next-all')
+      .contains('oranges')
+      .nextAll().should('have.length', 3)
+  })
+
+  it('.nextUntil() - get next sibling DOM elements until next el', () => {
+    // https://on.cypress.io/nextuntil
+    cy.get('#veggies')
+      .nextUntil('#nuts').should('have.length', 3)
+  })
+
+  it('.not() - remove DOM elements from set of DOM elements', () => {
+    // https://on.cypress.io/not
+    cy.get('.traversal-disabled .btn')
+      .not('[disabled]').should('not.contain', 'Disabled')
+  })
+
+  it('.parent() - get parent DOM element from DOM elements', () => {
+    // https://on.cypress.io/parent
+    cy.get('.traversal-mark')
+      .parent().should('contain', 'Morbi leo risus')
+  })
+
+  it('.parents() - get parent DOM elements from DOM elements', () => {
+    // https://on.cypress.io/parents
+    cy.get('.traversal-cite')
+      .parents().should('match', 'blockquote')
+  })
+
+  it('.parentsUntil() - get parent DOM elements from DOM elements until el', () => {
+    // https://on.cypress.io/parentsuntil
+    cy.get('.clothes-nav')
+      .find('.active')
+      .parentsUntil('.clothes-nav')
+      .should('have.length', 2)
+  })
+
+  it('.prev() - get previous sibling DOM element', () => {
+    // https://on.cypress.io/prev
+    cy.get('.birds').find('.active')
+      .prev().should('contain', 'Lorikeets')
+  })
+
+  it('.prevAll() - get all previous sibling DOM elements', () => {
+    // https://on.cypress.io/prevAll
+    cy.get('.fruits-list').find('.third')
+      .prevAll().should('have.length', 2)
+  })
+
+  it('.prevUntil() - get all previous sibling DOM elements until el', () => {
+    // https://on.cypress.io/prevUntil
+    cy.get('.foods-list').find('#nuts')
+      .prevUntil('#veggies').should('have.length', 3)
+  })
+
+  it('.siblings() - get all sibling DOM elements', () => {
+    // https://on.cypress.io/siblings
+    cy.get('.traversal-pills .active')
+      .siblings().should('have.length', 2)
+  })
+})
diff --git a/cypress/integration/examples/utilities.spec.js b/cypress/integration/examples/utilities.spec.js
new file mode 100644
index 000000000000..9a52cb414267
--- /dev/null
+++ b/cypress/integration/examples/utilities.spec.js
@@ -0,0 +1,133 @@
+/// <reference types="Cypress" />
+
+context('Utilities', () => {
+  beforeEach(() => {
+    cy.visit('https://example.cypress.io/utilities')
+  })
+
+  it('Cypress._ - call a lodash method', () => {
+    // https://on.cypress.io/_
+    cy.request('https://jsonplaceholder.cypress.io/users')
+      .then((response) => {
+        let ids = Cypress._.chain(response.body).map('id').take(3).value()
+
+        expect(ids).to.deep.eq([1, 2, 3])
+      })
+  })
+
+  it('Cypress.$ - call a jQuery method', () => {
+    // https://on.cypress.io/$
+    let $li = Cypress.$('.utility-jquery li:first')
+
+    cy.wrap($li)
+      .should('not.have.class', 'active')
+      .click()
+      .should('have.class', 'active')
+  })
+
+  it('Cypress.Blob - blob utilities and base64 string conversion', () => {
+    // https://on.cypress.io/blob
+    cy.get('.utility-blob').then(($div) =>
+    // https://github.com/nolanlawson/blob-util#imgSrcToDataURL
+    // get the dataUrl string for the javascript-logo
+      Cypress.Blob.imgSrcToDataURL('https://example.cypress.io/assets/img/javascript-logo.png', undefined, 'anonymous')
+      .then((dataUrl) => {
+        // create an <img> element and set its src to the dataUrl
+        let img = Cypress.$('<img />', { src: dataUrl })
+
+        // need to explicitly return cy here since we are initially returning
+        // the Cypress.Blob.imgSrcToDataURL promise to our test
+        // append the image
+        $div.append(img)
+
+        cy.get('.utility-blob img').click()
+          .should('have.attr', 'src', dataUrl)
+      }))
+  })
+
+  it('Cypress.minimatch - test out glob patterns against strings', () => {
+    // https://on.cypress.io/minimatch
+    let matching = Cypress.minimatch('/users/1/comments', '/users/*/comments', {
+      matchBase: true,
+    })
+
+    expect(matching, 'matching wildcard').to.be.true
+
+    matching = Cypress.minimatch('/users/1/comments/2', '/users/*/comments', {
+      matchBase: true,
+    })
+    expect(matching, 'comments').to.be.false
+
+    // ** matches against all downstream path segments
+    matching = Cypress.minimatch('/foo/bar/baz/123/quux?a=b&c=2', '/foo/**', {
+      matchBase: true,
+    })
+    expect(matching, 'comments').to.be.true
+
+    // whereas * matches only the next path segment
+
+    matching = Cypress.minimatch('/foo/bar/baz/123/quux?a=b&c=2', '/foo/*', {
+      matchBase: false,
+    })
+    expect(matching, 'comments').to.be.false
+  })
+
+
+  it('Cypress.moment() - format or parse dates using a moment method', () => {
+    // https://on.cypress.io/moment
+    const time = Cypress.moment('2014-04-25T19:38:53.196Z').utc().format('h:mm A')
+
+    expect(time).to.be.a('string')
+
+    cy.get('.utility-moment').contains('3:38 PM')
+      .should('have.class', 'badge')
+
+    // the time in the element should be between 3pm and 5pm
+    const start = Cypress.moment('3:00 PM', 'LT')
+    const end = Cypress.moment('5:00 PM', 'LT')
+
+    cy.get('.utility-moment .badge')
+      .should(($el) => {
+        // parse American time like "3:38 PM"
+        const m = Cypress.moment($el.text().trim(), 'LT')
+
+        // display hours + minutes + AM|PM
+        const f = 'h:mm A'
+
+        expect(m.isBetween(start, end),
+          `${m.format(f)} should be between ${start.format(f)} and ${end.format(f)}`).to.be.true
+      })
+  })
+
+
+  it('Cypress.Promise - instantiate a bluebird promise', () => {
+    // https://on.cypress.io/promise
+    let waited = false
+
+    /**
+     * @return Bluebird<string>
+     */
+    function waitOneSecond () {
+      // return a promise that resolves after 1 second
+      // @ts-ignore TS2351 (new Cypress.Promise)
+      return new Cypress.Promise((resolve, reject) => {
+        setTimeout(() => {
+          // set waited to true
+          waited = true
+
+          // resolve with 'foo' string
+          resolve('foo')
+        }, 1000)
+      })
+    }
+
+    cy.then(() =>
+    // return a promise to cy.then() that
+    // is awaited until it resolves
+      // @ts-ignore TS7006
+      waitOneSecond().then((str) => {
+        expect(str).to.eq('foo')
+        expect(waited).to.be.true
+      }))
+  })
+})
diff --git a/cypress/integration/examples/viewport.spec.js b/cypress/integration/examples/viewport.spec.js
new file mode 100644
index 000000000000..711fe74efb11
--- /dev/null
+++ b/cypress/integration/examples/viewport.spec.js
@@ -0,0 +1,59 @@
+/// <reference types="Cypress" />
+
+context('Viewport', () => {
+  beforeEach(() => {
+    cy.visit('https://example.cypress.io/commands/viewport')
+  })
+
+  it('cy.viewport() - set the viewport size and dimension', () => {
+    // https://on.cypress.io/viewport
+
+    cy.get('#navbar').should('be.visible')
+    cy.viewport(320, 480)
+
+    // the navbar should have collapse since our screen is smaller
+    cy.get('#navbar').should('not.be.visible')
+    cy.get('.navbar-toggle').should('be.visible').click()
+    cy.get('.nav').find('a').should('be.visible')
+
+    // lets see what our app looks like on a super large screen
+    cy.viewport(2999, 2999)
+
+    // cy.viewport() accepts a set of preset sizes
+    // to easily set the screen to a device's width and height
+
+    // We added a cy.wait() between each viewport change so you can see
+    // the change otherwise it is a little too fast to see :)
+
+    cy.viewport('macbook-15')
+    cy.wait(200)
+    cy.viewport('macbook-13')
+    cy.wait(200)
+    cy.viewport('macbook-11')
+    cy.wait(200)
+    cy.viewport('ipad-2')
+    cy.wait(200)
+    cy.viewport('ipad-mini')
+    cy.wait(200)
+    cy.viewport('iphone-6+')
+    cy.wait(200)
+    cy.viewport('iphone-6')
+    cy.wait(200)
+    cy.viewport('iphone-5')
+    cy.wait(200)
+    cy.viewport('iphone-4')
+    cy.wait(200)
+    cy.viewport('iphone-3')
+    cy.wait(200)
+
+    // cy.viewport() accepts an orientation for all presets
+    // the default orientation is 'portrait'
+    cy.viewport('ipad-2', 'portrait')
+    cy.wait(200)
+    cy.viewport('iphone-4', 'landscape')
+    cy.wait(200)
+
+    // The viewport will be reset back to the default dimensions
+    // in between tests (the  default can be set in cypress.json)
+  })
+})
diff --git a/cypress/integration/examples/waiting.spec.js b/cypress/integration/examples/waiting.spec.js
new file mode 100644
index 000000000000..e11d9ca9382f
--- /dev/null
+++ b/cypress/integration/examples/waiting.spec.js
@@ -0,0 +1,34 @@
+/// <reference types="Cypress" />
+
+context('Waiting', () => {
+  beforeEach(() => {
+    cy.visit('https://example.cypress.io/commands/waiting')
+  })
+  // BE CAREFUL of adding unnecessary wait times.
+  // https://on.cypress.io/best-practices#Unnecessary-Waiting
+
+  // https://on.cypress.io/wait
+  it('cy.wait() - wait for a specific amount of time', () => {
+    cy.get('.wait-input1').type('Wait 1000ms after typing')
+    cy.wait(1000)
+    cy.get('.wait-input2').type('Wait 1000ms after typing')
+    cy.wait(1000)
+    cy.get('.wait-input3').type('Wait 1000ms after typing')
+    cy.wait(1000)
+  })
+
+  it('cy.wait() - wait for a specific route', () => {
+    cy.server()
+
+    // Listen to GET to comments/1
+    cy.route('GET', 'comments/*').as('getComment')
+
+    // we have code that gets a comment when
+    // the button is clicked in scripts.js
+    cy.get('.network-btn').click()
+
+    // wait for GET comments/1
+    cy.wait('@getComment').its('status').should('eq', 200)
+  })
+
+})
diff --git a/cypress/integration/examples/window.spec.js b/cypress/integration/examples/window.spec.js
new file mode 100644
index 000000000000..00bff9f7fa99
--- /dev/null
+++ b/cypress/integration/examples/window.spec.js
@@ -0,0 +1,22 @@
+/// <reference types="Cypress" />
+
+context('Window', () => {
+  beforeEach(() => {
+    cy.visit('https://example.cypress.io/commands/window')
+  })
+
+  it('cy.window() - get the global window object', () => {
+    // https://on.cypress.io/window
+    cy.window().should('have.property', 'top')
+  })
+
+  it('cy.document() - get the document object', () => {
+    // https://on.cypress.io/document
+    cy.document().should('have.property', 'charset').and('eq', 'UTF-8')
+  })
+
+  it('cy.title() - get the title', () => {
+    // https://on.cypress.io/title
+    cy.title().should('include', 'Kitchen Sink')
+  })
+})
diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js
new file mode 100644
index 000000000000..fd170fba6912
--- /dev/null
+++ b/cypress/plugins/index.js
@@ -0,0 +1,17 @@
+// ***********************************************************
+// This example plugins/index.js can be used to load plugins
+//
+// You can change the location of this file or turn off loading
+// the plugins file with the 'pluginsFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/plugins-guide
+// ***********************************************************
+
+// This function is called when a project is opened or re-opened (e.g. due to
+// the project's config changing)
+
+module.exports = (on, config) => {
+  // `on` is used to hook into various events Cypress emits
+  // `config` is the resolved Cypress config
+}
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
new file mode 100644
index 000000000000..ca4d256f3eb1
--- /dev/null
+++ b/cypress/support/commands.js
@@ -0,0 +1,25 @@
+// ***********************************************
+// This example commands.js shows you how to
+// create various custom commands and overwrite
+// existing commands.
+//
+// For more comprehensive examples of custom
+// commands please read more here:
+// https://on.cypress.io/custom-commands
+// ***********************************************
+//
+//
+// -- This is a parent command --
+// Cypress.Commands.add("login", (email, password) => { ... })
+//
+//
+// -- This is a child command --
+// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
+//
+//
+// -- This is a dual command --
+// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
+//
+//
+// -- This will overwrite an existing command --
+// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
diff --git a/cypress/support/index.js b/cypress/support/index.js
new file mode 100644
index 000000000000..d68db96df269
--- /dev/null
+++ b/cypress/support/index.js
@@ -0,0 +1,20 @@
+// ***********************************************************
+// This example support/index.js is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import commands.js using ES2015 syntax:
+import './commands'
+
+// Alternatively you can use CommonJS syntax:
+// require('./commands')
diff --git a/package.json b/package.json
index bdf2ffd00e2c..a79481ca44fa 100644
--- a/package.json
+++ b/package.json
@@ -89,6 +89,7 @@
 		"eslint-plugin-import": "^2.19.1",
 		"eslint-plugin-react": "^7.17.0",
 		"fast-glob": "^2.2.6",
+		"http-proxy": "^1.18.0",
 		"husky": "^1.2.0",
 		"i18next": "^17.0.17",
 		"inquirer": "^7.0.3",
diff --git a/tests/cypress/fixtures/1024x1024.png b/tests/cypress/fixtures/1024x1024.png
new file mode 100644
index 0000000000000000000000000000000000000000..64d718d6c604a30071dc971a65f8af13bf1c30f7
GIT binary patch
literal 40084
zcmeEt^;ecp(Dy}(Ad*T+BOpj4C{hyA(kb1Ibi=LE2uLa2CEZ<$O5Sw0ba&^oH{bWX
zf5P+A<KZ0f+S%FJiO<aJuE7fLB(O0_F(C-TmXZ`xf*@4zD=LJ64*v2bXZ{R9N$;h^
z-l(`CZFN??K~=y-?bn=6&)RHxn1tbaqOHWa)WpV20EqwZ&;POpV0u50=Y~K3{5!F{
zyg%07-f88ay}8M-E?B%HbuIml-rFH5Kl<GX(?r*qvz^(f>qsr@%0|krki_+Bq0bkq
zsPi487cwKB3^<uLf}J{1mnt*robfGhoui6MB3xY;ueC<tqd$MDM&(`+ft{_2p6np=
zh0{*mx`ll)Fzvl|j;J)UYEtab4Wi%@GKv4!RMSXi%EpEG6V2N*Ji^5(X0S5uaBFwz
zcFVB&^$n?WpV#gyO7%XGVQ-^`ixa02auTG`y5f;Z9!gT_NsEg!Sw24cP8n}6QSM8z
z7@xI8v>mM)9xi4}`Fa*<P3}uMdhZwCXUU?MhRsi|s*l)G0^1JNtZqdTRz;GL5W1II
zqh%&yo3-SZ3OL}tZkP2?WNl(e@D_;fb*vF|OaJ1G!=I(PqrOQIK-XzecQhRCWc-9;
zb_NYGH;*r>->7Tsa0+h9m9y?^JlMIzrFfykofwy6w?jQc0cZU($lDdjwA}XS)Rj2_
z-lT(=1!JPR|3bA=%W<*4|C21=B#X0NxGB-O8=JVhza;P5bs`R_SshlEHA#tYGA!D6
zGi+(@AD7x#^H7q(br%Hxv36vQRIz^1RQf8hp6GM6AxpZMwXV;>!_$2yR@_6nbi;$l
zNb-ycy;>vAb;lh}p_Hr-JKh6ZtfyqBD-QSD&-(jySrM#TRm@{raJh)Ab{gabpVy_T
z;r$ZcqY8S9(d~UEN=$tAxrR;KrQc;Lc{Nr2^(QKfyPqJrkhdJ1_(40r&s?V9Z1nUG
znMaFtl>8L5o`e|I2;-973eQte_CBM;INL9OC3vxVUji5P&E3!b-p>G!p<H5;c;(_5
zwyD43>#OljI3@K)T~Ztg-t6*Gw_42~{=NH8wgAargiO5l-9tyEadhnx>w)o3_s}eP
zsT1VtxiXLHWl32Y#A^||fanacVw+|i*I&gS#hSZdi8JQYCCrdyQ=YlWHcUKW4axW?
za*HsxFh0-7+S-;&6hC$J?0j!-M<Ib&g%wZ{hg8a=z(7~mbRh&gs{3T=+UhgkQvTLl
z2?Q-8w{&Kyhw~=ht3wQ?xkma0mP$|ZM(Yy7eKr;?G2b5XuU~2NWok3cBLf21tV0XV
z8n6iW>p#ijZ^p-{mK8m$CjMk-)H}8Md!PW4{?q#!DLMDd2BivDea-dfpi}D8)2a<7
z1b-MSG+-^{`sH;rGS0Z$=1J>U!Iih0BZ`PI;moUS%7q-diJMW}zx1MR0eVM^p}3?U
zse<6)Z!wsEwYHj}C;2x1QhoWKr7%9Nt-rYbGd^B;P-Sw8=1Md-k31x%wW3>T`QZZ*
zB19n-d3oI!qFZ<zon5f0x^j{;9@Pv{w%u>;Yn&4-1i?6pzE+`jqg#QjhX?oN3x8q-
zq`|NqZ}N4?yZJqZlX}8}FKgMQcY{rNm7S1A2;s#Y*#z{1PU=MUIDmmLi+nvXd2+Ip
zM1!89_Q*Y4_>N0z&(IM&QT;u{aM3##FLUz}Z9durIR)7fGF*7?7mJIY-nBKayA@<h
zJd(_#o`($Pa;@uPGNiRjjy3SQpx?uBLV|JthrF%eN8$tKGPn5Isi!`8s8k7Zrh_#z
zbFscRcLB%lobRecOY3MD#m^kgy4@#&A<W&t`CWHbv(j9GsQL+z0oIk&@w=mAbQ#+>
zMlA+Jkyyp+nS051(N}tIdWBkSRaMP0_1R?5nUEi%kmY{A*xdhaNTQ*19n6M$#&McW
z-P{so`8sEWKceUxiC65dT3oy&VtN2Z)3Eia;oaHldttZVAY8albnd!Py#h62A`TRi
zEpx96ex2hKCIm^YwsU(c{r@<|DYg<~j27gz0rE(4Bs8UcUAc3>`9A0Ed$HS%YwJQY
zK+yZH)^$JguzC^xy|#hFtW{Juuyr^Dwhp%WV~hP48PeU@%x${(Ku30sb2bJ9J*)S1
zyqjRgb@JIL>Io5i)Fl(>!Tcmz*79zZJt(c)FhP(jp(y?3Iy!JkxtQ6C@{!321jeML
z_MF`}9&CAA(a@lV3c;L=xIH<FPyk0^vR2kjNePodo0;bzkfe!#9>!RY_z;u$7>2AV
z5~O&Y8o)}7-j0nE{2l(f2!1LX#+*MM!RZ+#>#>2<jyhAV0|OJRN2G{p4h)t2aya3p
z$?=SUV}j1ox7vOgFaXO>8TZ+d4vCBhUyGb6x1MWNW@0sg5rj*G;b3paN`3E90YVLI
zCGbn7EFgkY!8KN}t{{7cbNz~h1sM{)*vIU=GxJ9N0Yfd=-z(`=1-~9TFvr$adcYFy
zj8IcvqE?b|-9z4l<QI$Lz#88xhmJlVoD;_P10K9WOZ(b*kn)+ZDJjgnnm&3~L-O!H
zo@r_fo|%>2^w;V5chi<EJmRoa5neyM<2NRRs-YGOgt9|f8r+;917D#nBzEksWw3Zp
zJ|P6*W``b{9x4#!1B*d<+ri(-PzK4<lpx6hqo~GjH3-RC$spxIYrHtARn;E|`?(m<
zlP`#<B6wA`z*IkfZV;;oWdi?(Rq}oBW&Hcsw2plU48l@sgHAr7d5Tpq=c^%H<<iE}
zd<`Np#Rr4^Ttwvn;1Zk}U*@9&dpylqkJgTR21bPCb$Z+?+!g4H@(scAiWkGj@D&$U
zCxr0*jzq(@Jc$EalhTiYq5ileQ0$2CB7|)6Fo*~T;9#wS4_Q>buDb(5TQC55oczj|
zz;`t>0Z{YRhXj7&Xi$%sA>eHvf8@F&h#8iTj0?Bzie75bj(Z0Ng!}aL>B-6A^vpWI
z?~cL^jg7;xh7eQMLPNip_T{$b@d2^CCkBTRj-{V}4EHx3l!|2oQ|p_P>3kOvUcerE
zv0(^wn23xbJR)Avsm+(nir|rk)w)6!H29s79U6WU<5PQwlGVTxP`@jYHptnTM~)#_
zkTY)fqhz{Qzx-Jcla7|f=NN5LrB)TSp**zpX7dyLJJ*1Z)DX>DRGl1^iP|Hjv1UvV
z(Z79L?ShyxuHx;zpUh4E#gtc31Ii0!OeO$ZM~uv4!{quS!@IIPpFM|$#km{)ve+9K
zAx7waE=wH{QjRHs3E1ni+8*IpWQbg%;R}=Hi_bt7o)N2XeQab@q3!k(d~UrKq>`pg
zPlFVA2eufxiCCvQ{R0tupWa0Y0l}qsL5+q6s}EM<Nud*E<tGLsFgj~0N|FicXx3~n
z?e$=hd(>40A_ugBO#J!3goRB=2yM`V3~Z!5j_}GfEND{d0Cf@tIj=z5!>-I}9ftMv
zju-zI5OZ?WNNL3xM@7Mrkwtf4EcuHz$kZ<9E2Qv#kaBTvZwHa;(^?|^BovxO$g=Ge
zC80c)XMOkXDI;{)-y-?zZEf?!ba*cWS<2OO@FYgu1>|)wopqL%Ib*PCjRKfaVD92d
zA65tRU<BxA;yH=%?8?A^had~j*B-?IPfU>tJ>>S*mf&Mbxb~;Kb*8^gj=0sR{@j!0
zd$=#;{Up>>{%A4RcyMTHa0tL&r_k-##VuT@==Sz{<id9}>iG6bbP~R@=diB0{N&}V
zH3cF3gp87Oa?{eHrZ+?UweFau%@hfFvfh{QUWAEN-e+F<kJp;Z%U&6AygE;&@%yOI
z2I?nsKZUaoNuG(cIgHjfS9R(ox=q&`xYc^^38#nzzlm6UUQ{4_T}WATY~MV^#7%k_
zDnx!c&KTlsgeQ{uwxx#NySB-kdxue?CBQjTZ)#f{!}V-+s;#xP-hMk(urHx%$Cr1$
zJz9`wrKiq2Ji=$cX7^%=VU9#ZWAm;eh)WnBW`#PkqBm|>sG#3;?yic2*hG6~qzDIj
zmhgj?T+=6-B6>-4U~62~Lo`Nkp&1YElPvZ9!mTLcbkEarL%gCY-YKx5D|yvtOOOaY
zOA@`LLaB#4bR^VOLp2FEbu=lcI&8a50lnZRy|m#F4SnZ#0Z*g!UQhrIn0vju+_`)%
zq_yb5XRB3Zc{zoSev*=uG+i)YzNJI>N7p|h?AQpyKwW5dq+KTj*VJDNz3hg?k8Jul
zeW14a30ZIZ=8cm!DI+}5Rqp(K+p#>Ns`L}$Xs547Bw%xwH`^@+NYMJ!GN~=mMjkO)
zqH1xN9YZI9!}<>nsqpTs8j1B#!JDr3p7z%iN0UhF4_)Ig6=MXWWO7S97c(cWx*g^|
zW8YdM5(S+B7mNJR=gbMXbIUmrjPbg0%Vj}iBqniQoGX@WczMwA>TCocVEw|Z^>k5u
z?=-Z`iR1e1vfk5-zG*PbIch1$LG*XIPALeXVI-+><oKhK0c)EXJ6n*ilI!lUrM_tT
zU$b_*&f~M4W0180aMA0ip0^kwtqYF1v^b@9W^*0TxjWF4D^=aI0ubrP5+h}|=1)cp
z1r7eWYboL^m(gvOd2=?k`s14>y?=r_tLDT>7im48@tOvd)X}<{w$C+L+2VpngYOtD
zZ_0NEH!;{MLBf{bWs<bVRZQL}pZu_sxh0QYs$}%$i@uq+rK)K~&$`T*SQhkoP2c(c
z>g=3+J?~vXRqh?uMzN!Hjj3l&h_Ow71*s!3NK_O{+l_rWVfBEl$NXe>hw#+h)qs9R
z<|YTCnjwYv9_%~TIn_r<d@p*)Ts{YoMgUSM)`Mq_2-q(oL4#o?lvn$vhiT3w&t({l
z2hFBI1!L=g>ZHfrz!m-N{OqUpg%IU;Z4hFczy2a{N;cixMYhHk0cRN#lgHbvEu^5u
z1N|MSoB?i(<4VOD#vg6RH{t<`AXDC=sZ2=^3E3#KFqw#FQ<n80Tj<dlgv8oZa$2aO
z*&)s?$Z&Ltv*lL@nK>=&so?;N`za-Vaf2=lqzCCa!~uuoX}!q~`M_4NdqGtTR?~gZ
zP2@<?vlK0cfx$F_pi3>;sKqY1aCKJQ##k%}c0qf8C<}OCtW?X!M>2p3t%DycGLBLJ
zES7_U2B3t35S;;OQPc@Mi_Bx49&iEG4Zy(V!Qgmq5BT054*<vfFgn=^*^4pVW<(MQ
zGPRo4j6eEYeN@Ab3qcgnQIYw{N5KZfKA)4Fg+-KXNJ<RYfc+u&^LFLV4{UY$H2ycy
zwJz0oPzt22jA`ahG)Ne<F|5xR8qBM6cI^;~%z8iL>ahN3o7>w7feAT8K+jH!+@3F@
z1%c@3S!C1d4(qod!iW5S+ygC=jtYRfa8omZ9#ljkSZ6wokIRw&uYI$Ah3Kry-z7Z!
zwmBa+%?tR$DkrZw={xNgr8t+6A^pRzek8bX-5$S(5L8N%#h=hrV9l!mGOW%x$X-$G
z1R)s!c&gE&DG{PgWloHN?k-u)N}h;<6bRPy72z+k^+w$ch>lIHqH3p5o3E`sQra2R
z9`z8FeAIWjYlL7hbDl^k%H#dH5>Uc}+;KrJ75C=PU^a^4#SHg5A29jrPVgYk)S#n!
zwbpA;nO+Cc^^}$~3%`2iY;XV)EGV3$g*u{_CUopLFrZ2#G5X};<xWInGYC3rPY$`%
ziMvL^g9L;pCgWQPGqb@uF79)nb>aFk?{)zJkW+v9>!Lt(=`?&&<&4p4>W0X`q4fJ;
zc2(KAGmJL7BA`5pQlJKH;xfH3;7oz;#U&q=t379JyNV1AKa$G(S}ra}UsO1|1d2yc
z<<(qz$PO{+aPc>WVL=KEpy8h!^i}t|lh>)?QscE8<t~_rB$b!Oc%4RZr^SpI@e1W>
zA67_MHPR1Li#k5Sb<Au5><~n7PZs5>)WK40D3RSVGNf`}DlZQ-v?>41n_$`beAn)!
zVM>aKKN@UgG<lJF1;nJ%c^tiTwx6Efqz%F1Mev!PCtQ2m$$EhygrlBz$)$#>Sruc=
zpn|<mdf1C1_J%m)5E!ujjYbUdApHjURIqq`;6Hty@3<4t(!K{q81knZ7N&11sbK)l
z2h5w8aWwiUs*ZgG*nYTGEMbQfZo3|Vm<4nBw9~*Lcbm=_5`d+Q1WAg>iB%X~S|L;+
z98<3CA#OI1L9PSASl-}UW=uchi9WbVJOfNY8|p;ab?+Wged#L%SE;Bg^;G#ghwxec
zizty;t)Bxwe?gEv$FWZWW@Hr@MkS5vmg?gWLGzJc{StyreSi8P400<EEZxiE@-H3u
zeO|ixi8B3bFo7Rd2{iJ01_e3-&9YM#ZTvh1qQ1_OF^b|Z0EZx;7>xk}n+&?fO;Z5J
zg|cGnjt;B>0&DEkTaduoFIWZW6N*d>!Dd=%qimgI)UhA#EQt6b3*%cpk8b|uS6v2X
zA-1yH^}gs@XN?UgAS{fbQ-M3tm~)B_41QIUSXUOT)`o<MpkYww^GA=bfX~9*?*Y^d
zh~Um6L6&JV)(^Sdfye5HO0{$i9Z~A6$pJ<<L8fzNg9(U(-XK#V<G}%OMQ-gia>NJ#
zMh;CmL`xvK3OuKe^#~o<SOT;`ad|mUz~?Lz_k<e&gBr*%%plX-UQ|$y!`AV$^~5Tk
zvO;+bQT?=CFSO#FNTLx3!8yv@m%5;HK?bp_AFw2KU`?NG3%;j$>(hHX*Bvne*-@m{
zsKpCj@FvKyKXV2O0nl$u?``UD4A}8Ru{+;Tdb)<~Nk95)e@6A_-RH~8cb}~Mt)vp4
z&d)09l1?){c?_Gv%(D+nn%~*MeYoQxBt<X3Z>_(j4!`a3vtM~-SeXGq9arV1y2`ZG
zc3qf|HMF;&U%LJBP=;E|9)gU0)M#0KP5T6DtTEZ&Yx_~;<JDmH=OaN>hnXvlok;hr
zCu1g{S`2S);wQBH1rH%u53l7|GCO(Ls8!bnvbLXK!n?5_c=Ex$pfgT;%dZmHmYGoQ
z0THF=(#M+x!=EETX{NKfwB^raP}z|?4n4Q4+{4bq%uRv*<5S0q8_e&YB0*%(7cRRs
zcVPgVIM6sWKhe{6Ne)1C3kBkV&I}%~AEFt=JA;a&XKK`z5-LS%Mf-#dvCD6vG$z+c
zDSvxBPjfWQ)%I`J5PWsrLJ@l+q*Gx!lk*(ARa^slv4BU71nE<pA|-rIIADW(ko2S6
zt6@E~p#1*L3y%%Qz9MSnfbmyM*}fhPvO_i21zC(%m&7bQ0r^UZ_1C97yi<(!Mij8W
zX@Lo&2y*b5_wIA<eUN3FzMc=z9Tu*eSL!O?kb?zr`*6@3f`DsyD{<`>;N9a!13NGI
z!bM30Hhq!x*6T%Y<55-9>1^q<Ry{|&$CBIip<>7oOfVm>PriO<JO}da71y9z?4kXQ
z1i^H>8`tY*T&C)uwc6ETU>SS-#@ieVI`soXf(3ZHa`ijE?Ivohp1%Uem}!x6-90^C
zl$wS)SZj~V|MWD=y4Qb<Bl+%5s-)A+xDs-!YpvMunk&9UM)fJSX&d{OIH8lYqtAQg
z`L+-q-nEW4(K}n#q${r=lEZ_?G^RbBAKg;iZ6|7XQb>l5wLDG5o``0GD&@0NafPOH
zjzO)p-LhjsClv{0V2;!`Q$u7v9(2bW23)-04mrwkw0Rz3v4g@Ua^r{xrT6pA_6~9J
zA~BMp@N2WPyOmWc^W#$W5=G|X6GJu4O#b<1+w)K1vcqA)!RITj<;Pw<y8P^=OlPz7
z$as+*l_*avz4zwXA+*RpXXr4KSr;djF9prY!lgVkG!8noGFTVooLt2XE+L`R;h*&a
z)VR^rvRZs6%rlggsc5vM#cU<jM%AFcH^$H0hsW-f%Ww*KljRFg(UdFVwie`n(tD59
zmz85`z|CRy&VX7B^_Eqdo&nGIDrgN(CRU<HE6XL6N-3xOF=&gXwUpKYxAhgSrX<B7
zCd?UsJ}-agw{K8T2Mb$ZO;+uxI^p?>wwSOnDRdb2F&6%@|BKz+O^G^AkmQn9`06%V
zKMqZ3NB55HSDl;%w*vZ3sjJYSAbuPlBic{j9-kdrSSGL>6%<gvfu(+wRE1Z4nh0n;
zT*XKg6kpjl@{>=AyIQov#f^mQ=IdWW+V>)#E*Y3Hbg(YelS|P%Qu=bx(A3nEzH#Kb
z8Xf&(I9EtUN>v;x6vnu*EAes+w<Al_9M{Wmmjd>FY7`1DIpLpjQQPhus<N4?M*LjP
z{#1@A+M=^jN=?{59i8=Fc~iE3+jm9!Wvs``vpk_NS&}gp&O{R-CN6&JwO^noFvL%$
zDj1QM$MQt&XXsmW^!k{Nnn!p8+-g_LY`0VQuKMD}RtD;}$s^TwJ-%Amkk1jaC$-!6
z%0CF|h@C?Z>S1IR?BKUi5fdzC)K$v(M6@if`zTUpSVc@sMSIJu_14<G?!sE!|Kf{*
zkk7{JImI_29nIGU9_J3R9E088!i0)7{!Kr$pQJS;pt7SVet3P>{ynih>A*ltynH<;
z<db@3)$#LZgvIJ&VgyOvzMiWn%|(sV?l<v+gSYmno;1Cr9X!0ZhdD6!%07y?Z$aZ2
zaRNqvzkKc)TJEyL`y(TRf}zG(=|e{t1<I^_I8Su-Vt91Ql->9A)4A`moX^C#IhN7U
zjVsF(FDSfK_<9A@@f)^i)Wp#$?!_UiF>+fb(b0$p9ALr3G4hr?Hoa#bR9$U6d;<m9
zl?PX*I)oe=7(1O<cjDk+;mO(fYrh+0R_~fGD3KmB`7UKRrt?%u?e7<4`q0r`1{oP&
zb4DRZ!w(8ICpRiZIg>9;Ahmck53M)<LnpbIN9lBN4Sh|U;l;FU-E}Ou2dhl}@aZ?t
zIP4X=EM1Xj;o#u*gJowZ6xTStKk-BX1(s7(9Ti^D8+DVL`fYeHyVsYbi44zVYRY6S
z+0}UD#h9eSZquLqLgP`S&68-@CwqTw4~w$&Moh-?TLtz|!Q)|UCB~#5L5vEIe3zLw
z9FLE~`)-!)1KcBmt`dzadS~t_9j^QszB&)rrb!Pn55vK@((v97y^PP*=?cZutg6Du
z%Nq^6^lg7Ee5BqIbwVH?bCa7ARcRuXu7FFEq3v4ppy{&MNyp;{w_U^bMlT_xRr6Lx
zhL<~L40<jC6R*_m^A#l#u1tS387?sTs*tV9>)g_No`I&k?}FHC5qrIH9@%2j>+tr4
z8DySZC6dndVEHN7zW)BjMTxsFgi>m0m3_R|mW<N+_c2S9h#(tq5&Q7g)^0YL_6ai?
zuf?$2wksrki)(4_CpY=&jgUSbaxbR;WYY_CBn?&7L5IDcgN~;&oII|@gyovlGznXr
z!F~_;ZyPI9T@rqezTYk3x(^#wYs|`;Re(*EVIY}VTnBdtGC@U8%i1Xh9j9zK`5bcy
z2Q9$Vox!p=$7;zb`}T=BG0clXbl3aDq2}IM=@73G-d@aQ03*!YyQwnOtNieIN?Sex
z7q6~Pgr1hR<+jO5$32_drcC_nD(^Uk8+YBTM=CGj{M+Xut>Tr<f5=e?VBVOg`Bo*d
z1ApJj`xd1JF_K5f%+W@?6jBdSQ9-py`78(XA2>Kr5=F9Yqe0ac+dRxMdx>1i#GKrA
zd6DWS!pXuSBDU0iKugPcH0wF&KI@ME-uGI+$4z+iXWXbKDdq=)$4C<FSs#B8%$d`!
zH=Y@i+$<4vMugqRQ|y;!(WDV@oqg6Ra2gXd>XUjoKLyoDzr3;#twU-BtI2LA6Zf_*
zNpIB`0OloGYK6EoG#8#HBn+QR8aaKw>YF?rdvNAVFrT@SkWfNqS&sxZ_D5RAS7871
zLt(?3nXJ>B%cs$@n0R<av+`)@b8e!O;X<>`Gtb8G&uj?v>(a4bBtws>=NFcjg%aa_
zqEnS!?hIbGq7dwR`q0qupv-zHPs;NT2qhxHMrZ7ccsYihkTm>YR#<^8t-|P|Dc-&}
zv-c=tWUUHhy~M;~D9K~fYv#V4M8Cr?sGpn~!xrAGR8?}wOV2?`(?Aug>@B{TN7kp*
z9y#q7^;%<~Nm$rwQx2SUmzb0noR~r^G8QBmnGXB$n+9VmSrVONujT3Kq|60{k4CwT
zjfj{S>%;@M)0urZEP<3w_kC*}#5OVa_XQ!lDq$$Z<@J~NS8GeCUHy-vX_rJ}{QLH<
zVq!@o?0W~@gAT1o+AZ@{a<GZu@^VUI%s9;F$XnPjJal&U-u$B2aL3-rfq1TL1;(Hn
z8XB6*RZWCh<Pz<6!mM!8oMoa%u>+9l$wJfc20ViPg$fU8X+7kVMA!2kd1c*2iHA3^
zwly*6eshjrRN#2(jM48gKK@6c)wui?`uso_RdML?d&xc>*YhiOAsU*lTqVx4zhr|R
zYw7sUp8X@msJVGUWtU{Zs9!$r3-bwJ{Y0as$CgZ_O=aY`3M_|KVl5GPH0zqmZPQfs
zx<nN=igV{8a@;U+SQAqJ<|Z|!IZII>IsIq5=JhM0AdqZrt$!jTd@Y!VyLO`<O+(9f
zT3h+hSyYZrxC|r6d}guz=Y28XV`fd~8RsY|djFuHHQyPf5A$`abY+LVJ9XhmT5MJW
z7ZL#pi~tlq&?pfO@NMQA+^0L8Rz}xz7stG+Nev1bEiH3D%v$W>da9)OFTjfQB~e;u
ze}I-5WCpd~SVmF?(CVwIO0BxDN?Gn3YK{TH90UY<HIeq^c>eK)uFs;b1;xgWkXq^>
z+;-x1h%RNwJl$<`Amz8|)QN^os#nDoii;BZf7y*%W-6E~D>#M{;%V>oJoxu}%Swh*
zlw?Eqk5`-N1IG-`?w(<R3dYIg*h*QhLmx99I^V}z#pt9ddLzmg?{hbfnn#Ab>nlL7
z$XF#JSR&wi+rY}dPIoMxe^3){zSP4SNp2lrKD|#OY>7LO5^A|bGd3b_mXzKk&!6ru
z@&*aY^GjbbwQ1R4k{cUQy|JT=l$4)5JSmUgfBTz;PGC%ck%>qkqo;bx^5kOk+*Sxm
z%Ma0uS@&9_wh_GA>$+i~!zX#bzxyGPL|#lv4|13xsEtz^x8j?J`BH4~a%Vx1pVVzZ
z$;N`6?|bjDqTxC51!tJ{ynFl913X^H-1=4Tgtp|f!YT^y%9Ebd5<otqpd8KGw1khH
zBm3j`oa6$%F!gr*Top-1S<D_9mEMviYX)KU=_Qfx=6l+fJkT%xDY<71B7<fX6*pVl
zbgIXk)({Urh3!CwHH9!>i;ez|-n+LxZ-T+C-GR4v{gs&z^Q{?bu$ZmN$bFuQ>L3k2
zztzyj-~Q40n)^giTVcGGtcl=?X(8upx5b#9Po~^GO6}&BTrnD<QOyeaiJk-+L%gV&
ztXBJrI&-BLmgCOqIyXb9;a4J2;24BZNN>tx+P(*AIarKh_=oaX4N1nx9~!z^C%G{7
zbu0qKeWI_$dbb`+M3Hph;AlRK*J<CirTaUIG-dFWg`&>PU!ID5AQI|#ml;|nXAT-m
z!6Sw3^UJy87I2-?jU>}6m`H|{9nOY&Rg~WBBbs<VhgXJipY_8`Xq}`|ofY4n@HUVJ
zT=Eo7>eFY2wwwwai^q{mKjKC5Y2So)gWb?z$dQ+|!b)|PlXgPeH`lvW3XF{4;-%ru
z+}NMF8y-io9}D!YqFQ=F6Q(!hc%fhCkt4@sywj;Ir>#nSn-^32m?4O`;bYC*DDb17
z+GRVD9Xfnwy<&;a5FS%0o^ooSXPl=(M3fOQ<2u$GNU`t%oN7rM&mWID|9h6pZdUl7
z?%-C{`4b!$NM0xqJNf)W(yFwxBDLV^nEUOu7BL05!&C6ME@{lblIM@CGn!V^GETXp
zE^wpCW8?JIVWSble!W}Bywm(1OH@<~oO7h@p08FN#~H<m{v|U**0$p63<p|N<wyNZ
zbPliAei=0A>|B49D>U+}6$V<au1(Js5*xuS_LZnI2^vQm`Z}=FuOWfHXEd&1mxgat
zlry*0wbSc*-+^{+M3s@Sa&tf;RDOvg^UE{o&?Gai-^>u<qE}>MyJsYomeWc+-|#r_
zMJnxs>+4AlyA*UTQ}&84Pj&B|Rl{*hAcY4qq1vxfuuv5D_kT67rYHlqwQbwpu0Q&P
zHR7scN=ypJhJ9jl2)QHvf~kEvy{}CegmP0);cmRN|7#5#5TNWfW)`(m_VJ5m*4_Ww
z7xcu4t20=`kJya&*utm|0~c*5mxz+~iF*<|I1v`^yE>n&-EHpSt*lOj>MA!WEVw#>
zU&Wd79;(}%E86(bjFG!rm!6&J^Mj)d5!PJhoq8FrDeJaE(E@p6M#=1xQj!qg=ORxI
z8?Qsj+_}k8^3LMsTc_--_(22erT)EI&$9@<s;Wn@Ad~^=8*jaB5nQ3s2+vUM?_qTn
zS*;y6S+ZMS%VnQ0Fy_|>qHuWq-fx2V&*sj&NTi%YIo>^{jLl^j_W9K(jxLL=nu{y+
z2mA;af}fs%mm`uXJ9D?XT(5UJWW{#njo)-Xd~I#aMc4;+5K~+*MT6_^Ek~A+x6G_J
z@UdnVJlgweeZFIB({Q9DNG4g}fj@7M%w?7VSGY37TTt-6Hf~V7Ew7i8jhXeZ(y{Lo
z@EQe&ZH*GQRwWjP27w%G1D?{M+IC!oEkK`yLDOaRaGA=bK%rr6o&uox0;P^s=kq?_
z;`Mm0_+<0tM96GHwwA^g>US@gEENm$+%0O77s$>8M^5b1qdB21hvX}aq|ZJiX-^(L
z1ZtFjF5-76ZaNXBso|c9k5*NM@Q}yo_a1>GszMJ+Uv09}anbmKC;02OA7+ZI0~YW?
zaYw|eah~M*E@Mkq?)eco<&`M{?xW&9`oa~wvw1!?EL@Lyk+j~63)*lIUTgSajK)cO
zQ-4UxX10@E_}Wq|L5a8}S0a6YY$LdUvBF}D+&G;gZDYzsxUJzAG*UXE_Wpv#?#7b~
zpM`&4j9j-|46yG?2awku;gjVfhh3pw-iLbD)SK|4)0DBk3_~%$*jAun|3+;ZCie3S
z32o{LIJC<11Ii!FLBTP8D03nQdv6_(K^BUeEq0@4zlc}mvq;7_JP3}VpjZ`R(!s6c
zv4Y+D9^=lY`yZ;|F&qo%kcn9MzfYn+W1ihbrbv1kpdA^!?PC5T|Bx&7=^?tX;I_Nx
zq$~-IAc`bOU!n!C79~-V@tD_ABwt)7KrLa7X2O1#^W}|D_JXG@k=2j;E@R*dm4<jC
zx<g0nlzZZX+UEG$a$&3u%ikhV+yMJuId(shZSqRYOl34ab}0Yh>H<O&gyOEO^u%lM
z+eBl@I#}_oQIWe{B3`OsRCvipur{sHtkf(uJ^T<2$2Ef#?jMM+I2cHo7Z*&B*%H4p
zX8`^Rc~E-FBHZ=)_bjpSa*_~GhfB&d?7aE7NLZUkSJHDbWi`juXHE#zyu`=n^e>o!
zbL{EU$YNQh*z)*2iRU61R*&tG+ckU9p1N02_%=Q?s~|N2eEmfXmLAZ~9mehBD^ML=
zM3Hdul*NAl^c`9%>NWQBFH0P#rDkbw$q!flY#bsEe7*Ywa^sU-q<`^C(6~<YjML~M
zr8Pu3mr-4&On0m!p2OJ3yswreN^w#`Uf}~^X2SI^Ov8_TxqeP=RQyxOZu_#^5+%5z
z{}&6JvR#aY)iQ9#?Kj%k&?f=Ej6!bzaVQ>u?_f{WHx!;|w-V_Kf{)R=PpAYSa?f+(
zU3nCqs?lMu4%1&mWf;_XZu$W;jJtG;8Nw$5wUMX)!20-?(yg5gTtt6sg_m&dQpbJu
z-!y(8x4&a0yzjBpk|_$*gnujDx?OW9E&K&wry&=!coLE@Nn{D#JhE_cLAPy_bGF0{
zAnQN<h2`~>s<{MtiHqiPT-J@|aeByv+&;-vxtpDjbYIdBfx}ghvY=VJ+9J8c2!76#
z3MyWtZ_f`Jai(Nn0&3|;bHV%KEA5^`%8L}9Yx=lr8-Q;bJ9`=;+n#fT2lMN5{R7~+
z;cU>z`?`w4HEBhyuzvs$wRY4&G(Axq%%DOkCCT@BF7k-Uhir(5Bz%`Xx4O=;>T5UR
zRQYetD&=jz{)((=7qP0>cHOJki!8VTxCUp^o*Mp<ctP_<mX|kM3EaJUI$r^L_O;8&
z(#xHmZycB0Y5x%>FJ5t{Bqj__S!a6p2_jHQ!?kX?yXtr?GoH&xWxhUl>VYcT<Mb%^
z*|G7n{law^ic?;;xD4WXj{iRcn?!*`cP`doCtmkiBAbAGf>4EYQY$MVyqCQWJU&-i
zPJc-fcGm|E0Cj6f!>*c8Y)Jc6hdUJUs3pjhOXXa{5A#tF|F3`uy@}0|F%YTCAUa^p
zW+?+sIy(F-lD5cK{ib;bWf+e-h+c(+QB-KFzus+-XGSdlIsOaJRykIM`H>xT#2YMI
zMv`y+TqNGA=*PLj{7adMwf$##MI$>xx0=iVm7zA7Z{|ZjmmJ^U-qN=o-qj&_4rLf7
zy+r3|Wc-5JX1&ABXjqjVfb{F;*6=sYia2>%T`l8kxWcj_UYEwa`(;JhqO$4bw)1>Z
zP2~lGZg+RgKR2Z-iF8>k0Hys$MZ9D?2{a4<@o^A0AXY@!UBR&e83Ww6rry_f=zY~w
zp!jYH`_V+JY2FoByo;zV9-BNO0q2!iV1*{wyYR~@J?|HeR+W7ywWFpqB=V5LUuV~<
z+s7F#BtL*rUd+uDft4|8Ok8I>uSox?BXRy1evp`c@Rug0HsIm{8>QWy_kt|)F(_lT
zh@T9b17hLTHk^W8_nvY^*(D3rWPL7`W(_}lqL;ld2IgRuM+>1<U;C^o0b!cijTd&#
zJCmF+{g0a|w*S$sgnA)TP9-meiCyiROe{d>&DN-J<;7KDbJUBh@wg{$Ul9oKn<j=)
zH5oUE|IxOb#6+U);2J=3;oELDt5!MK+S3E9|7ePhGMgqCJ+F_!*){BJ&39iM+q6f2
zG)&_SQ&k{bVciH%S^?p_=;0NN^@(4~$8>VRib1K(tEpr97fz<L=1rJ;)$fw)o8bx;
zfEf4Qt$4$NE8_JJt{%XscCZ*ZhFcljkLe*&mXl4<X6S>rjz)@?vFZpsT_^!Kjh!QB
zgdX0j40%`gjX#KGeQYpusl(0ts7lAD4&1_0z4A!);nPaRSfXzg;2{X9MH03c6JSqB
z44z!+1^Ex6liyXAw_rEH<g$0NMcy*!Qc0jsu>V-`FJQA^Lyq2|^iNrPLWH(MFc3=k
zz`C*R;R->`oGpD}OLH*l^b+b%)I`nGjy$HY%*qb;>BvxB8MbB(Knt5~rx;4B{zmc&
z87;-N5nkxY&5<k}Unb7-;zjCn;zM8AEd9gGa8Anj*JD5oh-|k!^!$vahM3E}{7tPz
z`iJElGTYi<c;S2FZ#{7we>;fIpSmt&jQmo5H-IR`fI%QWN{=A-SEQ+Ejnk$<eUMt^
zmsK0GBDe@#;z{~>vmkImNG*GDB{4p+&6il;HwV;FJfe#c;>1QD7q4FMk@=H?qQY^a
z5a<cAGVBX6^m%wI2Wzki_&fLeSO3>^MK#8)^uJpcG)U2cXKxNWDR0MRFZu%?0P<3L
z%6Ne(>+&&O^z@Ue;AnbyB?+k>{h~W}msezN-QnY~PZmR!x3TI@2xo+O`L^&-y3-vx
z)utk!CBysA4DsH^vpGnL@u0b<oLntZ0uO?|sM=0&+Dtpjn{MEKKWR+1G2OxoWe;)c
zO$z?F*hm_N{f2p`NxdE6wZxXTqoCpBd>?rF4AyQF&~<<cWs8T0|20k9lH*0-X=(9=
zo~PXB^`ZDOQLRa5oJyej=fAWD>+6rbBB`ztVc(K`o4+BJ?dS4szDQ{=B=60IbQM9v
zCz=@{t|0@WhT;ZW7_=9PSZ!@u(tuKU6$OXg4zZ*iaJ8lTkmZCyV3=2=zjg5kb^ffU
zV<XwifDEeCaUpSZB__CE+3Zse?_V>-8wDt4R#Em#XTPcNr|aB^1Mm<iL_VR~>w2?i
zj{5mt<DyN#TcXg?1U@mIQ}J@^{10Q-mvdHi2)ee3LQ|LNND_W8Go(i4E6YT9p@1Qt
zS~QyjH5t=1z?dqvyM5da%501cvxf%mK7*A^^h{<3uQ%-S9L<uh_RW3xwBh<d#43~A
zg`JY`(pnjzqSk=-HYS3cp4D$UmJW$t?KX1#G&P48Ei8FTH|&u7Yibk6ZrIAG3x9}k
zq<n*QG$Quz2;OZr0i)BuotR8+$l~i986K<j@nB@%-z>2c^f`o^4&D<&02R!VQ4p>4
z=g~U)KM%}SQ*#!y@Cv1+&?k>(U%wwdpZ|=ISY>K2Lp)*Dl+5(#g8*7-3;c^<GqP~_
zA%7x65({YW5$pcSI9<;jIpsG!{z@3cZ^2a%q2U)R?K!J!o%CUp)9TyffB?jEMT}?!
zh&EDWa27Wdzzg|+e!7Uxxf1EUvRkf9{$KG5W7l#T)$G}(eunElY^p{s_dJhODO&wH
zN^xe2%1O}U&m+@=c0p5w^rgK8(SjF>pK%og+`NsRB&MI5C5T&tx}U81wMOOAv?D0Y
zA&dqP<VHR?QXe;O^Z-da&3FR;Zs^CwrSa$g@(pTcxc@_VVZusya`zL;0I_<q>Pbr(
zK>C+v9CU^gjMOq>mnoj_5P*@_ae8XCIP1yP9k}=m=4c(@hCDCuX!ikH_)t6jef5dW
zV$c#oRF(+8zE%l|Z|*{)f&bTolRfo88Z5rl;gPJh<U5=1@Hs$a$+bA%h&n-3w3O2q
ziRX4PXJ~ukv&N2oxoOpE_vXCS@782ma+u__dVJ_zMWCtAbsL6%ooa_W5f+A5{Oxv$
z0bwLD#9<5iP%hV^dR?pihIPP=<{;5L1&_F!rND^>3n3<g==Ymd?^BLd^*Z4tm&A16
zZ{xRThLI6xG@q?QJ|G$@a^1!|P<*NBbg|xZIU<|Y0GfKx-<jZFQp$%WwFh9xC*uee
z0#?G)56mk5P&UM!7hFoU4%r0YUyul^CeMdvO+5IQx4fyR4v46V)ux?^9DQF9xDS{z
z)&)X4-ET3Zey9}6Un9y1%=1PbN*Ce^-$yc@vphV}NBHNd55*`92>dcn3Q9n?2~q7J
z)aV__1fKy$HQ>4*Dhj>l-&ID~4t1o&U^V&0+!UgO62`BDr|1+-B#L=}(5#84`(Atd
zLCctjY~FXg;hu(O_49{|w>mZTIG1}Q>Z;e)Q`KPwWj230-99Pu2hl%~FrpoO?NuG2
zXmwI??J<_z)S`Egy=cs^sqc(AB@uDE!V7MRp)AAY0STLf4%!JcH)4I8r>A=@`{j*c
z|4Le3^V(Gp0}AM7TYU@V#S2|R-;-y{QG8p*4c_>l^?VmEcdTTFhQ84NlKB&>Vgt6k
zAM4=ycwRZ*#65*MHb1{!t*ULWVXo+Jy|Xmp)l})CdNa*(-LE!j)foiUk0(wu#SJSf
z(~m@oQZ%jt=Z^1Q2LITYv|_`ynWP&|%eUQoHWF2L<!e~d)Vmn<{UY(ajS`UrB$Iu~
zMhWcx7)s<(w~$e+D~CLF>@O?7;%L*gb8WhuL2PaQS;X}M(boNA{s((gg4r6T1qC5Z
zD{JNvS)u+HFLMVXd{pESAlL6Z>%KAR>x&j>6(Vrj<1NiH@hn$t&P`Dp&Z~3m(g)&_
z4IG|9`YWd`W_o$6Jg`GA=_2cc;s!!bhaIhvd+x=NI6ew@G-<m_(Iehx|1h!CRL9O@
zv^0<IZEcftu4|8=qp0it_&ZtUfxtf~lkzeS`SXPTpLzYZ+?XhGAGcw-Z_8?|_CHGY
zuTLtLJ$K5~@Al9umpD#|%&Ym$>^w$kVmLE`X@#j`Q-$ootXt+mvg_zwHfG1aVuDmm
zzXKA@o<K((od!uh@haHn=Fr~jxgY8Xzf8M?p$xl@YGPu3C*+-tJCBhrXY+kES$owo
zOK~<@vvrKnM5$Xh3y<2jEqsGH^baChc1UOI@{g=yC(cD!%G0T_?ItqD5WIvdX4E#L
zWC(HdH<VJ9o`oLklaYnxymHM^2>s{UB%@i7J%$a)T9r%sdL8|dxEgwLRR-M@#U_B~
z(0{KS9$MmPAK$oYYyvMmAZX|M7tuH~GLO!;z>63W&7CB}!u<S0f2{{IUKQm#w*L_Y
z)YwEPDHChNvK~G2FW11KU+q=@@Ign1w04EG3A})VAX2Nb{M|2Hgy^z-Q@MnLZklh$
zehXf1{mFiQ?6kWoXl92H30Bu~n|w{9uqa-}>D)mrD)>h?CXkf5JA$+0xbh{BsU10j
z=sjC4jGR`*#64TS?0Zp94`cO{lG_6D-C%}%&2Ju?h}9n0%ogf@sK)>LjFWZ{_R2Nm
zQ`>xw9HN@pJ2BV!@Nx7@IHniUUUl$xR6wxH<-y+fFa1ZFW}2$1cUIj#oOf+*YsSkj
zpBB1!4-t|S<YN&&3E;7ba(stiKP!kbro-?eafAP5g`-zU-ScXcct<lPM&r+)Ep;4%
z5hRUG2Lp;#tc?n9=AVeODvKTP&rwy(JR(eS+w~nC%Dgo~5aFQw-WPXu9m>^+-fr>b
z4kP*__i>jXz3HTUxnZ}u7h&@c?Z;yko~Y)HjNymRMi=-LG;hA9V^7Ucp1~0B`yg1m
z@8$cG2uLnwIoCU+s^?X%M%09qh(eJJ8zK?GdN*DltC)QLEMgWv5iBUKC8iENaq55P
zW%Q^zxDBVq(xMYkK~A$xski)|lB;$|ZoiwamV0uELszH>wojHHSdZ_3Fhy8LnAq|5
zg2+=6mNU66>J?IEeZe54_&`%NnGtoQevJkpEk@?$UR&&Lbz;9}!Jw4jpExqRnnx&H
zmnA(9AARZoHRY!7t>+)8wC)v)oScQbht>#fL|#I&cYb_4gOH8AqNZJmwq9zv*~acz
z!hqrnURxETZLJ>zxTOMl6h3D^+?$WpR3n6Lw)m&GQVR;?dn;1^nXOKoALzJx8>XaQ
zv=6>Qn))2uusd3wx*Gd>*Q;}Pg~37dBx(*0y#8;BXa2uccX&sTAqxLlRmu9lU2pj{
zs#PEQb?HCmg;$iGr_hpgg#;3RU&)>|ZSt}1rO(~_2JpmTadPxsQemWZ&tcBR`Jru&
zgr|>cu5F!ZLGLiU$LaR{OF?guD~&^sZtY@2U5}C$ig#ivJ8P};SZryRpRjP}?1WHr
z<x9LvG<3*+CEA9Zv^^Bvja8?)-f75t@KEGM#;<y3N&YML`rel)Wizf4`d4R@s}0;Q
zsLSCzYcF?R9?dyml{>CL{>U*jOtD|zmqOPybK$)N?}UvTw&(3Ee$@4SEHlEJaaMOq
z_Tj_F;fMXoSN*`3aWz@xMWHBkFD<$qntc7fEN>;Je-xd8D*wR)s^dwkHNjKu^RKp(
zzE1=xGhXim%@!1ktSm+-E~CUC<q-x`oi9ZnAU%6&5vA$<jSX$#a+i&=_aKz04MXgF
zxtrs|=}Zu%Q@<I-$p}5W0r=mouh4@fD8)I5Q6mZbYi88;n|}FiY~JRyFILwsMD+XB
zCOv(@_HVl;un6xFrew?UW4>^Hd@a$>0`K6&T<AJxsbSO8b;Ot%(lj5Jj3TJ(r)*Eo
z6)SHp`oE`TteqM$21);8zp!m4Ne|<#mPuXip8PF}lRiCmk0y7mWtHO3DLMhJA+G>M
z&7ViUek;d5zoHVp-&}(Cnt03KSwv6WS394kR{LZ&{zPAE_=g^2$l*nuVX12Sbp7Rp
zxp`Pv^^T)cZt@b3pCyw&n}`bBbh#^boWgV5v(wJIX}T-cV-Y(|>0>fp?Bvt{y<eB-
zC%gqF#A5rt5X^4<Hb+A#ng&%mIhm>)uTJ8XPb*UIl%AR%+iCXADl?N}-E%V)znbx1
z7C@1+M?~)(rm&sFVpXJV$?nT0tu<!1BwBx3QkF;hLld;cRK445xr^3|<QBmNZIS%^
zl<<Ar=kj9*D<`E7<Gs{ZH$udz@(;BaKjcR?**rb}O@Lujo4$CtWoIM4`$#=)dc;36
zn91AQAvCD@xO3lo^xmJYZKM(Hhhi?#UKbWsr;r|WbchDSUOYW_F?j=*S?FXi03Nt8
z67nrdE44RT{%u|EJ=%NObM6v5KU~$nFV73tjd>blw=U7$e)QalWcxThx;h{8OtR?!
zGiWO-Nj3w%syyyZPvfT^(Jp6yMVaQ_^u0W3C7U>+jYiBN!oKh6_YR}e7?+ugj~@?0
z2~N}MeTlU$sRJ3;zFvP*G84SO*m*lKQGqw>ATxIQs(H7W@qmu5JTh-1_Nz8pDT6vR
z{@g~S@s~qFbpJ{sV0q9TdV^+4H{*ElWNSJ@`~wLS;nH{eq8}Dw$C{MpjDc!(SnJH+
zmb$X>hE3e-Wp_u^rwrdiigPSAdE5MYkaimp<PwUD_iZT2NzdVa&s!C_+yVE6VA|v6
z=mPQ!yC&6l{tT<k0U|+LrEM776;B8mYxrwXOa#wSKT1WvwM<<O2?X(4imzz9Z|E;z
z#!W5Qzi6-g#C!kW=xAzL+{)AIe}Pn-%07QE{di|$PE%9PZY~{pU~SpDp4c}7nLh<R
zm(?iVsk@dsXg)k2aziD#g2RcuR!DF)v$a^;N_NhS-UjJXpqOWx>+b%2o+D*pF8nkR
zEm9LdLhvH~>7eX~17l;eUes41Pd<%#@6>JWnc>gaOT^INeXWRj&4)YXDDQH{wa&jx
zsKNz!3a8Lz70=10WiRu3@Y@DwvdyynmU^E3EOPY=etd?~n=wtZ{pQOMT9oJr0d$7|
zX<wlXa2C7cBZa*9m%2tDDd}@T`6s>lrPN^Sim<2cdiYOMJfux(NT_)hFrmvr$n9%3
zH^a5-9QH_1{yG0-#LERTr>OOY{kLD6Vi)ZFc&EO2U!%+94ed7FE3erq)ST1D!XlW|
zM<GN(!j1ny9KpQxVv%Tp7{t==0irqj--h1?la|zr{iMZWjUCL*F1Z{u>jWY&vwlrh
zVZ2NHoAS_L{OPIUl&6pX=y*r5Pa7)zJ29ViCER$)l+o<MF)ySKWO~pz6|vBbr;P}q
zhV*hIflon_@Vk(R$PnwM7rQkE6h#3__l+s*{IT$exdN`AyhY!s$1-Mi=*A1Y#um64
zRWmm0fg+`rEOZ)A-SA-z@<`^^)&|sYsrF~N!jCefnfyDdr$+k~a}Kkjg-;YTDgtnB
ztHd8dPd$mf_QeIS#&CUQumDbe?m#`LWPPDy%3V^U9MR5VzvW+ZzYGP-LV5`YQVkj!
zF!J2BQBij<B-P9(45NAJ%yenqn$|tMS@O9s_I!=j{P=jwIPCrx%7~1dHykwXTIz}A
zMSQZAb?2+Vl0nLB)4vIzxTuWa>faW(<Pzj2`s(pFQ+D?>GpEM__i_@;1OJNc@Yd{f
z$aJx2(Y5GSg#M)ic*<B+Bl;pEuRMb3OAEM{5uo7xT}D)V?p0IzWrHA&?-3L3k5@#=
zBwjnOzSiZ}CGiiXTyyc<C}t{XRACwy8&XlVXjOdvOW(Ns&7nI{T1)_3br!cjL3P6j
zgtVT(H@(A5R8r3j0zY=>A5g2xnUVM^6Hq3|jykWzZ>41T@l2qq3UbH06Bh7yr_3lv
zhZ{xsON)JGYbh*lOG5eZ<9KTR6^j1T?mWRJ^wbycR5WVBWn@O)vWl1F3@JpQ>$!bQ
zR!$0EjJOw{xw%y_@#>Eh$eSwEOlQ~m_1zfzc@z<33mu{8do1uxc=?x&Xpd7JT$1br
zc$dl7jfQTg6gQgTjEtPl%;s@k-lPY@Kfdc4j>#t2Md~#_VZv2qeq?^-D>Z@%ldnT=
z{pCkW=G#t_fG-+2itC*0Qy+Y75+%=%<XpQeRDL|V6)!cAknmNn4B1j)V3&8_<T1gd
zn~}*O6qMn)m7Y=a1(%~3DrML5zIJ-7=zT@N@JskNZFbK#JFRd3;nNh-rZMfd@c5(-
zm#NMn(JvAlLzKjEJBNLNm|`<TdWAVP+DHm-91l;A-I6FIbe)8Qt~JDtgDIVGABgbp
z>iO)mx3tT)4@k7RX<wAQ;4amBOt(M(nf)=g;N|lMlQ-O{IOita`rH{yhkXT`ta`{8
zwn(LnKGdxG_eXM1C#?)nGn&clDvP_nXnPwx3E6F6^E6Ss%9O~Q9ziowcp53JzaZw)
zozSr;s#x?(QtbSN6`}LD`)6K>oBJ;X!W+$jor9jLqz)(AWvGe$QIOo3tE%jqwqsH^
zz`d7k-}>~rWXG}3SySlcd{mwmYr*BrpGQ!jBO1*4+z(7Mr2C|WS4HU%gniL-H0MHQ
z*{=NjQ#3<`JddPH?~`G_B{~l|jFZj<)W6}e%p70D2q#R4UL-GL!DP;nTkBCZMXL5A
z$U{l-I<Lb{*0>3Xc^{5Ak+w;ooX)hfPS84#y|u|(%*z~qnwYhllc-OZQGD2^-mm(W
zU_n=aBDXz~Xog-a;i*bu9FkCR5U4^1-!_>dFrZD$ANiAVZn*@HwCz8U2RM&Li>oHa
ze2bCu4m5;O6c>KvsyM~sEj$9){N@vx&5`J11^1;yQCI4lR%7I7`p&~mi?yf-fxizY
zm>oO^O1~y$wt`=;U1#rS;+m|&l?RmH2G!ZRA??{jw0W^TzRZ?*bupWIyH(aNG~Q6K
z`!b3-e6eL?Jw6iM1si!Wqq3)`r*Ss7(J#71|2Br5LEh*7;S}d?z$*@}si=FN^@B?N
zW~1eAxde(Wy@gh%PhDn|>MnY>nT%Tp*u371YSp16w*@*I9-5|0C}w5qorlbSiw1GF
zLU}`Vl+$FBXzF{yRfpF3=zDosz%<&)KKtl9dg?jaz3q=vf4|&+$M!_H(vz1=R)YNU
zFE5={m0Mh5_qOr7Hi7o$3)OVq_U0SsiI<P3nfrUac0EZ^sdzc4m7iPAvs2%myJE~w
zUx%*OxZygw2C+W+n)Gsa?~2~Cq{Ws9r$Ok1L&8z&YB7Y_I?yhc$YzJHpJhyE)m$(*
zIq`p}`tEqD-}nEQnH92ya1hxed&`QDO=b}?v$AJq2-%x#StZ#HDSPi3W$(Q?=X;;`
z=l9RAzj{1e=X%|*>%R7V-OrcMj4av@=`#bo<3te&L3eeMBhhA`rGRG|0nE26Bv}cp
zyIN>-^uEJ?FV%LysX~)T#My35Ku-2Mk(^(L0~x#j%-4#g-6eA5?fNLhaoVzn{Drc-
zdUXS}pLVa~e0;%?^Rx3XHLh%aIyG49X`9w#|5J|I9}Wpkyw`nZy_2?L0{u4|O5at*
z9oMcGDXBPIFf-X#T>rR*{IvutL0^0@?Sd_{^|RIvtJ<rlvR*HP2R-mI6D#I?QUAMZ
zadq`zJX2ZARoQ%48vTvTduU~<Vr;4X*CFc1YcIB1KCEm74~_YMa_p}qKvNyvoaPe#
zv(YZWdgl9&lmg!laXFN|k|1&v%45K}Gwsp3{8TFPs%ig4t{JQU%`({<YkYI8KMePh
zHt0rxyMSGIkl5nQTII?Xt@y+9Jj9^5RufmI>2B>5ru4X3fQf;@ZH#cpYRwt+_g9Ek
zkn2i=Og7(W>e5Ou+W4Zcw!h50O@Gc*AZNezctV4HhT7l9<+``Kby$-RIIF%ue4ct@
ztf)sh5pmjeVX{&Z<R&Mn;a|!X=U@5k_YhSN6y2xyW#Amna{m`{6WHk#z+qH{zoC?>
zuEg`NK0U<uV_Q>r@*w%V5pUo-qZon~-a`&jngh>wdgf9BLR3O?jvS(QWMrg+T@0<<
zbT&F!A;cqg-R=rgF7u~6&rEM$1$8?4GtJrHENnTou*3=ALFQ8LB_$C#f<^x^ue+lT
zhXQk7=vD=;(IeR|&N;NV_X8*!YY{irmskU1YXk$*w@=OQqWgHe<zcjuVzoE?Mz?WV
zV7Fv(vT>M!!5Jzi$aWVvGJ6LH*~L7c|3_(A54EvE=3k)<@;G5Urj@%~JYAS0*^=KX
zk^}u$MyJQ}RnW{MiYnn!)`gj)?|F52#mY?4b_rUPKM4!{an5IaKK###);cQ2LKy$W
zl9FV!7DV;gr0E@bB0FZ%2XCxt#rKm&rm3DU(dnR@nD_IH+gQ-bYQysfkz1#qmyFS%
zh<E$RwR#9ypDAue4vXNk!7MqwH368*o%OR*-pQ~dW1I3M9(ywKB=%Ha(-!ob79P5@
zm8XCEkEvHa@}V_gTzeZ>935rqPeGlh-m;~^xKB>;B3k?-SH!iAzTnz78b+}l1=ZqE
zceF|+5e71^xME64+J9y%;7CZ4tKP)Ew2<(eS!E$9SIEVHGSP@VCtWnj!1xf&v+ADy
z3(vsXh|B2IJ<jSXk3+x5&*Y@KZlv3o6oNw0?Rnc(N#U^fwKm-r=##JmTqwHMix7<#
zCLBfn9S^OO%8OvdNpl&^<qov7y$KB;yu~r+k2I2-73M0@4}6q_S&7^GA=j9qo6aJ*
zW*|=dgyW;&TQ_J$1oLewqhP4cjFmRT6W7d8y&1OXN*#^cfMMTM5tNU?@Q)ynkzaP0
zOp9FjKKgV)oOCA!nG@S^a4nA8*}FUphEIz(TM$k`avXb8IZ&YlbW%+I{CxD|w0TW3
zv}0=O1Vyw!!oVN<bWo5!(YECsC<lUMYuT&YS17fsDfn{QeX;2v>Z#;)bgu%NXR3pF
z7!b}>)%nRoD1=5BuejGo{9(7#G(&+XiqaYaFCGpN@;%hAu*EC=unD!1q`uPp+vt8o
zghy$@oXNi5mKu23pUMz$_#1s=M-3|nx*!QytmWYUL_RuZ+w+3MyrK1Ryl{x!6#J4f
z=9++oOR}?+D&poC>x3yg?H+~9ok03{8$2ES_Nr$LPLF!cJo9eeqkHv@rXIX8$zxy$
zMTbN%+IW&(A(1;!vvM${$=Y%Fl1$%xy5LqP7s?T|-N(d(Hh!`~QkZm*BLx)rb2X)p
zhc`4BPg`5A?z6`+_3u7z($t}w9K0J13GpvM9Rzex#}t{?gs8Vp3%X)ugQ9FHbAb6u
z<F@4og}k{9hdSI9P7XyUxCt1O%xw5T2xaC%yq2A_>2YNnZD^+iI8S2!_|~*x3*djy
zHyfavZ(iXSvc9`u$RzxSE!Qk-xhvF>4Dz+;f61tub$eY~9;Ej0QjXYDXISnzr|n7@
zO$d>G^FO>*a7p4pp17T*yo_{t?G~*Rr&~U>M9o1*0`!xsenXX4Obp(GNk?KB*L>sp
z>PjwpWTT?a_R@S8O-$*da@I%Q1IH8UN;Fy*wo`QIv)?r)r@~<`N0L#k%3jA!p9~dV
zv9R})$q|Oi3i}g_kP-2Hvf(QAF#q9vj6ea1ut&`eOk$K=tt7b6mkmiUahCH+?zZ<F
z@phIRos9kb$sQ}soiNnr0F<F^os-)_I+j5s9_0i(!ljr+jQB9ihNOAUoz1*2<CWa3
zN~F#+=fmQS95w45v#P7jS5=bsTlD)d><EWNJ)cLRi$NQZ%rC~kjVFicb~^PNum=33
zt_MadXxb%G*X7T+Sv~&Je)#x=eK?plh!CRMl>c9F5=kb+FWsUQWA4jiM5m!TdOv?r
zui_iKU2bk^*_vA`!nPP7U56%Oe-cKMD2?>Ji%z^dTS(TH`W_V=eSORm`slP8&3Aq8
zL4LWR@n&jtNoMfux%=Kaet)qVa95S+lS*|$6xhi`c-mi1sAW86lkw>yEQDmMa|EC;
zTC_Sy1W64MSDJk3)z;{dG&tPU_~PNqAHP_yx!2x1<g3`y-mBq1+K$fk^Xu23ch+dT
zyK{n`YziZ-z!BN(k0<IMYMkxy*T*o&qF>MojHOuAK6|-lnU<Eu*Izoz%Pk-f?wpqP
zC>mDN#@3U}<tw~r(OOd!e&esplhdWEL0($igsgr2TKdpS;yKO3uWv{{$R<j?h5Q-q
z$L$_Iwx`0|e7u3AG^_nU_swvN2Tr^2Bz|*jhB2dXwf)XZV%TLs%h18TdGz9P&&!d|
zJli9gw5(DmDYp+avO%gCwq2$4HR9)TSJSdUJ5Oq255r?yG9Sx)H^;fKy}an5F02<c
zEFw0<c)Pm{{3>F^&&Tw+p>e?Efs)jBjR@@I=MG!kEo8r8Tl2M1IjmE@?FEzIh%m+e
zQzJgNj5C|WOY|nogvX0stP#=UXKNYkjlDQubz|2~e5tQ~d#gur7sYE)=V)+Hj0k(5
zj<&jP<lUcH-a)3c-a1rVZ(Lhv75bf0!iT%PrL!dr^Z(s={*&KTy;@M2{9JW&5I#!;
zI?+u0T5D}+F^SPo^cGmx08hyAze9;3UAEJny4s);gPAQ`Om=q89e!>1jXY=wK?A#-
zcil;>jbESYq52w%Kl8|rX`hmj|Aps~B}m5a1$KF2wtdD7sgD8~{l^L;Sxcy)Wu%c?
zpwwd#i(1i9+PbRzX>~xr%6%Hy&Tdu`oV#?rj)sZp+8S8#cuC>3pFxQO)o0^FlM86P
zS%AmIY%K%7ycpM_T*jisLw+y*ZiBSvIEW*cv%cW(Qiqt`&t0~NnqK?gu&^la|G5hz
z$M@-N?86F-G={3#Sy)(WLbgbaeh|oG$2;W>?DCRsOc6CGV|L~j89Bb}dZs=Q$%-C|
z9<5Zno{6fv!dO&g3gou(W64gFaXnkQP%=@Ha_ipS9U>{ysA#X_B>i34(D{o{Akuw1
zm(ZG1pWcJk$4Y%g61M4gEn{oR&aoQI*ktvmg%j&fjr@o25;xVK_xN??bT<CSDS>#=
z8h3(K<P~PLyw1js{3%~o>af{EehX~nTTKXI!_Rs+@kO?IX;d)E(B~{rIqBeJ^TSo&
zIMMwR2g&rY<>@=;xFf${Wg3;GxQeh|%=b7ayI-p7o=x0S%8gSA8dn9Co_MiH{F^bE
zwFoYQw!ug0zN;$4r8-_K@wQie$H;q<_xGV{p`5Rv4E9|mr;1@~cpde5kUz+@B@P&d
zW%l%Z11QOL=-yGG)HcD5&O!7q<~t2dn08U1a-lCfRt_=y6)39n9t_-dKI*7?O+8Wk
z@;4rF>2S5@*LJ_xH*yROUIN`W*U*Wx=}vBNe83uymFAB!ymrPX)3O#!vGBur>C)t@
z9RYXAHNwE8c{FpsN^8Ib_)*yc`Mkh`f~VMLNpHLkWDVXQad91OVENe0i*A05l@1du
zaa~u(h_&TQ0&OVDm|*4F<Su&ssn@NRhLuXLPiU`~(5lYalSe`l6B(*(uURx7zHdAp
z6v+MZY}tLP{Y7F$m6FYg&Dluc<%WZVzg5Gy&wjg^>7Y7A+R|{IOD}pnHLS+^%N9S=
zuh$aj=FY)#wC()q31{bj-h-Z{YJt>ZQ^ZI95yKjDqQt{XV%o<MEu64JK|6E$OoF9z
z@0mVF#YF{14{hSK!lQ!@^3yb2?-q+w8^;I>`sNonM13~u_nlhE+3&5Ur#FgfXGK2C
zCRlN)Cfb^B&5D8+nmaz9#w(d~FjHCrW!?d9Nfh?@bVP}PU$v-G{bh05)u&H6TO;$t
zT~Z=}JeMKL-{Q8keFjCJ$CSi9`@A>riadAZKY}Tc;Z@W3Ufh<@3WQ1C(l7IHDZCnc
zI8D;SL>=@2@7-y@Gn;AN0*`&{__P=LReDo)rV!Oc{vnBsxO@bWfy(KjzD~DMWe)+Z
zEO|EX-+&F4G2iorYT@3{juNRWo3m3m^KdcI?4m!-nIc_|FN{^7x&|o<EEmT5h&YW)
z!ufNfqigtVhWBGrbenKbiSuuXMe-lX8Ef8($=J6C2P`U?#&rse5`K#9()8)1-r0kH
zq!pfOaG>d?9=$$eeC)#9bnT?&_Y=2UP$;<DKGgR?5E=%Vdj>9!bIOAOF6X_D3^Clm
zH?8|p#A%OOy#>)*yl>Tr(uPYkkGN<>pFL!XwX5z3$eA6}NJ${=Hgvgr7x~H?pEOJ0
zPUuHMV#7R(ZM|B$b@Vn*ZfKfWiczsTajoF2`B=vC#|h##vjR~(4%)v*0|N}}wmz4y
zF)zcg{TWxLRjkcSd$L{(c+4Lb<DxZhN&^*-C?9w0qQmnU3<;qsR&rIPy*>D9+S0mx
z?uo})g!_m~f&0Oo_!+#?L|WIW1Rf>32Bbe|7~9!ty7oSj^yot_wc7-2bJb%MO5G6W
z-DC3JOGaA6Dm(-yB@?#l(hKE(T+yLo$bdeF*q>r7llg}|TD<P8sW)!kNWRawb>&(?
z!o0|n^lyfb7kzlpTYS#T<CC<D7$~FKb(Qy?eHhHX3n!M`a#<-da$3de`61IFk1pk&
zFGkJy%KNb}IH3q!T%IvkM@t3f#t`K!95^qw!^7cvZZsN%anGz_bd?FgW~3i}FrnXc
zizM`lW<71c^HzB4;>Pt-asJc^ou`#5tyg6lOY>+oMfY7cXn+8La-uO(q-sN*i*-Eu
zO%6f)QuJGcl2b9(`Kt<AmqiaxsF>@1ZRd9wi~gx9+(w^yhAoM?dTisj!-r`s!d>ms
zPt`y=;281Qb-ip?ng=q@Q(9&TJZr=`kUv&w`#xi%C!o1?d%h|cNTYbIP^6K9Pa{bg
zi^V)yr8My}T(o8AsLO0jP1u?7i*+nKF$EL*&RrJ-5z={?IN<6{TM>^;gxqrHqZ<NV
z;3UW-(=+~ENHgf@of!e<^6LW_@pN_BlV<PIj{PrEQkaB1xW7$IFnq$pV$Sgyj5I1;
zeTH0X+E<i{hcr{<e8gWo@FmXs+d=2$#`4vfsaQ9zqL7I8`Hi9Z&4Zz;6C1}5Mu<2)
zSCuwQrD&P<qV-RaK)dr^_K;wP6V{$n_B|m|I5zQMq>NlzWV8*qcJOjG&DH1eiH($8
zCitaa@yWyO24DW@!u(YS_IQ@ZgB!VNZ%rWye~DRBpMiTG)x?5-+!AJoumWzBcCW5e
z@FBV8H>T97A9v?uE$td;XTjw~Q)B9qlInqrn(3dR8}p6i^2k^@{>WdmwI!14v=^b(
zL$Jv#55!`Ve#E!aQx`nNiFl=1yL)!4Dqe2wj1epN4a3u4ZKdgrAx{vE&jz%Pd)prW
z@fFAnX3Kf@c{fRaWiSxLNg-E%_>I<#TOXH;p3pZ#VsZ{j!am_ra6eFuE{b|%j`B3c
z7*^+6?6DtqFJkoiJRdkT&4AzJIO!hFxe}j<)5OSu1C6Vw2qnE&D0Thp)H?LutM~^o
z+K_!}F0oRoK6Vipbor|z-%#|>tF!Ut4FBc(qNAnvt1P|>gCWUL_*avfm+#FM8@YyB
z%M=q!%M<7JEsocE@cEuFDN?yanhiW<bvJqT$mwwZ;vc^Dpe!jXj@#ZeBV}46MZK-M
zBzZd;#s}nAX?rT$At|FjbtC~>k1TKe>(Mmb5WWa*%>c9|XYa>#tEwhQk%e<)n<L#9
zJ)HNNkW}O!Rm}xAVmICzo+YDed0T9KyAgtiwzEakd09sC2qHr18KUsF58w`SU$7)@
z@IMLPH7&ynnGc>E*7|uO`SH!qym9^H-zH6!OR^9}*pl^U9MexrhRFxVwB`i*G7-9X
zjoao0zxak0{eG-3oDWGg5$5<=(I3_jXfQ4nKB^3k^P_z^OEJfLGjB!Nd0FMK<{Yi0
zxx^Uavv`+rlFH3}7r_}2ezCu^;E`ywns#xh#Q(eC{LiU!dJn-9>%*{DA4E47HX~CA
zH$&cS2tBI)URXzVbDc%pfh*LK`pG<F;cg3MK8M=Az*%(Bkh1p~oeKN!*NSzZrRW=r
zoa}4niLI=3TOahRig0^6{&;di0j6=vSgE61wWqDlhngOk5CmbPMshpBww*<j(=a_X
zj*Z#M4pUdacTDY-;{s|hKxb(9t}u?3{!jZ_)z1d}{5%iSjG0Q(Rlc%yfD5H4CS?{^
zUwD{27FbeEBIRHGKPs#3ihXh&-NRWsEE#t|L{MeiV^XhMUD(Z@BG30mGv=8o`>8QG
zoJJ1RS3_X_8fx3IGx~1x!`fHN!Q-h;)GYp$i91rJ1o=4%HJ8-3lfJcEYb++&cP!~u
zI?kUWUu*f@f0*H`Vj12O4n1Ym$OP2Ckn|yNAL*q2Ngu_(a00F(pMSn!jryCF(req^
z`yPue_iH3eClAR3iB}7?vTpwB)m2)2{7)D)`JTrE6RF!zYp422xFc=jePl%^7LU7(
z7Mf>YaGah}11^DSQ&$sJN3HMokweOW;L`2N=;lxl-U<>J)KdiPcH))F9*-rY^l-X7
zO;qj86eTGH^MPOHNMWyKb?=(GC+T!{p@tya`l;)WRN8k`Bc?OC>Wnu(v9ZRuyT|vb
z7VfR$>7CMC{BItstv_{ZquThPc8p=R4!!f!@u)3)@gV7cTT|cnTlGqH{*%qxw&ZcY
z?Z8oiccbcOQ!SW{I=@#`?p9HHy5-7V(|=D}D~*nMdbsrkYvOBY_bzv&_h`xe9+xr)
z<DN4A3Nz$?fR)n{82To<71Y@}cN~hdegK_`+QC28salGi$?1IHH!k$wq>oDBD>Zxy
z9jCDM!vGFrlJHNLL1>Y$9=b%eQDVR^W9;vv<dFYGzfUKRp(K5d`QaxLO{YKJ+f6L-
zsbo3}2fa!B6SM3nBB4K5QQRatN^%AK)_e0AfL9TH2IY)Pna5kzC~0^4fd5dxrbRkD
z7IYV8vgVLe^~~HXeap)v6Q3e~aiN=$rSPQm6g@<#Y4ywgXIIE=IOarxGP53_dul59
z&8sxgMYj(w7I0&Mnys#W`9XL=XEiMgueO%{-BaTaH~1$y^#6$F;GH?%y{7+-D5;cM
zs$K6HEqH;)(Yrm({Lm34kuL3sw3R-P@j)pvgk9B8G+QH9n!WT%B<Z`n+~-VJHMw7y
ztyCtpDxD9!l~FX!5*ev+?v$o%C6%JCYn&cWGe5}*(Oeb<%*1mTBPOn5oTva*U`n0;
z=BVw^M!{90>OZ}2#@wpos>~#Pn61<SOK8-FwJIoHH~GCACFSsoSF#f(9DIq1RGwMg
z^epjgxV|+Yo&4R8nxJc2B;Yh*Uv=NcoJg8~74^lKq>kB4n>0#dVy<E0_hOi1!*3L;
z=G@03HkZ3~RcFTPW#<jdAAhffdZ+cn0+7Qc&Q&et5>hC<BB<Y6LwX@+CbJ89JIvzD
zDa7;L>{Ly3!Z`prU9#VNj8eIXro&o0u9O}fp9icHrRozNjeyzKZ|~A^mjL8a_m_&=
zo;53!%>VUEKI)70%G7ak!8JpRP{O}O=I5WiClUgGW2nSV;W@XXV4bLHV6J3gQCw?1
z&JtFI@i8AvY~&z0nLHM`0GZ5uVwA$B^fEyZ5lQ4f3i^w-816{BQIP=u^4?NJ7>C&n
z0|Ovi3g1i6IJ3iMomgyS9%NB<a3CrE<ho}3@L=I2AnG*56s2=A#?jJ;A!I3Bq!$+I
z{0-wQ&gyt+&vuT08sJe$;~4z+yh7t2$vnR8RWlhnIWAA<qgJENv`U{$W44#v=Dz>$
z?Hhv@k=d7vT}PWI8pb5&pL*ow{!M1A4Vq9y(_{SFkUZ}`$nro9(Gu$xBK$X{ukC}R
zNnjR6{aM#Y6O!`+uQ>+`L-kXV$`GvlpN>t2Z_L{OaUk24*p<ziKmD;*X(9Ka@~i8g
z_-Xy`?8BDEFUN9Fc10}6ggln+zxFQ{8)7LSImfy%6Ow;>zj0RxCF{?hbvR!v?==Z*
zUtez`m$|(dKb)f%j3L{LaMUkN-hC}?mHLk?_qdxW?f6#x^bR-U9uzm}b^PN{tMt@9
zdTHGG;xENJz)I$@C?j?M7I_lD3?EZ>de?)mxkK5eS~zI!iuvW=>68&_^cT|3%1T~*
zdB@5JuH7=ta#Hsxsa-bG)#xEfifV4IM-Ry(cMsKRKnGbpT<D@>O?sudloJxcQaAn2
zH)VM7ldqcE&an>i7x_2y2{3j;fzpY#D~>A5Y$CZb;l>ceSIa`3PxY);)+)K?Zl|`?
z&1?5@QC9`b`BM@Q0z-*1Z4E~}V1}H9q>feoL5hs*VwFEjf|?o$X!${bYHClXG?gON
z)bV_il_l6==QyUD=nzTduQU?2>iBz`SM5Xv{CteEsKLQ<ainh=n6W|2L4+@%LsDl!
zM8*lkZ{lUzS7vKRn>@c_q5=%>+0y%Oh@(ChC{EdJBV*CGR&~RSbnXqS_g7!BTT*{s
zrqsKY1}|k%Qcj$#s_T?Ix3nTsDPye<F_ohDyT4^?<JodumlH$U+}tRZ;khS@k5ZCc
zEpDT^&kFt9vQOPhYAg2~xbsqC6)uXKb+#T0Y4F;C5n7JeXaj(i2=4Y+XZ_B6kPH6w
zEM=IZ3wEQORkrVj{P-;>*l>Nw-wKcfE{5q<T1pX3W*|r8{BD~}<f>?+4)|Afc&tdV
z>VjVPp;Y*wFJwJ!YM8iOGz}kGZwe8*B7|%QEv42FTwmjZ)AWt(mNg__145bFr0}rv
zH|@a;16>7TBk4WOi!4<SzT#BH6?+S2JgOJmt%*$nNjxAeNd~cjE}Z^B^JS_AlE<~@
zVHX`Vo~rJ&kEp253pSebfZHXNK0-;SED!lfHCTu=VN1tCZ9vKRX!c&z0lQb(RCQ^v
z$@x=ORIKHlQ`D>ak!gEi^-Ag%KFX3o=K(!u%osQ_g4&&KM+;H=)}P#yOwqSrZ*gGt
z^3P4mQEly;6nleTux3RNy1zD{n~FJfoX=Ybpq9rL8)JBEElm^NkgkDjzz9S|fx%Ms
z>h|EQx`lT_t?w!ZP}dGnyV3PB9LpKOGI6+hZp%G$5TP&~*z9(NE@XIMH*d!Sa)Fs=
zfD&rdkP@vw=E*_itdpc4ibEyO&5(}g`#3aQ7q#5RHc5xh7{r=D)=|g;vGLL?^%Q&K
zUod-fuL-kIizm;4a-v?dx)fW#9OtN6wM^Cc+o7h5fxM~s?5hliL6rys<)xP!SKF@_
zepB{!qGn(fL9^NWqqHeHUZniuocy43Pp8soRbx<mib@t$HiyOIYWp;lVba*%lot2f
z+29;StCmT-_7s78GK%99!w23xNn3<HYYe(Hji-7(C~wzhX_P_!ZjP(%n9Hk-E9Q88
z$o+rh$r{B0B%jsf1O<h@S;e5ZRuz2rZxQ4&AU>E$2I7!5{<e89syaSxYf^N=*HZ}3
z>-1FU?4aXp2+#%|U0j?b6a-689ZkdU3~>Jaqy}zzsIe7ag}!y5>fNu;kEt@TLp@)W
zef66=t+PDNnqjXse^Zm?F^u9RX<un2!BkP+&t@;7nbB8(PNq=n>)vuKQ9G?__Ld;`
z%njI-U+JTpvzc2u^+H5~do6Wprzcc_sTk0~8uAxu2VaNFHqs#P$63e!h@)M~*2A1g
zHIIv>9SYk~HYy|Gp5ub&>I}LJH}fn4q+f9|H2sUS{?HC~p^u&rwIqgzqx9x*w8qof
zz)DZcA;+JrN!9A%t9wE<&09f#=bw**Wbj3U!DB%6>&eiY;!r!Q)iLCLLr6Ua1Mkeg
z-%ro?G5*f$j32G?7)3?_Dky&HILa*KjXKN3HTvbW^aBj#n6f6XQXQ7ejHnl_2Ur|;
z2~erQ=hE|&u@1rfqn?0A#f|x@Rzk1tS+QxHB11hAG>^g5b)ow<%8W-wL3^gZ>2DMC
zHd{5K3c~zRG&_5~rW0j99Vbnf3tt2@#CL(yApen;s59qNGb7w+xyD5C68m^`)1ss0
zZ^>ms&iDTX2ATTPELU}$bxrmX{|T1I;$LwDQg^?PC4)rWpkA0xa2F0oNf>baS*%qW
zaxRXXzY6%GDo1LDmg_6jRC8TNwl|;zvL`!j6BA&Zfd?he)C{Lal)_!HR|k+b+CtZw
zDZ@LzVf}KZ?Cw?<!i<80IZmW8F%-UlC(1gnW$%Q#pD|C68q4MR;6b&68Fewm>G(*+
zf*bCp>1m5t!?!>W&9CAIEAT19+}D^Vii_duyCmrg1|f!Jn(jP2No64cPd@3JIiak+
z9qe&n>EPfdy^EFO-9rH+jjo3)?tnk%PtLVMt(32&Oj-{u-uI;#y#>!Vhvn3DE_e_f
zW<Jf{;xW<6icm=XeWkmYsO|9DLaEq2#l#8$__a;v$G-4i&+3pgJK98A=;_xbsg?oF
zsWFzyLJ(w#zc}SIe3hi~`vxpDFn;1oF}#R+E$x#IE8dL#d(|><H(Hmi*qb~<;)Oe6
zLrE_!l@~l)NB^*shAU+t%rBdHV%bD49=yD}CI9|g<XQDdzV2Kd++p?A2q1h;w+&#D
z@LZWo5mj8qB3&#K;0iZ;l14GS$12uzAm=h#?MEFAAhgl|)lQ>^*rWRb%!}9b15@Lc
z##*-#3MH?yx7_WoHgo}g360-@Y=##gW~(r=c38a9b6Zmame9?DkOvo<?Y@+H`KZ@s
z#n89g+BqD|+BvKNQgh$k7j~J_(qaNkPKbS>nh@0+07k){GGuvns#U7;SXl5Bag?I>
zC<&#U8P*q-O~4C9^kyoTy}xX1Bx?8tk5D*Z<Vg|}Xw1l%B@$^<`TZHSrDNqyJN$j6
ziZ+S`zG8lXsy8tPnDpNo8!IFx!ap~)m%eF7&#<va*_nO)(M7#Gz{eQ3dZN`b!a_FJ
z1!;k(&=?S&-!$?F-a&|RS1qVq;+eaLQC~_cS#4UJ&h`E6tv|~oNG6K*E|;=9O1>T1
zVh-CW+=76v`P<hn`nsQRqz~D;td_|J38nKL2o#w|8&1Ak;_I}iZHKdidm&!*NKZ0r
z8LitERnzEt@YN4@cPCfm4@IA2?UyMg<yxgE<1l@mmRg-XrXIC*qg1AGK0eXX&O(+6
zaNJf3wS1a-N2D-qb|P8(Q36Wf;+h0ABl7NhOcQ^L+!`lY$jSj2Rid_}<m?@^Q#0SM
zKsLV?hIi|X{F`=R66f(LJ-!_*WX*ucQhfLOYxUFCjR%<HSEp4pfd&|m<E7a*=6?e8
zUS*VxA;Hv9#06TVL~A-eOx{$_A6ooRh5lK6YY-)@yGhtGE3b6qNO{g{aSvTjDq&_y
zwNQnYVZ`2MRV50*nFi(=ImL8vAq!^3Z-a_d+3LUI$Z}>$B|l+KchB+s{2Q!H=C$v<
zx4NVtw!j16!5VTK;i_!Y0Qiin*qbZ->51*U1yPh3;1t=ZXm@$DZo$8-X?m)Y^85fi
z@r9Gnb!X<504>{y-RI}kB_O)7fx~96uMMj?plWeA{8ymLb^(}G@+Fk^lv0Qqe4bdM
zN7`tD&3JyF_IqW1?8hnlt_tLUgP@?32W}`60R37W+vIVrKM;pdIUR4aZ4$ZEVWh}_
zTY;Enx8*x`+)!2uM$A>6p{2M;^?{t*as|{&czJqWb;M8&x+Uu0wyIi*{1b+{DY!G2
z3$;9)hvf^Nb@t}x19rq#s7^wR&n|hF*GHWy7u--D3Pxs>l^*CAiM;(hvT=J3EKi0i
zshEEMJj%>KT`;?bcJVsk^OwB8r`&l5zhNOIC^tFx)`C{zuhRm#KF}7K>1fHT5>!lG
z6#XcSGzp!ZC29)!3AXN=OBwz`=a;uoXwygfn>L^=KR@$}zVTbnv}kY>YZah%LMR=j
z^>YKxov;wTiDi+HpC%yr|8EV^(#O$)0c!$>*^8dXX7Bufnd}*aR2N;@5$3-Yo*1)`
z1x*2zo+9vhz8eGB4;uJIK!IvRF%+jUb8~6rSvsCYtNho&^3)a|hH_-cTeH?}q;H~r
zOE=3eEa<2y>z#K^@fGtOZ4o25TPYSUc$Lzsp~jC=>4q_;ji<=9O{Gsw%=ZCw#8FW|
z=$J!4H(|-agzHu*1*%>J4iY<=tLBDKyqWh4ajDe2w*EPGiahJ9d$8w>2{RL_g^Hpj
zKXp+FBcS%D2{<#fGpUcej7B8e+Nla%OQpzj09q~JbNOTMtUQHiKpved!T+kIILEQ!
zS=bDU@N3+FP(8CZSVA61mu(0u-s(P}tF;9RL<P>9Hi?*0yAYzS$7U{mqb$EHphvVO
zoqx%*J9GSJ%YbyuzqKrg5sL4;UMGR^WJ&e2i~v__b2_?==JXfBSNfgd^urdcO=2tn
z>}0CG*${zZ)yXC@4OLR*#!ZMh{SgwK(51C(uR{LBcMt-aMzHWM14O)`9fhjQty-((
zw@<$VrTu*RrL{-fF9L&WT20#81Le1XO0dEA;Eabo$gNExViOYJxFg=urS*%ulnuSD
z#;W_F5M^HkIJT}Yf)hg;{wQMLjB^l6!z_mYuOecq=nAdwYlg^DFvxeMECc{$uEb+Y
zKkFO^Q-@u<Ax8PKSRnwiXk<c?131fqPFW>4VdIkSMO{G60HA*UD9PS@hM!}naXV~)
zLB34GqpWp|<?sW5;nC@~qG{H#mAqrxrczv?#XVO97EEPY+nX+Z*>g8rGD2d)SleOO
z$AkoU`Up+Y39rhRgstYfTic*N78t_^vg}&=w{4w+biX_h8AtB!^e#^&fEcXEM>nxV
zCvXYdmL4N^YJTJaw$cYvem957s>Q;NYYbWrPMT^B%&lNMJ3!f;(xOxLOO`5Haj#{{
z6l7^_I@ZM?oBOb8Yb*5n4};X@zGJ_otue_ySj8LArGp4N%ypU(-aev$G4QXGHI|X9
z7q5|OF*?`90Yv>QAm&A9w32k^Z3JxlAJbg>py>SkCa=GkrJWzfI$dST7Ko(|S$Vv}
z9dQG+sKT{<BfxJx3)Nm6Q`w$0+z&t$gB&<R*n+r}&}U|c)mZLCi&HLBwU}q=?FoDn
z+0zBAlkG0yi$&4()Tv=!(qpW{EF_=s{{Aw_XSfr7q<{p=L6+JxWeEVb)H@u9YU*IX
zZ!2`d!e7^*MgA&aPB5dWk?xVkXnyvvGQNo=f};R2<@Ya=LK;*VkpV~rN<;rHI%~&D
z2CXbNS44{Okqf{H<EwPO-d+4DyBT1jMDK72mRlqyRunMrB;<I?>Ud4>E`TUDKKgdg
z87&ZW1Zh(dlb6f%M&H32K$9m2zLC>sW$mBMphd@N$?sFYG69g#UYV-9vxFDH-D%&Y
zDu8G~)v_;TC%ut7lfe?9<6|t|xKfLvdZ2-R00-L23BrI3XshJSIo2fe_`P|zjsu&R
zloQHu?+KIt1^XodEG(^KZ1DyB@Gh{=zxog8>w=_j+SAWwith_x0wJyc*R$&hQv}q_
z&0F_qa}kqANmamw;#7^cwH?DZ%%)$b*bWf=%0PDEou2N4ZR$kPW^Tz5Y6jTd&Q5`d
z8!{xHXD+FloLaa0LpOs4C@V6}KRrb?LP&^$am{OHM~b!pF?p7?kK!8+dVx<k^k2-K
zx9Z<E1Sy|>tPBgAYO>V+@BJAw9F}-b>&`F;tIffZwOd+-7S|T*ulM{12!1&r`zlbu
z)!r7URli-2)nZrBmJ=wA9ovEXQ>6E7L-i!H7xz7yFX5x8X!B_x5@@Q=9y=_&46a55
zPCNiGQ%8r;+X>ytn^FzFFPMyfZgQ-xa8v9Z<vD{j)oZ)|Zkd^Ys{=sy14xG?ttF!<
zGe8~N&qfw;R94(*Sp=4;>{511TaB0iW&}dmjb>WrcM#TVe>nL?HG~A8lm_&iK1u1f
zl;=cOtIK{r32)R8{apq+EYXsOzm8)M`T%~wF%A~T#4D+U%kQdIVlavz=3=q#m)mBN
z@Qcs^DG+5rFxjrG{|U_hsTDEa7AsQiGCkeFgrDY~17lCYFIx7bf;Qov2G`f9wi4)y
z{%zX(lt<2C={9gbUPS>NSDAUw)%7o>e1VY_{_~QmSTB$!F&R6bR-FRHAK*kaUAmbj
z{YIanI!$YL@qDwlCjM8Y+5=sP1CfgAPE`PTRnwplJp`ee<p@>ouSK_K7M;1g3ugf@
zY9Aac{en@g>U4?v-r9Liu+M?+&_O=})x`o^Yb~m4g^#CEwv1}!bC>GL8<Fu-M@lkd
zwWb~asOt#>dz<w4CH3WT&g+Xwqt|W|>|cAHqRFwuZ>XjEjr1dw%I-v5TR=S&JnD_0
zA0B#I)pPa^)hR}~+}|{g)gL>EgsT8(NU&T+@s;I&-43l?6eioc;N#|~_tT5L78YQ0
z5V{QpzKA*(F+$04m*&k_nU&H%f2yt?rVw8Omv`JeJL^qofjrvU-gQF7T7&QH<Q(O<
zaZfzQ=u6qEyyO2X2ju;Kql_tIAsk}{e*b)a%xVVt)q`?4(!znND<|rN=G^f7?)UAz
z|L>nx?%p3Qm7tZ|Pi`qMyCmEE{MT<-^LD?|o>`G{3(L#PhdPfS=UuftHuAJg_4Mr5
zeL8g!0`IzJg7~WN<>AN&1$^*;2mP->UJw}(F*-4^C+8nYBrX51k0;3OzWi@RG!y9T
zyAP>XARE*Y-z~u~bkP+XP6)s=nX?oZ>lPa+Zw5mH#3-I<GHGpfk(ld4nk)F9Z99fV
zDEOlLL<IYq(s>${0r>~r#zKY0Y(KrNSW!h7M|qp8^w^uPa36M|`L}U&M~^x^i60M9
zXNoBM=y$y*0zjjhU#mG)ulx~)vyP2V%RJ`e*S(9D&u>ZN-(EoCD;CjM{a4;LF>7dE
z59_;O3@{kGrJe>62>_Ql@I%B(1<y=k)7^Wt<U~%ehqpvYy!yq)ka|qyntPR}*=XD3
zHa?;s2PW_!CEMdq{4=F+&!C9zXAcX{kB16R8@CIr09I}D_r!I#PJ-pl<k8W;@4DBi
zmSu-U)<p|e!{S$RcTM#89|;6sq?T`)yz6NVDEqOXm(J5*xfCX2T}*s$09TKlCDI9=
z^ux$8e%9~oZ_Ooj-vF=H$ny<Mab7)~LxzocE!9www?6vzS?-qJ_g>G=6?$Lq7N1Eo
zXw@#f8+Dm^O%iZ!(&OfidvBz_nxA^}`cUZ&{8+tIatVs$tm$9rqU)?5HggYsS^nlu
zCmzcK%oq;g=v`4yAN>JSpPmy2mAW4)05NW0gOx<9rGs$P<#LrI0O`lq)b!dVB7$=)
zam5M#^t$C-Wg#!zr53Rnb@&fCaP`(Rla7j`0PF>~EtU0K=)AI1U@-0tql&PQ%4$)@
z;FS+I+5LLPx4+3rkV_cn+nC-k*!s40<bG?y$Lqa>E2h}Qjb087q`^-r{Y&BeFy|m+
z&%7bRXz~{lIQOlI%!ynW&MSY+IVO}cs!U8g{jEqd@b%n$6#&vMZx*YrFUP7Loi8rD
zfy?XoY6%LC-u7~g`X2t)YB?SR+AAbrfo;*xn{JUeZ1v8({5fhvuCd#uX!~2fTu<n~
zR*BF`O49oJ$J_N>JLYwAe7fYhn>Fr9^JP&1&Ha!Fyr`Kujz}JO;+gnf+!fQuxaqAg
zL)m=6eCn6T@=0EbZx|M#v_!$3Ni>SWcii^3Vikd;GP|C1PQKufrubs)<4`KS#r6h%
z?fBI9G|9(VR{pa68|S(4=;^%csM}t{UV?1zle`&mLf+0tNIhn<MnyeC78|fRk`FM|
zqPS|uKhuu4^j#KA@T;X!X&wzpvw*Y3%WK5l&;r{Ghl0&a*MjZM;==tDvw7=a(g82y
zlA(rakD{YGQ=f`)I=47^{TGqz<DxXnzXNm|UfSD)zl!8TaSrM5aWOyVUN_t$Wpd#z
z%KuWX<+;E4yxT-0_wU7W;qKYof&%u~>8YH&K$n-T(!UI+g5|&Ag_}Dyh2F(k%->E%
zB?162cJYn0eNKYXY+mZC=sU7wurTK+kN50$V*3(33ghRu=OiZ1zdw8Dh;u|ufp*<v
zGq;g8`=Fcvikd2o2%Dc|2p!#|ljhUp@1WFff(87>ra6%4Nll?vw0lf8`<w7Lm4yUO
zI`9em%{0b_>!cbuBk;`qNu^{n)7W#kfRTC4K*8Vo<$~QwBNoITpFzA;1!NM{XE)U-
z=2pZk9WsNbUdHy_q9iiAZiuS*2CnzDpZ|C!&%olDC~_k-485Z<p+_C<hCze#WZsqP
z`%gRu72h-J`yWNnKRuJPV_{)4bkoG7G$LsKO{vt=Hp#{7NE?9{G%**YqkuJ<l%zao
z<RMM*q}QM8P$Ys)<I%*n_LdIh5nR&!$m4#XsdA|r=a?_$%H13y)tegu-}l(EPUF|@
zcWgw~s2Gya)za>Zk+DSa?9J1@bv;LV?b7q1%ey96@+(h`KdW!^pqUoV$dHxCQY__3
z>h_0V!)Wo6;H!TI<Gh3Cj^5<16sk-v*)?XSFT|quSt(2$1WRWegx^Tqy1i-I725Ph
zc%4&k44#)&r1^@WIoIC0S>!iyD-GFIJ-wDZS3dqtsS0dZW%Xf(vX_W40dkkOlYogF
zH*_#z;ob3^Yzme3ptN^hH<5HRR{Vf$Hr0=Xcd7efG`T!mUaRDfv%J~O({n}pq~CF(
z9}mU0q2t%j%?H0jc&!B;UFQ*jo^E_;l~Pe2W0Tr?tD`MCKQ*!DJ?$+GmTx?P`?=Jx
zRbN;+(F+&&t#7;%{cd14P8@4zwllUOfO|QSUl@{#TB{jEmzVKs+gCEr_WCA_^(}^;
zXfc)V06ABp`8)_>la9nGujEeM-9=W^PP9}HnXb$|g`r8_i$}+7<3eUwXA7X6$Uc!T
zv#O}gCF=eDy*%ySCHhJlR*pB`dwoN!D{u?)!IM5L%0RpXr<LxY477YDaRL0y+Z{XW
zZPzo`e`53k8l3ogppkh`dUbYoe*SiFuym+|5vEl(xqeKCxnyD!t*p@Ta^t=Hiq_Y1
zSDEbREG!29y66`wOiPXt*CXDStHXCn+utu_V6?vMSfUXl>m3xfjHuZ!ayiS&`I6~p
zopJp_^iinq!`s_E_6t4OU;72-b9V_s>gge&k?oyD!>p_tr(}YA@mjHW!tRP=%dkFH
zDqz<$zIT=TOag%+uZQXNYIy65MP3(uxM|7l+1!Z#?I}Y#x$Q7Ri8(P2X6_AQM{mYR
z#7G?TeS>tLV@&{3<KPmy=b_+}`j9y*Y}#nLYM~<QSe$iw72)_zdV7DUNn<H8g6w(W
z4I&?{nGklL_-?ph<U~jZzRQHZlU>W6*a&_tBB!MZ`nWtjDI%5E)&I=TO24sJP(FxK
zZ<@@?%IYJ>%Ef|Rxa(yYm;_HtD^_ay1dED(H7i*)6>HX=J8{;JfR~vKB;&hp>0~+V
zyPX%Nj9!D}lgX~%224*}hv34uF_9RMLJ4d#wSx*TY2tiT6`ZD-xUP?$1G@cx$lc~{
zOV$f9h%E1eLHr#m0`kNjo4h*xr&rpX6t%9CoZb&W5d#|~jmm6mL9}_~<LJVsh7XJ;
zQ>C!wS0C?JzyEYnY`|vI)t`1E!D|Z1tjOB+FN(K&V94An>mtLJf9(#wFrhM<^>3r(
zN0!^D=Lx8Fh~LC?ytQV9s_oh2lBzpz(q%ObB>}EBbIT(_BD*=huEd5|Q0od75l7y*
z1a;Gkpas5Gx>p9E;H&OMy7BR{+qwOfW7&M>{Py`e-8+NJYa9roK+-F~w#Cr`R{^CA
zZP*w!Rno*`hx8(W0su%^afenW2LtMj3JnNg=C3*FNG2_(0`H7xVBz@st&ZMQD5dR{
z9G;)w)r6_f$TB#5d3A`?sfln7PQnO;6&PEaEbKd91+1RJFN=ye3WgUdxSIA<0szPG
z(11TP3%Jl*d?;BqzgvnRuJ;40+UURTh$2=?x5HNsfBb!}XrMqB;?3I5OvA>`S=>%S
z=tG=~-U=V~)7Q0h9+@aYgs(%oRMwvd766~p;=|zSz|78~Nc%L9qE^3p>H+0sswTF|
zYp#a%2Wm>)%0?M$b$`-ZAAk~@0?E@gvoos><@&P8eVE~u_!y++#k5Ch@#%(O{WyKj
zlGOV?1o50-Vk{9rzQ4>%%h%}MJqLgEM>Ggk*8MR!1F7@QF;Pd&^g7X7Y^YPl;$aP6
zN8u60%}KG!r>r0V%m#+uufRc@^#7P#IG;;nOI^r3bs0N9>a(3PPB6uW+J^iP;QkF%
z*nxz_Gh(Z~7ObrKND-yL((`O+Io3```w0&QRDFbxe0X+=k%<<_A1QCeZ_i!@km8e=
z1yuK%wexukVo|_CFv*?cJAl*cf*Pv|+n62!H})z3W01rQJUjN42McH{#ZX7cb91#M
zZDArHAfO^mOCxNJRl&-pN(y`|mY%21mhy8N;xPy;$Xp?kz{rBzsmBsAiF<?E%4os0
zkzOLmE!(H^(@MecSiaeA9eoQv)P`5x8T}%j=4fU|T0962Jr5!4dCf04nfhw=4%!vC
zH29RCe{`})ZLDad4xDzkCHcp9XBF<}sxL`HWQ+>1csq7!g5i3^RWl+d?myu=)-(Dw
zH3Mz;VxtU8$Yc-&JQLY=Ymb(<q}>LyE0`HQZZtBLhqwW7Q90kxiacTh_tPCnK^d3B
z<tzPrv|E5%{cE4IaV>qdehomE8N};X@MVa~x}fFaJc`SBycr9N-|Hp1vm!LB9QFG%
ziL~~{{?w1<*kb(@aMTXl?|dn;fcuFEFhsNKPxB|hbsI>__YWfw7PbQzzbBjDKozty
zrWkLc<4(>B#SxM*{sm*i@YgY$2NnkAOC3ZL@VHh=vvJRg+6{09+Zryowp)mgG_28c
zM~61$?vZd)i1x+?1r<Hg9*4(;rkGX6<4EE`Z5})~IUfbmxUwJ_Z_N<Qv8yY=az0UM
z>^l@DJ{4D_S{u6)UP|<8;B$iqyHN-^W*3jlfy!M>XfzhaoYozmO+Y+8zOfOEwWZYk
zoLk?U>3!?XLohExU>N`9UwV2psSXhkc%F(6k||zK8XI@^qp0F7&Zgg)VNAm!Jrr0)
zy7}X!r>3jWwXphgKOpmv5Ay0q*15Uom+MJ7LWSFuls7xpCrl88j1?^E5Up`@|4ypI
z19%3BZEyMWkZhjVRKGnB$jdEodF1A?4Ztn)>5;+!^X-0CzR{!^vMvj>pybe<_u*!1
zX5OWrdSA1Bcnn`nKKU1b4z=AsmZc5z*#x?{hKa-igg+Ba7ru3J9$9yr*EbkGeLZ@-
zk#EcTESCsOOMz|wmDc~56@n_!o`GG0Ukcb9O#JcLz6d9~x~>Jru_+54+-MPRw$f2O
zi3=??JrBX`nV7iMWgcA~8kRlBAlkSHBk;c}ML7h-7chMkKUB`w<@UM;zK_|54xS$@
z57WOE@Fbp^vU~aVc^6OS5qzU@`*B%CA+n4FtXIHRVK4T-?Six#v7nf=etElR?KzAg
zmH0g4hq%;f(q=|P5^=3x0Q^%tx3#0O{y7o&FUJQMv;5|B%2@1s{M2-g4iiV=C#?s;
zLX}P2lKP-{pG>W@e^>+ma8pED&I#q>;1WmLuTROy0q<^e*&!Q{wVtH}*9D)K?9O%7
z<|deO4gQJ=k+r+NFoTB)uHnPONUs+Cjru6H%A5dz;$|)Q!df+KU@}!;Hv~7}FXk%v
zWI(&CGu4CrsX)2ocXMyN<W$1h-wkAaiN|TtBZmT?+-55M<DGx%vEVMq%Ek&-@W8J0
z%XNaXWsq41p6XtMQkRtF(tD!%KUJW$CNEX{((^^@kF%;Qb6~Ox2L{YXs&H(I`%{KW
zQO38zMUM#YZr()kOtKMd@_|pL8d^|@rvx}SNkhP8mh+t&U$5s}rkE62Q1T!A4WE7N
z&fbCrDHj$luF7Xecf1`ke$wG2iU#SBC>+EMrq|kT&QcDAQGGL{+uYIlcJ%1v%yxZe
zrgVOr2nr;REa$Tp3)shmmhe9;<r%E7A;YL=)g?50dW!+-qhQ^L;t3h}=%RdMmfd}U
zv>2d`zVi1ZYEHH&EhsL9r+E)Xlp6mrGVSh)?U&?hjiEe;#Rt6=(ewE#zn>wCz<3X+
z6%L}w8{&hua;nbeH1s(O4A?gQWjJbyJHL8yg$A|#L`ErF>PcnXf*>7O07TalY2W+&
zRD02`>X9LW!2c*xXusK&-5YeyS`h}8>f8jZ;O#&N)Jy#@M*IE@Jk{vqZelZRjpjBk
zp|j3P+IfNit}rs|IIA`jeCF~a4B$<RhRbdj{{dLYukjy!{J8a*#%Uac8t*$`IA}68
z(=|vN2%(J&qB5$jwNr#WAuvHcR?8^rqxkpZDf6j%00c!Ln(uZ*{d;Cb$EwT$wwS!A
zX|FL|a7`_&DyNa&Te-)>y1rI-?xSd!KN`gRf&9%!1@4~EzurK9K@9p<)0z2`_)Ht<
zS4y_IM(gbhcx8j@1Y+sV2|mO?E&n33FY{CvILDHQAk46{RaV@s;JYQTl;&z!CS)-i
zimRRVzuLS%F+L0oc;C=MDnemR$7O^Fy14`CMar9+^In%acigQNd0c=b<v-YK65Eep
z+5lU;kB{(Qk2hFRKELq+Kh-%QmiYx!;w!kV1(tatE$5x%qi%FI{k|1~E>sJC-*@$*
z4HJ0rpX*uL28y4Dj*3!BFi8S?>Hp#^@D=IWwA3Se*L%lDIzTYxe4)xKg69%7d<khA
zn2SVU{het*@yZ0(Si<VyC{L_sr%1^;9E$o_LyR!^&MV}9&+y;;o0yp@wUwbP^Go35
zeu_jXs9Q&X1_hi~q+}u)0lr=FBSC$%<VP}STzYogKUUy$i5##Jo&r7|>}vHt@Duiy
z&lHgae8ac37eD5{zd*VB-*tb=K;XR80xQEu5OTPL-|gtgP>2SpU?-sh6)XEu#$;+N
z)gGeP;m6Eq%l@08B}y}!F46UpEZ)3P!8=g(l9{E#UfoO2%!&#V0rII6G-wKfQ8a|e
z?$_;I?@xU%0y*9Skwh+6)4plLeGG_U)K1|6pnm~Ei-{Ob4>(<0eh-U&uUyc6U)%EF
z`pcVMGA;_d^rA#WcB{VW$eFgr>J*|E6=uYSx?t<TD=Y3S-wD*oK?|HOcp6|C^XAA$
zCVxGW^)VOq%?jymx_}bRlv#l9HV*J$5y#$~{H%lEZp}98Te1plHOed8@NmKOx<%83
z?7x$GCI?^4-uP!YbXI{LZp4Y$kobDnOOY0ij9Wjj{}++4M9oc1BV@Snm8q|0LTdck
zI}_hNuGw#050<q6LAmnEJXI8J5@lLBO22{FJ_W%NpKdZ6**$|VzNanx?fQxT;&Q!l
z30#8&=^dMs1F*HtADt2w9S2IzRD-E0JvV8npGCnEW#7Ov$S<dne?KDX{%GZBHzrqu
z^s3hN%znV3@r@xkl4~37_@E%=I<%eHald8;x9_c-G(a8%xm4vzz;yoU())?7Xl}#L
z3jmtbfi=72aHVJUVh#=Byr5KqX^5;h3~8tPUvx;n3wFZ*;g^phawj?ZZ*04Uv@ShL
z8~y;GYhY(750t4QqgNMk0q8(Z9gL`ceMf}A!<K@ttnmY>4$wyhswbEBXE_yoQJ3HT
z!hevem&^wTn453j-W>BZ$Q!+zQOJL0wTc9}fjo9axA>k{%-xP<7g$DeCDXfL@PSpf
zp9XJiE-DJ2Oi_id16Mn^?%vGb_%`nhgeh(SA6ff)NK&w@LQOskvg>EkTfsi}o!iWR
z7${xNw;SJ0y65$h^IP4uaq-=|U&Pz%z*!C~`W}Z1xta2(yycymTH{A2CpN$#ZvNz`
z8vkJtt9I1xXYTC$8z~OiPgva}1>vsW&C&Uf2X-mtb46IkAnRnRkwyI2!n%WtyL-SY
zW*;~v_`r*8PxYWJCDF3l-Cb;SgwG1Tlj3;K!0q;Q*8iv{ebM&I_i<cK1kc;x*P4wO
z5|yPriD%?<yb^OC=Jyb{`O20NFSzf>6ij@Ou#Rb%_me7h+ch;dqB;5^1qBL25?YN9
zSw+up^S6KEyL)NT(wQ`x<etx1yZ_bIe*;Rk*>7`>_p4gov2SDif?12S_p;x1$!I@3
z<|#DesNm}ok*<ZsD!?ZF9#r&Rp~F<m`J5WoxxRKc2qnyP_?dpGsoXmUW*_L1kHf)O
zS%rMUL2_95kXl85tAXRJ^+y~18@sWf^FL$RUG!#GcK%bB>)Xxwv6CQSEVF`3na4c(
z_0lthG%*9jjKdtKyZsRg>e2H4uVcJ=-?-pKR<bbg+s9naOVWRT=^20RYhyv>_|p!Q
zw?81}O!9_U9`PQ{##dFx&Btzk;+1TVKZ@HfW7F7>g^gnqQ-ADutHE0GnEY~J)NUx|
zWxXyl0Nm-IZ&+8GOr@+)7H}f+3^D_NRlr8JjQ29BBmb|lCl7~mZT~H6D<Nd;5sHzM
zE!#|#24SL*$V8E4IQHd`IcT$QMO2*63{qs@W>BY^ViHY+Fr4PgG@4MRCd`=cecyBa
ze&4ye&h>rY{4v+O&pr43-21b?59hQ+WM2$I`T?g#8fX*)Ot-o+v!n^c7AhAERj?yn
z+1fcUI>L9?qT>$S6a*ARPq9MljfTwqx`(XyoswPpn6fZ4LEf^|S<pJkB(<wh&sJNw
zJ?kja=L&F%7vS;xt@GfR9{lXNZegsfh>3e1H^v+ItbYaHF(N<>El<{Ypd0OU+)Bdu
z?THZ@J-GS)QhoAG>$c|V<S#?!05HE-Pk4pn*R9}}%+#V99%d=!O54ttX?2~`bqEh`
zSuE}Cr`rdxwH=~bQ=YO)FXuE(T2m)J`12<f<8z!;c3sta>HM~FP`h6qVF=z`o6VZ&
z>|ggDw+dqp4-Z!}7n8=KPLE03O0sGB#N-~?30~O6nKk}(qjh784*IBBhV+2&jTW_h
zoWlxKZvjs^YFl<sS0R|pXNOta^Bkf|bFMs9l!`UoLw%Z1imzDpxr^FA`(WmC^OKT7
zMcS)U`+%`_x58sNyW2mFqt+wI_`J(tWxF^}6r1t}P9~*uEmey|v7v6deL)e*-+aT`
z=I|k=d3tJMQjCflPVrlVS8>Z)%T~)ulk3RkP0J?BvdcQrF33+)u>zyE-1L~HgQ2Ud
zd}GYa3(`<2PhxRKnOHKB{9-O|5yR_PsmEXZ^yR^6)yEP5?oHoDw9CrGP@(N=Ld-%t
zq{UxY+-FX=$nQs{-F~V$IIlFO_?BCPGAO@Q>LnlG6X<u`t8nW!gJb?av)QLg%{wYX
zt6E+y1PW8ioABg|;f4A!MlV|;buGpk@piA~-d~thYR7-5!!Mxtomn@uZZ-}vUs69z
z9rpi66JFLmehkkqQA4;^cXY8o*Wn!w8g?9vzofFfeX_mf<5Vv3)%eZv@x~!LqlL~W
z@Y?Dud;2&G7SbdGGR={f!5vLfwq-U&mS(`bKBi(SxjxjuID83Q9K<C=F|0aR`JW9=
zhqL{CSRqQbl1=2M2Vdj+)&j&6em!6-sgWTq^NiXkaW*C<7U}!@v>gyDM_HVsGqVw4
zAca{?&LJ=Ix2v;)Bu7!Kd$EvaL08EJSMb0ajmbMmD~DEXv^Sy+98TM{B&skS!E!+1
zY&?;N)g-)qXOeo)<2=<@3@rREg(z@xtvU?UR?Q0HUtZsCwjC-x`Z#OPo~ao-q;uh<
zwvmltchV(kTNxJPo#*|84CiMmAa@{(!m{!30PlkH!krZ1zW5y*Mly}VRl}7*0*#ih
zWy3C*x^8DwxZVV?<frQt)F2ob0M4~jGLTtjvM-vQSG);`m7xefQS~jK!mtSO^^J#v
zFCtUQf7(##0xsHa@vhgVg3H6ent!FM4YgEs5rqcH>1a4tC<GjX#r-ylu1H4q<bxQ<
zYI(iu3+JHvA8HcTYV%d?e*>@xH?N9nPgpE->Bo;9-iaIdvclEK(_`IApcI8#D<_(h
zS5mrP`f?zp+e#iBmizP#eadiJy#&e1)g%lQQPX*@`ysu|nh@50dmYx$_E|Gij8M0Q
zQSrLJ`Qt7#u*C)lj}A_}dL>H}R#tlfwcY9|RV_(h3#jl$Yn-~v7a#W0te`?q9;nk#
znAt{OW~wZjpPM=c?R8#V7wvGMrE#MN#ITXY!cX8^<)>hUm~y}N<9pw<$<NU{^c2uf
zkFTe8UmUF~f+Y`hnz`d;^>yTrSpf^YaJ!EGyf4uqtmEjPK=;%;UfB-Fo{F>$mCeMK
zEPczzFi9l$y~BGtLRS%}+l#5N2pz4n%Yocx&T-~87W2BqZ9j10_|iIE(^<`b3LMjd
zgA&pGB~;yAz+Q*d(aXjvCJkVd4-o#)7*o6X^MV7C8f0lJc^50g@;_GSN$aW^=WIR-
zD-!cShV*s|1C?f(4b<&PNWIf_EwTrkHv+aQ7<F6d?CBSgVVz-0Y7o8S*HKO84yyjI
z4WK-uk&(|}`P^;KH13I5>ZRSb2d-=24d~nk>LA1p;Ruk<<NZ`5w;edSgXkLP@xX=-
zNmdyWk~n-RCVl`#7|3tm8JuLs3<Reefrqky25muxQc)QL)TXJYB&FPoEsg{M=<B2N
zIGSZxaVl_9nli&ESU3y04pyS=;IL1(PM$!dR+Qa>us@n-3faCk%Uk&z=JgtO{g-X%
zrFFh-HyNffePSK3qzm+f*5X(``B2hFs!6Dak_3n`a-1ZEEKz09czh9b{zcDo6S1(W
z=kGU5$Wv0S-dA}7qKk%uq#A16FHc|@7WO7$LFYcSfxQzrv`YWK$f)!?u|SAoACb#H
z14vU)X6Gh+VJoi=E_L3s=T9%Z(PgYL#wNKMpaSRguSNSJ7=`z}KFc8tO$7>YGO^8!
zBeTGl!)<5L*E&Tu;Tpsi`%0X~j3LoJ1X-g9Uu*7kKco&}4+Aeq>UbsMGXWTQggXmh
z_r-9C6ya`9I7ppe4`8)UW@RIw(*x+CxT#Y;tIvH_wJ(W2^w~telIihLlqn8vBp)ui
zExvf&Nelu=(ucD2$qkY4r3s~Lw@u51sDxA-lIX)QFo0$X7Sx_mm8jc(0?}|T@$$`_
z>aNxz|BW~g2L;i^ie6{$K*%hjXJ5w2QBrZp9CsJ+EX1sUnqQqa|Hnpfqyi2vfy?@2
ze14SUK(>gw!06mWPXO84A3`IfnvGd1>k+SrEe?@dmGyx~YZY?ANo2)<Kf%)<`(0?y
zqV39T^h(;@{0SoH&%&gF^FgoyaWmW)*6FfAQWy6`%Oy7vju@#A0lHi>rw=w{W9r^W
zX;!^2*__ChP3N(|GrF6AU@P#wAG!h*6Jkuc)KTTds=KQ%mdLh?x?A}jpbQvdhNKv3
z5mV5<7XaIzo*7SJVxKpY$N52Wzikk~pg0)b)%rJ9%s?nu2m@+39p?vXL|3sz9lfLI
z)XfaPGN%Z$G2`$#h(PV&ui}e4iDPg1GMi<Gb%>e?!i>TCHyUu-EVXX4oMoFySWWTo
zY!n-bHc4Gx(WHgTLkfqGOH<lxz7L1pQKbkIK*ioCWEQoHvCkt~IC3!iFY0^EuYIk5
zbNmvw*k`kxL8V0+PxjENTS0aFB;1-cfYWUNz#Z*>qFBVP*=SShRO0?HNnB3oSFRJL
zsAB!LlK~}{;SL=S<X#Vq6pf^I{P}(zT>(p;PP04}X98Dqf`+?wp=Dw#eL0<n&<i=R
zh0;5ey#L&UGn^w~GlnSLm(4ZW1obZ>4ovF)Y`*{gy9%e7y~H(q(T!bDv{kN(e|rL&
z-L3bsK4!6>l%*FpzRyvZx0&648_dhF!LWutqOzowM{AR!Y`d=3^xuO(b0r8zZIi~U
z1D6$HW=6*P!qCNY3c*Rs>OCf)qaOJ=Up+zSxqQv1oAv*(U5Wa6$2axd9Ft6aa(Mok
z8&1EbUG3GvZ=sWEHMj&%6eM(Cr{tPOi8mO}io}R<zT?2|`Mn8!zvZ6+Gr_LUBkosV
zo`z>SB_%F6wRE*o0zw$dMCamx%&H~73pU3wQU>-%-I?Ox@B;vlzi;g)-AMFVT8}n8
zW6S2~VLVGCt{A6KSB(W~3~(+3bd{|A2u{KLSGsVH?oK;7GDs?Rd(l2Ch=^wIeE-p4
z=rlR5DH6Ik1EQu3x){Z!><p@en#S{EolHMKXhsEJ3}8$ZEHw3wS`0w>2pCsE+DaAY
z1w`aGfb7snyqnue^1t}romm?K>kb41<whu05mG;}mYId!@m^(0(>cOSFz_g%JWH=v
zBqd%rHs`G2y!blUwA_daCpo|z>yt6>I57G)ofmIvXzDjes+aqx&F-A?840$XsZCq5
zfm%EdVsl9p@Cl0HKFL4dF-VG?3z(Cda~z1-h6xg5XFXag8Ry@*txxvuvdMrFF?fio
zQ&LbltvZokT?MwFz5LvSrS<eK?mmQJRRWLDs*OSEDttJQ=VdsJi@q0oHL?e4djX#e
z8z>$?pD&Jj)j2Cjk78dsw3<Jd>UQJA!0Lv=21$lc8{^l!f(TpB_;NS<ORi1cBIMMw
z`+(Y8P!HvHU^E^%-JP#0OXreIQ)jsMHm61~zirUxd6u=LahIb;Q_A}uH_(<X=z?@!
z&2_&=x<VY>;{j@AksH4qEAzX-0Iepz7~zhQ0wq0^RG*kPhzjVn?g<gtM;EX?h%fxY
z+e=?^JvDnnZPbYIli%O@B>8}0xKDx6lKAod$$Q(+x1~Vh2tw*OFD^))>S%bi!U-zb
zQ*x&J_gFGbM@L6N%F@hmPe0{Cl^}cN{gktd3w|HUEDmpo%6p<nb|^eH{@`|NB;CgK
zSYFXK1UZL#`0+*kw^r98DF~*^T3d<M?%kFg-h`2Vt}o@g%%tf;9M~uPv!xFMN8R8D
zU9pCW;}D>2&l|AZ)EJa)&^QHB6;uL1jWK|Rz5rP9@F70}{0zg@;h!*}{|5gzslUhn
zH~cSEp&?HG7V`H*eq^En!Uz5buJ5Z@!vB)~XGG6K$xA!_$6C=4`M>Z>fS-R<4J^Qa
zVB$vs{}vw&lm4rK31EpjTnZcDM=C#7_}}1vAtf5+%`sx!+Jb?oI~;L2++d4K`xlRJ
BY^VSL

literal 0
HcmV?d00001

diff --git a/tests/cypress/integration/06-messaging.js b/tests/cypress/integration/06-messaging.js
index e629069b3d0f..914354b8fd2f 100644
--- a/tests/cypress/integration/06-messaging.js
+++ b/tests/cypress/integration/06-messaging.js
@@ -3,7 +3,7 @@ import sideNav from '../pageobjects/side-nav.page';
 import Global from '../pageobjects/global';
 import { username, email, password } from '../../data/user.js';
 import { publicChannelName, privateChannelName } from '../../data/channel.js';
-import { targetUser, imgURL } from '../../data/interactions.js';
+import { targetUser, fileName } from '../../data/interactions.js';
 import { checkIfUserIsValid, publicChannelCreated, privateChannelCreated, directMessageCreated, setPublicChannelCreated, setPrivateChannelCreated, setDirectMessageCreated } from '../../data/checks';
 
 
@@ -33,11 +33,11 @@ function messagingTest(currentTest) {
 		}
 	});
 
-	describe.skip('fileUpload:', () => {
+	describe('fileUpload:', () => {
 		after(() => {
 		});
 		it('it should send a attachment', () => {
-			mainContent.fileUpload(imgURL);
+			mainContent.fileUpload(fileName);
 		});
 
 		it('it should show the confirm button', () => {
@@ -68,11 +68,11 @@ function messagingTest(currentTest) {
 			Global.modalFileName.type('File Name');
 		});
 
-		it('it should show the file name input', () => {
+		it('it should show the file description input', () => {
 			Global.modalFileDescription.should('be.visible');
 		});
 
-		it('it should fill the file name input', () => {
+		it('it should fill the file description input', () => {
 			Global.modalFileDescription.type('File Description');
 		});
 
diff --git a/tests/cypress/integration/pwa/00-service-worker.js b/tests/cypress/integration/pwa/00-service-worker.js
new file mode 100644
index 000000000000..2edbddd840b0
--- /dev/null
+++ b/tests/cypress/integration/pwa/00-service-worker.js
@@ -0,0 +1,39 @@
+import loginPage from '../../pageobjects/login.page';
+
+const version = 'viasat-0.1';
+const file = '/manifest.json';
+
+describe('[Service-Worker]', () => {
+	before(() => {
+		loginPage.open();
+	});
+
+	it('it should support service worker', () => {
+		cy.window().then(win => { expect(!!win.navigator.serviceWorker).to.equal(true); });
+	});
+
+	it('it should be in active state', () => {
+		cy.window().then(win => {
+			const value = win.navigator.serviceWorker.controller;
+			expect(value.state).to.equal('activated');
+		});
+	});
+
+	it('it should create the cache storage', () => {
+		cy.window().then(win => {
+			return caches.has(version);
+		}).then(exist => {
+			expect(exist).to.equal(true);
+		});
+	});
+
+	it('it should cache the manifest file', () => {
+		cy.window().then(win => {
+			caches.open(version).then(storage =>{
+				storage.match(file).then(response => {
+					expect(response.status).to.equal(200);
+				});
+			});
+		});
+	});
+});
diff --git a/tests/cypress/integration/pwa/01-login.js b/tests/cypress/integration/pwa/01-login.js
new file mode 100644
index 000000000000..b288c6d13643
--- /dev/null
+++ b/tests/cypress/integration/pwa/01-login.js
@@ -0,0 +1,273 @@
+import loginPage from '../../pageobjects/login.page';
+
+describe('Test login page in Offline', () => {
+	before(() => {
+		localStorage.clear();
+		loginPage.open();
+		cy.wait(5000);
+		loginPage.gotToForgotPassword();
+		loginPage.gotBackToLogin();
+		loginPage.gotToRegister();
+		loginPage.gotBackToLogin();
+	});
+
+	describe('[Render]', () => {
+		before(() => {
+			// time to register sw and cache files
+			loginPage.offlineMode(true);
+		});
+
+		it('it should show reconnecting alert', () => {
+			loginPage.warningAlert.should('be.visible');
+		});
+
+		it('it should show email / username field', () => {
+			loginPage.emailOrUsernameField.should('be.visible');
+		});
+
+		it('it should show password field', () => {
+			loginPage.passwordField.should('be.visible');
+		});
+
+		it('it should show submit button', () => {
+			loginPage.submitButton.should('be.visible');
+		});
+
+		it('it should show register button', () => {
+			loginPage.registerButton.should('be.visible');
+		});
+
+		it('it should show forgot password button', () => {
+			loginPage.forgotPasswordButton.should('be.visible');
+		});
+
+		it('it should not show name field', () => {
+			loginPage.nameField.should('not.be.visible');
+		});
+
+		it('it should not show email field', () => {
+			loginPage.emailField.should('not.be.visible');
+		});
+
+		it('it should not show confirm password field', () => {
+			loginPage.confirmPasswordField.should('not.be.visible');
+		});
+
+		it('it should not show back to login button', () => {
+			loginPage.backToLoginButton.should('not.be.visible');
+		});
+	});
+
+	describe('[Required Fields]', () => {
+		before(() => {
+			loginPage.submit();
+		});
+
+		describe('email / username: ', () => {
+			it('it should be required', () => {
+				loginPage.emailOrUsernameField.should('have.class', 'error');
+				loginPage.emailOrUsernameInvalidText.get('text').should('not.be.empty');
+			});
+		});
+
+		describe('password: ', () => {
+			it('it should be required', () => {
+				loginPage.passwordField.should('have.class', 'error');
+				loginPage.passwordInvalidText.get('text').should('not.be.empty');
+			});
+		});
+	});
+});
+
+
+describe('Test Registration Page in Offline', () => {
+	before(() => {
+		loginPage.open();
+		loginPage.offlineMode(true);
+		loginPage.gotToRegister();
+	});
+
+	describe('render:', () => {
+		it('it should show reconnecting alert', () => {
+			loginPage.warningAlert.should('be.visible');
+		});
+
+		it('it should show name field', () => {
+			loginPage.nameField.should('be.visible');
+		});
+
+		it('it should show email field', () => {
+			loginPage.emailField.should('be.visible');
+		});
+
+		it('it should show password field', () => {
+			loginPage.passwordField.should('be.visible');
+		});
+
+		it('it should show confirm password field', () => {
+			loginPage.confirmPasswordField.should('be.visible');
+		});
+
+		it('it should not show email / username field', () => {
+			loginPage.emailOrUsernameField.should('not.be.visible');
+		});
+
+		it('it should show submit button', () => {
+			loginPage.submitButton.should('be.visible');
+		});
+
+		it('it should not show register button', () => {
+			loginPage.registerButton.should('not.be.visible');
+		});
+
+		it('it should not show forgot password button', () => {
+			loginPage.forgotPasswordButton.should('not.be.visible');
+		});
+
+		it('it should show back to login button', () => {
+			loginPage.backToLoginButton.should('be.visible');
+		});
+	});
+
+	describe('name:', () => {
+		it('it should be required', () => {
+			loginPage.submit();
+			loginPage.nameField.should('have.class', 'error');
+			loginPage.nameInvalidText.get('text').should('not.be.empty');
+		});
+	});
+
+	describe('email:', () => {
+		it('it should be required', () => {
+			loginPage.submit();
+			loginPage.emailField.should('have.class', 'error');
+			loginPage.emailInvalidText.get('text').should('not.be.empty');
+		});
+
+		it('it should be invalid for email without domain', () => {
+			loginPage.emailField.type('invalid-email');
+			loginPage.submit();
+			loginPage.emailField.should('have.class', 'error');
+			loginPage.emailInvalidText.get('text').should('not.be.empty');
+		});
+
+		it('it should be invalid for email with invalid domain', () => {
+			loginPage.emailField.type('invalid-email@mail');
+			loginPage.submit();
+			loginPage.emailField.should('have.class', 'error');
+			loginPage.emailInvalidText.get('text').should('not.be.empty');
+		});
+
+		it.skip('it should be invalid for email space', () => {
+			loginPage.emailField.type('invalid email@mail.com');
+			loginPage.submit();
+			loginPage.emailField.should('have.class', 'error');
+			loginPage.emailInvalidText.get('text').should('not.be.empty');
+		});
+	});
+
+	describe('password:', () => {
+		it('it should be required', () => {
+			loginPage.submit();
+			loginPage.passwordField.should('have.class', 'error');
+			loginPage.passwordInvalidText.get('text').should('not.be.empty');
+		});
+	});
+
+	describe('confirm-password:', () => {
+		it('it should be invalid if different from password', () => {
+			loginPage.passwordField.type('password');
+			loginPage.submit();
+			loginPage.confirmPasswordField.should('have.class', 'error');
+			loginPage.confirmPasswordInvalidText.get('text').should('not.be.empty');
+		});
+
+		it('it should be valid if equal to password', () => {
+			loginPage.confirmPasswordField.type('password');
+			loginPage.submit();
+			loginPage.passwordField.should('not.have.class', 'error');
+			loginPage.passwordInvalidText.should('not.have.text');
+		});
+	});
+});
+
+
+describe('Test Forgot Password in Offline', () => {
+	before(() => {
+		loginPage.open();
+		loginPage.offlineMode(true);
+		loginPage.gotToForgotPassword();
+	});
+
+	describe('render:', () => {
+		it('it should show reconnecting alert', () => {
+			loginPage.warningAlert.should('be.visible');
+		});
+
+		it('it should not show name field', () => {
+			loginPage.nameField.should('not.be.visible');
+		});
+
+		it('it should show email field', () => {
+			loginPage.emailField.should('be.visible');
+		});
+
+		it('it should not show password field', () => {
+			loginPage.passwordField.should('not.be.visible');
+		});
+
+		it('it should not show confirm password field', () => {
+			loginPage.confirmPasswordField.should('not.be.visible');
+		});
+
+		it('it should not show email / username field', () => {
+			loginPage.emailOrUsernameField.should('not.be.visible');
+		});
+
+		it('it should show submit button', () => {
+			loginPage.submitButton.should('be.visible');
+		});
+
+		it('it should not show register button', () => {
+			loginPage.registerButton.should('not.be.visible');
+		});
+
+		it('it should not show forgot password button', () => {
+			loginPage.forgotPasswordButton.should('not.be.visible');
+		});
+
+		it('it should show back to login button', () => {
+			loginPage.backToLoginButton.should('be.visible');
+		});
+	});
+
+	describe('email:', () => {
+		it('it should be required', () => {
+			loginPage.submit();
+			loginPage.emailField.should('have.class', 'error');
+			loginPage.emailInvalidText.get('text').should('not.be.empty');
+		});
+
+		it('it should be invalid for email without domain', () => {
+			loginPage.emailField.type('invalid-email');
+			loginPage.submit();
+			loginPage.emailField.should('have.class', 'error');
+			loginPage.emailInvalidText.get('text').should('not.be.empty');
+		});
+
+		it('it should be invalid for email with invalid domain', () => {
+			loginPage.emailField.type('invalid-email@mail');
+			loginPage.submit();
+			loginPage.emailField.should('have.class', 'error');
+			loginPage.emailInvalidText.get('text').should('not.be.empty');
+		});
+
+		it.skip('it should be invalid for email space', () => {
+			loginPage.emailField.type('invalid email@mail.com');
+			loginPage.submit();
+			loginPage.emailField.should('have.class', 'error');
+			loginPage.emailInvalidText.get('text').should('not.be.empty');
+		});
+	});
+});
+
diff --git a/tests/cypress/integration/pwa/02-messaging.js b/tests/cypress/integration/pwa/02-messaging.js
new file mode 100644
index 000000000000..15f7ed3ee0ff
--- /dev/null
+++ b/tests/cypress/integration/pwa/02-messaging.js
@@ -0,0 +1,277 @@
+import mainContent from '../../pageobjects/main-content.page';
+import sideNav from '../../pageobjects/side-nav.page';
+import Global from '../../pageobjects/global';
+import { username, email, password } from '../../../data/user.js';
+import { imgURL } from '../../../data/interactions.js';
+import { checkIfUserIsValid } from '../../../data/checks';
+
+const storage = {
+	db: 'localforage',
+	transaction: 'keyvaluepairs',
+	store: 'chatMessage',
+};
+const version = 'viasat-0.1';
+const message = `message on ${ Date.now() }`;
+
+function isOfflineMsg(msg, message, action) {
+	return !!(msg && msg.msg === message && msg.temp && msg.tempActions && msg.tempActions[action]);
+}
+
+function isOfflineAttachment(msg, message, action) {
+	let exist = msg && msg.attachments && msg.attachments[0] && msg.attachments[0].description === message;
+	if (exist) {
+		const { value } = browser.executeAsync((version, file, done) => {
+			caches.open(version)
+				.then((storage) => storage.match(file)
+					.then((res) => done(res)));
+		}, version, msg.attachments[0].image_url);
+		exist = (value.status === 200);
+	}
+	return !!(exist && msg.temp && msg.tempActions && msg.tempActions[action] && msg.uploads && msg.uploads.percentage === 0);
+}
+
+function isOnlineMsg(msg, message) {
+	return !!(msg && msg.msg === message && !msg.temp && !msg.tempActions);
+}
+
+function isOnlineAttachment(msg, message) {
+	return !!(msg && msg.attachments && msg.attachments[0] && msg.attachments[0].description === message && !msg.temp && !msg.tempActions);
+}
+
+function getMsgFromIndexDB(message, attachment = false) {
+	const { value: msgs } = browser.executeAsync(({ db, transaction, store }, done) => {
+		indexedDB.open(db).onsuccess = (event) => {
+			const _db = event.target.result;
+			const tx = _db.transaction(transaction);
+			const _store = tx.objectStore(transaction);
+
+			_store.openCursor(store).onsuccess = function(event) {
+				const cursor = event.target.result;
+				if (cursor && cursor.value && cursor.value.records) {
+					done(cursor.value.records);
+				}
+				done(null);
+			};
+		};
+	}, storage);
+
+	return msgs && (attachment ? msgs.find((msg) => msg.attachments && msg.attachments[0] && msg.attachments[0].description === message) : msgs.find((msg) => msg.msg === message));
+}
+
+function offlineMessageTest(message, action) {
+	it('it should save the message in localforge', () => {
+		isOfflineMsg(getMsgFromIndexDB(message), message, action).should.be.true;
+	});
+
+	it('it should show the offline message after refresh', () => {
+		browser.refresh();
+		mainContent.waitForLastMessageEqualsText(message);
+	});
+
+	it(`it should ${ action } the offline message after coming online`, () => {
+		mainContent.offlineMode(false);
+		browser.pause(8000); // wait for the indexedDb to update the message + reconnect time
+		if (action === 'delete') {
+			(getMsgFromIndexDB(message) === undefined).should.be.true;
+		} else {
+			isOnlineMsg(getMsgFromIndexDB(message), message).should.be.true;
+		}
+	});
+}
+
+describe('[Message]', () => {
+	before(() => {
+		mainContent.useProxy(true);
+		checkIfUserIsValid(username, email, password);
+		sideNav.openChannel('general');
+		browser.pause(15000); // time to cache the process.
+		mainContent.offlineMode(true);
+		browser.refresh();
+	});
+	after(() => {
+		mainContent.useProxy(false);
+	});
+
+	it('it should show reconnecting alert', () => {
+		mainContent.warningAlert.waitForVisible(10000);
+		mainContent.warningAlert.isVisible().should.be.true;
+	});
+
+	describe('Normal message:', () => {
+		after(() => {
+			mainContent.offlineMode(true);
+			browser.refresh();
+		});
+		it('it should send a message in offline', () => {
+			mainContent.sendMessage(message);
+		});
+
+		it('it should show the last message in offline', () => {
+			mainContent.lastMessage.isVisible().should.be.true;
+			browser.pause(1000); // wait for the indexedDb to update the message
+		});
+
+		offlineMessageTest(message, 'send');
+	});
+
+	describe.skip('fileUpload:', () => {
+		after(() => {
+			mainContent.offlineMode(true);
+			browser.refresh();
+		});
+		it('it should send a attachment', () => {
+			mainContent.fileUpload(imgURL);
+		});
+
+		it('it should show the confirm button', () => {
+			Global.modalConfirm.isVisible().should.be.true;
+		});
+
+		it('it should show the cancel button', () => {
+			Global.modalCancel.isVisible().should.be.true;
+		});
+
+		it('it should show the file preview', () => {
+			Global.modalFilePreview.isVisible().should.be.true;
+		});
+
+		it('it should show the confirm button', () => {
+			Global.modalConfirm.isVisible().should.be.true;
+		});
+
+		it('it should show the file title', () => {
+			Global.modalFileTitle.isVisible().should.be.true;
+		});
+
+		it('it should show the file name input', () => {
+			Global.modalFileName.isVisible().should.be.true;
+		});
+
+		it('it should fill the file name input', () => {
+			Global.modalFileName.setValue('File Name');
+		});
+
+		it('it should show the file name input', () => {
+			Global.modalFileDescription.isVisible().should.be.true;
+		});
+
+		it('it should fill the file name input', () => {
+			Global.modalFileDescription.setValue(message);
+		});
+
+		it('it should click the confirm', () => {
+			Global.modalConfirm.click();
+			Global.modalConfirm.waitForVisible(5000, true);
+		});
+
+		it('it should show the file in the message', () => {
+			mainContent.lastMessageDesc.waitForVisible(10000);
+			mainContent.lastMessageDesc.getText().should.equal(message);
+			browser.pause(1000);
+		});
+		
+		it('it should save the file in localforge', () => {
+			isOfflineAttachment(getMsgFromIndexDB(message, true), message, 'send').should.be.true;
+		});
+
+		it('it should show the file after refresh', () => {
+			browser.refresh();
+			mainContent.lastMessageDesc.waitForVisible(10000);
+			mainContent.lastMessageDesc.getText().should.equal(message);
+		});
+
+		it(`it should send the file after coming online`, () => {
+			mainContent.offlineMode(false);
+			browser.pause(8000); // wait for the indexedDb to update the message + reconnect time
+			isOnlineAttachment(getMsgFromIndexDB(message, true), message).should.be.true;
+		});
+	});
+
+	describe.skip('[Actions]', () => {
+		describe('Render:', () => {
+			before(() => {
+				mainContent.openMessageActionMenu();
+			});
+
+			after(() => {
+				mainContent.popoverWrapper.click();
+			});
+
+			it('it should show the message action menu', () => {
+				mainContent.messageActionMenu.isVisible().should.be.true;
+			});
+
+			it('it should show the reply action', () => {
+				mainContent.messageReply.isVisible().should.be.true;
+			});
+
+			it('it should show the edit action', () => {
+				mainContent.messageEdit.isVisible().should.be.true;
+			});
+
+			it('it should show the delete action', () => {
+				mainContent.messageDelete.isVisible().should.be.true;
+			});
+
+			it('it should show the permalink action', () => {
+				mainContent.messagePermalink.isVisible().should.be.true;
+			});
+
+			it('it should show the copy action', () => {
+				mainContent.messageCopy.isVisible().should.be.true;
+			});
+
+			it('it should show the quote the action', () => {
+				mainContent.messageQuote.isVisible().should.be.true;
+			});
+
+			it('it should show the star action', () => {
+				mainContent.messageStar.isVisible().should.be.true;
+			});
+
+			it('it should not show the pin action', () => {
+				mainContent.messagePin.isVisible().should.be.false;
+			});
+
+			it('it should not show the mark as unread action', () => {
+				mainContent.messageUnread.isVisible().should.be.false;
+			});
+		});
+
+		describe('[Usage]', () => {
+			describe('Edit:', () => {
+				before(() => {
+					browser.pause(1000);
+					mainContent.openMessageActionMenu();
+				});
+
+				it('it should edit the message', () => {
+					mainContent.selectAction('edit');
+					mainContent.sendBtn.click();
+					browser.pause(1000);
+				});
+
+				offlineMessageTest(`${ message }this message was edited`, 'update');
+			});
+
+			describe('Delete:', () => {
+				before(() => {
+					mainContent.openMessageActionMenu();
+				});
+
+				it('it should delete the message', () => {
+					mainContent.selectAction('delete');
+					Global.modalConfirm.click();
+					Global.modalOverlay.waitForVisible(3000, true);
+					browser.pause(10000);
+				});
+
+				it('it should not show the deleted message', () => {
+					mainContent.lastMessage.getText().should.equal('Message deleted');
+				});
+
+				offlineMessageTest('Message deleted', 'delete');
+			});
+		});
+	});
+});
diff --git a/tests/cypress/pageobjects/Page.js b/tests/cypress/pageobjects/Page.js
index d2d78bcedf9f..fba60a0a35b1 100644
--- a/tests/cypress/pageobjects/Page.js
+++ b/tests/cypress/pageobjects/Page.js
@@ -1,8 +1,14 @@
 class Page {
 	get body() { return browser.element('body'); }
 
-	open(path) {
+	open(path, { offline = false }) {
+		this.offlineMode(offline);
 		cy.visit(`http://localhost:3000/${ path }`);
 	}
+
+	offlineMode(offline) {
+		cy.server(offline ? { force404: true } : { enable: false });
+		cy.reload();
+	}
 }
 module.exports = Page;
diff --git a/tests/cypress/pageobjects/global.js b/tests/cypress/pageobjects/global.js
index 1185b19297db..39cec7643f9c 100644
--- a/tests/cypress/pageobjects/global.js
+++ b/tests/cypress/pageobjects/global.js
@@ -6,7 +6,7 @@ class Global {
 
 	get modalConfirm() { return browser.element('.rc-modal .js-confirm'); }
 
-	get modalCancel() { return browser.element('.rc-modal .js-modal'); }
+	get modalCancel() { return browser.element('.rc-modal .js-close'); }
 
 	get modalPasswordField() { return browser.element('.rc-modal [type="password"]'); }
 
diff --git a/tests/cypress/pageobjects/login.page.js b/tests/cypress/pageobjects/login.page.js
index 253b3f700fc8..c157dbe93565 100644
--- a/tests/cypress/pageobjects/login.page.js
+++ b/tests/cypress/pageobjects/login.page.js
@@ -35,14 +35,20 @@ class LoginPage extends Page {
 
 	get registrationSucceededCard() { return browser.element('#login-card h2'); }
 
-	open() {
-		super.open('');
+	get warningAlert() { return browser.element('.alert-warning'); } 
+
+	open(options = {}) {
+		super.open('', options);
 	}
 
 	gotToRegister() {
 		this.registerButton.click();
 	}
 
+	gotBackToLogin() {
+		this.backToLoginButton.click();
+	}
+
 	gotToForgotPassword() {
 		this.forgotPasswordButton.click();
 	}
diff --git a/tests/cypress/pageobjects/main-content.page.js b/tests/cypress/pageobjects/main-content.page.js
index d6d927443f4f..c57ba07cc7ab 100644
--- a/tests/cypress/pageobjects/main-content.page.js
+++ b/tests/cypress/pageobjects/main-content.page.js
@@ -15,6 +15,10 @@ class MainContent extends Page {
 
 	get sendBtn() { return browser.element('.rc-message-box__icon.js-send'); }
 
+	get plusBtn() { return browser.element('.rc-message-box__icon.js-plus'); }
+
+	get fileUploadBtn() { return browser.element('.rc-popover__item[data-id="file-upload"]'); } 
+
 	get messageBoxActions() { return browser.element('.rc-message-box__icon'); }
 
 	get recordBtn() { return browser.element('.js-audio-message-record'); }
@@ -40,7 +44,7 @@ class MainContent extends Page {
 
 	get lastMessage() { return browser.element('.message:last-child'); }
 
-	get lastMessageDesc() { return browser.element('.message:last-child .body .attachment-description'); }
+	get lastMessageDesc() { return browser.element('.message:last-child .attachment .attachment-description'); }
 
 	get lastMessageRoleAdded() { return browser.element('.message:last-child.subscription-role-added .body'); }
 
@@ -120,6 +124,8 @@ class MainContent extends Page {
 	// Popover
 	get popoverWrapper() { return browser.element('.rc-popover'); }
 
+	get warningAlert() { return browser.element('.alert-warning'); }
+
 	// Sends a message and wait for the message to equal the text sent
 	sendMessage(text) {
 		this.setTextToInput(text);
@@ -141,11 +147,40 @@ class MainContent extends Page {
 		}
 	}
 
-	// uploads a file in the given filepath (url).
-	fileUpload(filePath) {
+	// uploads a file in the given fileName (url).
+	async fileUpload(fileName) {
 		this.sendMessage('Prepare for the file');
-		this.fileAttachment.chooseFile(filePath);
-	}
+		this.plusBtn.click();
+		this.fileUploadBtn.click();
+
+		// browser.chooseFile("#fileupload-input", fileName);
+		// cy.get('#fileupload-input').then((subject) => {
+		// 	cy.fixture(fileName, 'base64').then(Cypress.Blob.base64StringToBlob)
+		// 		.then((blob) => {
+		// 			const el = subject[0];
+		// 			const testFile = new File([blob], fileName, { type: 'image/png' });
+		// 			const dataTransfer = new DataTransfer();
+		// 			dataTransfer.items.add(testFile);
+		// 			cy.pause();
+		// 			el.files = dataTransfer.files;
+		// 			console.log(el.files);
+		// 			cy.pause();
+		// 		});
+		// });
+
+		const subject = cy.get('#fileupload-input');
+		const blob = cy.fixture(fileName, 'base64').then(Cypress.Blob.base64StringToBlob);
+		const el = subject[0];
+		const testFile = new File([blob], fileName, { type: 'image/png' });
+		const dataTransfer = new DataTransfer();
+		dataTransfer.items.add(testFile);
+		// cy.pause();
+		el.files = dataTransfer.files;
+		cy.get('#fileupload-input').trigger('change', { force: true })
+		cy.log(el.files);
+		cy.log("SHUBHAMSINGH");
+		// cy.pause(); 
+	}	
 
 	waitForLastMessageEqualsText(text) {
 		cy.get('.message:last-child .body').should('contain', text);
diff --git a/tests/data/interactions.js b/tests/data/interactions.js
index dbc78d07f2c9..951bffa41a1a 100644
--- a/tests/data/interactions.js
+++ b/tests/data/interactions.js
@@ -1,2 +1,3 @@
 export const targetUser = 'rocket.cat';
 export const imgURL = './public/images/logo/1024x1024.png';
+export const fileName = '1024x1024.png';

From 7b46fa95b4c20b21a218fcc0e75aaff2dfbcefa0 Mon Sep 17 00:00:00 2001
From: shubhsherl <shubham.singh094@yahoo.com>
Date: Fri, 27 Mar 2020 18:41:38 +0530
Subject: [PATCH 181/223] fix file attachment

---
 package.json                                  |  1 +
 tests/cypress/integration/06-messaging.js     |  4 +--
 tests/cypress/pageobjects/global.js           |  2 +-
 .../cypress/pageobjects/main-content.page.js  | 31 ++-----------------
 tests/cypress/support/commands.js             |  1 +
 5 files changed, 6 insertions(+), 33 deletions(-)

diff --git a/package.json b/package.json
index a79481ca44fa..96165bfa7db3 100644
--- a/package.json
+++ b/package.json
@@ -84,6 +84,7 @@
 		"chai": "^4.2.0",
 		"chai-datetime": "^1.5.0",
 		"cypress": "^3.8.2",
+		"cypress-file-upload": "^4.0.4",
 		"emojione-assets": "^4.5.0",
 		"eslint": "^6.7.2",
 		"eslint-plugin-import": "^2.19.1",
diff --git a/tests/cypress/integration/06-messaging.js b/tests/cypress/integration/06-messaging.js
index 914354b8fd2f..633be78508a5 100644
--- a/tests/cypress/integration/06-messaging.js
+++ b/tests/cypress/integration/06-messaging.js
@@ -78,12 +78,10 @@ function messagingTest(currentTest) {
 
 		it('it should click the confirm', () => {
 			Global.modalConfirm.click();
-			Global.modalConfirm.waitForVisible(5000, true);
 		});
 
 		it('it should show the file in the message', () => {
-			mainContent.lastMessageDesc.waitForVisible(10000);
-			mainContent.lastMessageDesc.getText().should.equal('File Description');
+			mainContent.lastMessageDesc.get('text').should('contain' ,'File Description');
 		});
 	});
 }
diff --git a/tests/cypress/pageobjects/global.js b/tests/cypress/pageobjects/global.js
index 39cec7643f9c..c819378c3b71 100644
--- a/tests/cypress/pageobjects/global.js
+++ b/tests/cypress/pageobjects/global.js
@@ -22,7 +22,7 @@ class Global {
 
 	confirmPopup() {
 		this.modalConfirm.waitForVisible(5000);
-		browser.pause(500);
+		cy.wait(500);
 		this.modalConfirm.click();
 		this.modal.waitForVisible(5000, true);
 	}
diff --git a/tests/cypress/pageobjects/main-content.page.js b/tests/cypress/pageobjects/main-content.page.js
index c57ba07cc7ab..afed94dade7f 100644
--- a/tests/cypress/pageobjects/main-content.page.js
+++ b/tests/cypress/pageobjects/main-content.page.js
@@ -148,38 +148,11 @@ class MainContent extends Page {
 	}
 
 	// uploads a file in the given fileName (url).
-	async fileUpload(fileName) {
+	fileUpload(fileName) {
 		this.sendMessage('Prepare for the file');
 		this.plusBtn.click();
 		this.fileUploadBtn.click();
-
-		// browser.chooseFile("#fileupload-input", fileName);
-		// cy.get('#fileupload-input').then((subject) => {
-		// 	cy.fixture(fileName, 'base64').then(Cypress.Blob.base64StringToBlob)
-		// 		.then((blob) => {
-		// 			const el = subject[0];
-		// 			const testFile = new File([blob], fileName, { type: 'image/png' });
-		// 			const dataTransfer = new DataTransfer();
-		// 			dataTransfer.items.add(testFile);
-		// 			cy.pause();
-		// 			el.files = dataTransfer.files;
-		// 			console.log(el.files);
-		// 			cy.pause();
-		// 		});
-		// });
-
-		const subject = cy.get('#fileupload-input');
-		const blob = cy.fixture(fileName, 'base64').then(Cypress.Blob.base64StringToBlob);
-		const el = subject[0];
-		const testFile = new File([blob], fileName, { type: 'image/png' });
-		const dataTransfer = new DataTransfer();
-		dataTransfer.items.add(testFile);
-		// cy.pause();
-		el.files = dataTransfer.files;
-		cy.get('#fileupload-input').trigger('change', { force: true })
-		cy.log(el.files);
-		cy.log("SHUBHAMSINGH");
-		// cy.pause(); 
+		cy.get('[id="fileupload-input"]').attachFile(fileName, { force: true });
 	}	
 
 	waitForLastMessageEqualsText(text) {
diff --git a/tests/cypress/support/commands.js b/tests/cypress/support/commands.js
index 2a413e748df4..4bfb8839d521 100644
--- a/tests/cypress/support/commands.js
+++ b/tests/cypress/support/commands.js
@@ -10,6 +10,7 @@
 //
 //
 // -- This is a parent command --
+import 'cypress-file-upload';
 Cypress.Commands.add('login', (email, password) => cy.window().then(({ Meteor }) => new Promise((resolve) => {
 	Meteor.loginWithPassword(email, password, resolve);
 })));

From f8dfd9f84a2c87370eda8360f4089bf9fad1d3bf Mon Sep 17 00:00:00 2001
From: shubhsherl <shubham.singh094@yahoo.com>
Date: Mon, 30 Mar 2020 00:05:18 +0530
Subject: [PATCH 182/223] migrate offline messaging test to cypress; fix
 attachment

reduce time for message test and add comments
---
 cypress.json                                  |   1 -
 cypress/fixtures/example.json                 |   5 -
 cypress/integration/examples/actions.spec.js  | 298 ------------------
 cypress/integration/examples/aliasing.spec.js |  42 ---
 .../integration/examples/assertions.spec.js   | 168 ----------
 .../integration/examples/connectors.spec.js   |  97 ------
 cypress/integration/examples/cookies.spec.js  |  78 -----
 .../integration/examples/cypress_api.spec.js  | 222 -------------
 cypress/integration/examples/files.spec.js    | 114 -------
 .../examples/local_storage.spec.js            |  52 ---
 cypress/integration/examples/location.spec.js |  32 --
 cypress/integration/examples/misc.spec.js     |  83 -----
 .../integration/examples/navigation.spec.js   |  56 ----
 .../examples/network_requests.spec.js         | 195 ------------
 cypress/integration/examples/querying.spec.js | 114 -------
 .../examples/spies_stubs_clocks.spec.js       |  95 ------
 .../integration/examples/traversal.spec.js    | 121 -------
 .../integration/examples/utilities.spec.js    | 133 --------
 cypress/integration/examples/viewport.spec.js |  59 ----
 cypress/integration/examples/waiting.spec.js  |  34 --
 cypress/integration/examples/window.spec.js   |  22 --
 cypress/plugins/index.js                      |  17 -
 cypress/support/commands.js                   |  25 --
 cypress/support/index.js                      |  20 --
 ...ervice-worker.js => 00a-service-worker.js} |  16 +-
 .../{pwa/01-login.js => 00b-login-offline.js} |   5 +-
 tests/cypress/integration/06-messaging.js     |   2 +-
 .../integration/06a-messaging-offline.js      | 216 +++++++++++++
 tests/cypress/integration/pwa/02-messaging.js | 277 ----------------
 tests/cypress/pageobjects/Page.js             |   2 +-
 tests/cypress/pageobjects/login.page.js       |   2 +-
 .../cypress/pageobjects/main-content.page.js  |   6 +-
 tests/cypress/support/commands.js             |   1 +
 33 files changed, 232 insertions(+), 2378 deletions(-)
 delete mode 100644 cypress.json
 delete mode 100644 cypress/fixtures/example.json
 delete mode 100644 cypress/integration/examples/actions.spec.js
 delete mode 100644 cypress/integration/examples/aliasing.spec.js
 delete mode 100644 cypress/integration/examples/assertions.spec.js
 delete mode 100644 cypress/integration/examples/connectors.spec.js
 delete mode 100644 cypress/integration/examples/cookies.spec.js
 delete mode 100644 cypress/integration/examples/cypress_api.spec.js
 delete mode 100644 cypress/integration/examples/files.spec.js
 delete mode 100644 cypress/integration/examples/local_storage.spec.js
 delete mode 100644 cypress/integration/examples/location.spec.js
 delete mode 100644 cypress/integration/examples/misc.spec.js
 delete mode 100644 cypress/integration/examples/navigation.spec.js
 delete mode 100644 cypress/integration/examples/network_requests.spec.js
 delete mode 100644 cypress/integration/examples/querying.spec.js
 delete mode 100644 cypress/integration/examples/spies_stubs_clocks.spec.js
 delete mode 100644 cypress/integration/examples/traversal.spec.js
 delete mode 100644 cypress/integration/examples/utilities.spec.js
 delete mode 100644 cypress/integration/examples/viewport.spec.js
 delete mode 100644 cypress/integration/examples/waiting.spec.js
 delete mode 100644 cypress/integration/examples/window.spec.js
 delete mode 100644 cypress/plugins/index.js
 delete mode 100644 cypress/support/commands.js
 delete mode 100644 cypress/support/index.js
 rename tests/cypress/integration/{pwa/00-service-worker.js => 00a-service-worker.js} (61%)
 rename tests/cypress/integration/{pwa/01-login.js => 00b-login-offline.js} (98%)
 create mode 100644 tests/cypress/integration/06a-messaging-offline.js
 delete mode 100644 tests/cypress/integration/pwa/02-messaging.js

diff --git a/cypress.json b/cypress.json
deleted file mode 100644
index 0967ef424bce..000000000000
--- a/cypress.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/cypress/fixtures/example.json b/cypress/fixtures/example.json
deleted file mode 100644
index da18d9352a17..000000000000
--- a/cypress/fixtures/example.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "name": "Using fixtures to represent data",
-  "email": "hello@cypress.io",
-  "body": "Fixtures are a great way to mock data for responses to routes"
-}
\ No newline at end of file
diff --git a/cypress/integration/examples/actions.spec.js b/cypress/integration/examples/actions.spec.js
deleted file mode 100644
index 96e5b0ed2aaa..000000000000
--- a/cypress/integration/examples/actions.spec.js
+++ /dev/null
@@ -1,298 +0,0 @@
-/// <reference types="Cypress" />
-
-context('Actions', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/commands/actions')
-  })
-
-  // https://on.cypress.io/interacting-with-elements
-
-  it('.type() - type into a DOM element', () => {
-    // https://on.cypress.io/type
-    cy.get('.action-email')
-      .type('fake@email.com').should('have.value', 'fake@email.com')
-
-      // .type() with special character sequences
-      .type('{leftarrow}{rightarrow}{uparrow}{downarrow}')
-      .type('{del}{selectall}{backspace}')
-
-      // .type() with key modifiers
-      .type('{alt}{option}') //these are equivalent
-      .type('{ctrl}{control}') //these are equivalent
-      .type('{meta}{command}{cmd}') //these are equivalent
-      .type('{shift}')
-
-      // Delay each keypress by 0.1 sec
-      .type('slow.typing@email.com', { delay: 100 })
-      .should('have.value', 'slow.typing@email.com')
-
-    cy.get('.action-disabled')
-      // Ignore error checking prior to type
-      // like whether the input is visible or disabled
-      .type('disabled error checking', { force: true })
-      .should('have.value', 'disabled error checking')
-  })
-
-  it('.focus() - focus on a DOM element', () => {
-    // https://on.cypress.io/focus
-    cy.get('.action-focus').focus()
-      .should('have.class', 'focus')
-      .prev().should('have.attr', 'style', 'color: orange;')
-  })
-
-  it('.blur() - blur off a DOM element', () => {
-    // https://on.cypress.io/blur
-    cy.get('.action-blur').type('About to blur').blur()
-      .should('have.class', 'error')
-      .prev().should('have.attr', 'style', 'color: red;')
-  })
-
-  it('.clear() - clears an input or textarea element', () => {
-    // https://on.cypress.io/clear
-    cy.get('.action-clear').type('Clear this text')
-      .should('have.value', 'Clear this text')
-      .clear()
-      .should('have.value', '')
-  })
-
-  it('.submit() - submit a form', () => {
-    // https://on.cypress.io/submit
-    cy.get('.action-form')
-      .find('[type="text"]').type('HALFOFF')
-    cy.get('.action-form').submit()
-      .next().should('contain', 'Your form has been submitted!')
-  })
-
-  it('.click() - click on a DOM element', () => {
-    // https://on.cypress.io/click
-    cy.get('.action-btn').click()
-
-    // You can click on 9 specific positions of an element:
-    //  -----------------------------------
-    // | topLeft        top       topRight |
-    // |                                   |
-    // |                                   |
-    // |                                   |
-    // | left          center        right |
-    // |                                   |
-    // |                                   |
-    // |                                   |
-    // | bottomLeft   bottom   bottomRight |
-    //  -----------------------------------
-
-    // clicking in the center of the element is the default
-    cy.get('#action-canvas').click()
-
-    cy.get('#action-canvas').click('topLeft')
-    cy.get('#action-canvas').click('top')
-    cy.get('#action-canvas').click('topRight')
-    cy.get('#action-canvas').click('left')
-    cy.get('#action-canvas').click('right')
-    cy.get('#action-canvas').click('bottomLeft')
-    cy.get('#action-canvas').click('bottom')
-    cy.get('#action-canvas').click('bottomRight')
-
-    // .click() accepts an x and y coordinate
-    // that controls where the click occurs :)
-
-    cy.get('#action-canvas')
-      .click(80, 75) // click 80px on x coord and 75px on y coord
-      .click(170, 75)
-      .click(80, 165)
-      .click(100, 185)
-      .click(125, 190)
-      .click(150, 185)
-      .click(170, 165)
-
-    // click multiple elements by passing multiple: true
-    cy.get('.action-labels>.label').click({ multiple: true })
-
-    // Ignore error checking prior to clicking
-    cy.get('.action-opacity>.btn').click({ force: true })
-  })
-
-  it('.dblclick() - double click on a DOM element', () => {
-    // https://on.cypress.io/dblclick
-
-    // Our app has a listener on 'dblclick' event in our 'scripts.js'
-    // that hides the div and shows an input on double click
-    cy.get('.action-div').dblclick().should('not.be.visible')
-    cy.get('.action-input-hidden').should('be.visible')
-  })
-
-  it('.rightclick() - right click on a DOM element', () => {
-    // https://on.cypress.io/rightclick
-
-    // Our app has a listener on 'contextmenu' event in our 'scripts.js'
-    // that hides the div and shows an input on right click
-    cy.get('.rightclick-action-div').rightclick().should('not.be.visible')
-    cy.get('.rightclick-action-input-hidden').should('be.visible')
-  })
-
-  it('.check() - check a checkbox or radio element', () => {
-    // https://on.cypress.io/check
-
-    // By default, .check() will check all
-    // matching checkbox or radio elements in succession, one after another
-    cy.get('.action-checkboxes [type="checkbox"]').not('[disabled]')
-      .check().should('be.checked')
-
-    cy.get('.action-radios [type="radio"]').not('[disabled]')
-      .check().should('be.checked')
-
-    // .check() accepts a value argument
-    cy.get('.action-radios [type="radio"]')
-      .check('radio1').should('be.checked')
-
-    // .check() accepts an array of values
-    cy.get('.action-multiple-checkboxes [type="checkbox"]')
-      .check(['checkbox1', 'checkbox2']).should('be.checked')
-
-    // Ignore error checking prior to checking
-    cy.get('.action-checkboxes [disabled]')
-      .check({ force: true }).should('be.checked')
-
-    cy.get('.action-radios [type="radio"]')
-      .check('radio3', { force: true }).should('be.checked')
-  })
-
-  it('.uncheck() - uncheck a checkbox element', () => {
-    // https://on.cypress.io/uncheck
-
-    // By default, .uncheck() will uncheck all matching
-    // checkbox elements in succession, one after another
-    cy.get('.action-check [type="checkbox"]')
-      .not('[disabled]')
-      .uncheck().should('not.be.checked')
-
-    // .uncheck() accepts a value argument
-    cy.get('.action-check [type="checkbox"]')
-      .check('checkbox1')
-      .uncheck('checkbox1').should('not.be.checked')
-
-    // .uncheck() accepts an array of values
-    cy.get('.action-check [type="checkbox"]')
-      .check(['checkbox1', 'checkbox3'])
-      .uncheck(['checkbox1', 'checkbox3']).should('not.be.checked')
-
-    // Ignore error checking prior to unchecking
-    cy.get('.action-check [disabled]')
-      .uncheck({ force: true }).should('not.be.checked')
-  })
-
-  it('.select() - select an option in a <select> element', () => {
-    // https://on.cypress.io/select
-
-    // at first, no option should be selected
-    cy.get('.action-select')
-      .should('have.value', '--Select a fruit--')
-
-    // Select option(s) with matching text content
-    cy.get('.action-select').select('apples')
-    // confirm the apples were selected
-    // note that each value starts with "fr-" in our HTML
-    cy.get('.action-select').should('have.value', 'fr-apples')
-
-    cy.get('.action-select-multiple')
-      .select(['apples', 'oranges', 'bananas'])
-      // when getting multiple values, invoke "val" method first
-      .invoke('val')
-      .should('deep.equal', ['fr-apples', 'fr-oranges', 'fr-bananas'])
-
-    // Select option(s) with matching value
-    cy.get('.action-select').select('fr-bananas')
-      // can attach an assertion right away to the element
-      .should('have.value', 'fr-bananas')
-
-    cy.get('.action-select-multiple')
-      .select(['fr-apples', 'fr-oranges', 'fr-bananas'])
-      .invoke('val')
-      .should('deep.equal', ['fr-apples', 'fr-oranges', 'fr-bananas'])
-    // assert the selected values include oranges
-    cy.get('.action-select-multiple')
-      .invoke('val').should('include', 'fr-oranges')
-  })
-
-  it('.scrollIntoView() - scroll an element into view', () => {
-    // https://on.cypress.io/scrollintoview
-
-    // normally all of these buttons are hidden,
-    // because they're not within
-    // the viewable area of their parent
-    // (we need to scroll to see them)
-    cy.get('#scroll-horizontal button')
-      .should('not.be.visible')
-
-    // scroll the button into view, as if the user had scrolled
-    cy.get('#scroll-horizontal button').scrollIntoView()
-      .should('be.visible')
-
-    cy.get('#scroll-vertical button')
-      .should('not.be.visible')
-
-    // Cypress handles the scroll direction needed
-    cy.get('#scroll-vertical button').scrollIntoView()
-      .should('be.visible')
-
-    cy.get('#scroll-both button')
-      .should('not.be.visible')
-
-    // Cypress knows to scroll to the right and down
-    cy.get('#scroll-both button').scrollIntoView()
-      .should('be.visible')
-  })
-
-  it('.trigger() - trigger an event on a DOM element', () => {
-    // https://on.cypress.io/trigger
-
-    // To interact with a range input (slider)
-    // we need to set its value & trigger the
-    // event to signal it changed
-
-    // Here, we invoke jQuery's val() method to set
-    // the value and trigger the 'change' event
-    cy.get('.trigger-input-range')
-      .invoke('val', 25)
-      .trigger('change')
-      .get('input[type=range]').siblings('p')
-      .should('have.text', '25')
-  })
-
-  it('cy.scrollTo() - scroll the window or element to a position', () => {
-
-    // https://on.cypress.io/scrollTo
-
-    // You can scroll to 9 specific positions of an element:
-    //  -----------------------------------
-    // | topLeft        top       topRight |
-    // |                                   |
-    // |                                   |
-    // |                                   |
-    // | left          center        right |
-    // |                                   |
-    // |                                   |
-    // |                                   |
-    // | bottomLeft   bottom   bottomRight |
-    //  -----------------------------------
-
-    // if you chain .scrollTo() off of cy, we will
-    // scroll the entire window
-    cy.scrollTo('bottom')
-
-    cy.get('#scrollable-horizontal').scrollTo('right')
-
-    // or you can scroll to a specific coordinate:
-    // (x axis, y axis) in pixels
-    cy.get('#scrollable-vertical').scrollTo(250, 250)
-
-    // or you can scroll to a specific percentage
-    // of the (width, height) of the element
-    cy.get('#scrollable-both').scrollTo('75%', '25%')
-
-    // control the easing of the scroll (default is 'swing')
-    cy.get('#scrollable-vertical').scrollTo('center', { easing: 'linear' })
-
-    // control the duration of the scroll (in ms)
-    cy.get('#scrollable-both').scrollTo('center', { duration: 2000 })
-  })
-})
diff --git a/cypress/integration/examples/aliasing.spec.js b/cypress/integration/examples/aliasing.spec.js
deleted file mode 100644
index 95bac735c44b..000000000000
--- a/cypress/integration/examples/aliasing.spec.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/// <reference types="Cypress" />
-
-context('Aliasing', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/commands/aliasing')
-  })
-
-  it('.as() - alias a DOM element for later use', () => {
-    // https://on.cypress.io/as
-
-    // Alias a DOM element for use later
-    // We don't have to traverse to the element
-    // later in our code, we reference it with @
-
-    cy.get('.as-table').find('tbody>tr')
-      .first().find('td').first()
-      .find('button').as('firstBtn')
-
-    // when we reference the alias, we place an
-    // @ in front of its name
-    cy.get('@firstBtn').click()
-
-    cy.get('@firstBtn')
-      .should('have.class', 'btn-success')
-      .and('contain', 'Changed')
-  })
-
-  it('.as() - alias a route for later use', () => {
-
-    // Alias the route to wait for its response
-    cy.server()
-    cy.route('GET', 'comments/*').as('getComment')
-
-    // we have code that gets a comment when
-    // the button is clicked in scripts.js
-    cy.get('.network-btn').click()
-
-    // https://on.cypress.io/wait
-    cy.wait('@getComment').its('status').should('eq', 200)
-
-  })
-})
diff --git a/cypress/integration/examples/assertions.spec.js b/cypress/integration/examples/assertions.spec.js
deleted file mode 100644
index 791383b66518..000000000000
--- a/cypress/integration/examples/assertions.spec.js
+++ /dev/null
@@ -1,168 +0,0 @@
-/// <reference types="Cypress" />
-
-context('Assertions', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/commands/assertions')
-  })
-
-  describe('Implicit Assertions', () => {
-    it('.should() - make an assertion about the current subject', () => {
-      // https://on.cypress.io/should
-      cy.get('.assertion-table')
-        .find('tbody tr:last')
-        .should('have.class', 'success')
-        .find('td')
-        .first()
-        // checking the text of the <td> element in various ways
-        .should('have.text', 'Column content')
-        .should('contain', 'Column content')
-        .should('have.html', 'Column content')
-        // chai-jquery uses "is()" to check if element matches selector
-        .should('match', 'td')
-        // to match text content against a regular expression
-        // first need to invoke jQuery method text()
-        // and then match using regular expression
-        .invoke('text')
-        .should('match', /column content/i)
-
-      // a better way to check element's text content against a regular expression
-      // is to use "cy.contains"
-      // https://on.cypress.io/contains
-      cy.get('.assertion-table')
-        .find('tbody tr:last')
-        // finds first <td> element with text content matching regular expression
-        .contains('td', /column content/i)
-        .should('be.visible')
-
-      // for more information about asserting element's text
-      // see https://on.cypress.io/using-cypress-faq#How-do-I-get-an-element’s-text-contents
-    })
-
-    it('.and() - chain multiple assertions together', () => {
-      // https://on.cypress.io/and
-      cy.get('.assertions-link')
-        .should('have.class', 'active')
-        .and('have.attr', 'href')
-        .and('include', 'cypress.io')
-    })
-  })
-
-  describe('Explicit Assertions', () => {
-    // https://on.cypress.io/assertions
-    it('expect - make an assertion about a specified subject', () => {
-      // We can use Chai's BDD style assertions
-      expect(true).to.be.true
-      const o = { foo: 'bar' }
-
-      expect(o).to.equal(o)
-      expect(o).to.deep.equal({ foo: 'bar' })
-      // matching text using regular expression
-      expect('FooBar').to.match(/bar$/i)
-    })
-
-    it('pass your own callback function to should()', () => {
-      // Pass a function to should that can have any number
-      // of explicit assertions within it.
-      // The ".should(cb)" function will be retried
-      // automatically until it passes all your explicit assertions or times out.
-      cy.get('.assertions-p')
-        .find('p')
-        .should(($p) => {
-          // https://on.cypress.io/$
-          // return an array of texts from all of the p's
-          // @ts-ignore TS6133 unused variable
-          const texts = $p.map((i, el) => Cypress.$(el).text())
-
-          // jquery map returns jquery object
-          // and .get() convert this to simple array
-          const paragraphs = texts.get()
-
-          // array should have length of 3
-          expect(paragraphs, 'has 3 paragraphs').to.have.length(3)
-
-          // use second argument to expect(...) to provide clear
-          // message with each assertion
-          expect(paragraphs, 'has expected text in each paragraph').to.deep.eq([
-            'Some text from first p',
-            'More text from second p',
-            'And even more text from third p',
-          ])
-        })
-    })
-
-    it('finds element by class name regex', () => {
-      cy.get('.docs-header')
-        .find('div')
-        // .should(cb) callback function will be retried
-        .should(($div) => {
-          expect($div).to.have.length(1)
-
-          const className = $div[0].className
-
-          expect(className).to.match(/heading-/)
-        })
-        // .then(cb) callback is not retried,
-        // it either passes or fails
-        .then(($div) => {
-          expect($div, 'text content').to.have.text('Introduction')
-        })
-    })
-
-    it('can throw any error', () => {
-      cy.get('.docs-header')
-        .find('div')
-        .should(($div) => {
-          if ($div.length !== 1) {
-            // you can throw your own errors
-            throw new Error('Did not find 1 element')
-          }
-
-          const className = $div[0].className
-
-          if (!className.match(/heading-/)) {
-            throw new Error(`Could not find class "heading-" in ${className}`)
-          }
-        })
-    })
-
-    it('matches unknown text between two elements', () => {
-      /**
-       * Text from the first element.
-       * @type {string}
-      */
-      let text
-
-      /**
-       * Normalizes passed text,
-       * useful before comparing text with spaces and different capitalization.
-       * @param {string} s Text to normalize
-      */
-      const normalizeText = (s) => s.replace(/\s/g, '').toLowerCase()
-
-      cy.get('.two-elements')
-        .find('.first')
-        .then(($first) => {
-          // save text from the first element
-          text = normalizeText($first.text())
-        })
-
-      cy.get('.two-elements')
-        .find('.second')
-        .should(($div) => {
-          // we can massage text before comparing
-          const secondText = normalizeText($div.text())
-
-          expect(secondText, 'second text').to.equal(text)
-        })
-    })
-
-    it('assert - assert shape of an object', () => {
-      const person = {
-        name: 'Joe',
-        age: 20,
-      }
-
-      assert.isObject(person, 'value is object')
-    })
-  })
-})
diff --git a/cypress/integration/examples/connectors.spec.js b/cypress/integration/examples/connectors.spec.js
deleted file mode 100644
index dc8e2864d26c..000000000000
--- a/cypress/integration/examples/connectors.spec.js
+++ /dev/null
@@ -1,97 +0,0 @@
-/// <reference types="Cypress" />
-
-context('Connectors', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/commands/connectors')
-  })
-
-  it('.each() - iterate over an array of elements', () => {
-    // https://on.cypress.io/each
-    cy.get('.connectors-each-ul>li')
-      .each(($el, index, $list) => {
-        console.log($el, index, $list)
-      })
-  })
-
-  it('.its() - get properties on the current subject', () => {
-    // https://on.cypress.io/its
-    cy.get('.connectors-its-ul>li')
-      // calls the 'length' property yielding that value
-      .its('length')
-      .should('be.gt', 2)
-  })
-
-  it('.invoke() - invoke a function on the current subject', () => {
-    // our div is hidden in our script.js
-    // $('.connectors-div').hide()
-
-    // https://on.cypress.io/invoke
-    cy.get('.connectors-div').should('be.hidden')
-      // call the jquery method 'show' on the 'div.container'
-      .invoke('show')
-      .should('be.visible')
-  })
-
-  it('.spread() - spread an array as individual args to callback function', () => {
-    // https://on.cypress.io/spread
-    const arr = ['foo', 'bar', 'baz']
-
-    cy.wrap(arr).spread((foo, bar, baz) => {
-      expect(foo).to.eq('foo')
-      expect(bar).to.eq('bar')
-      expect(baz).to.eq('baz')
-    })
-  })
-
-  describe('.then()', () => {
-    it('invokes a callback function with the current subject', () => {
-      // https://on.cypress.io/then
-      cy.get('.connectors-list > li')
-        .then(($lis) => {
-          expect($lis, '3 items').to.have.length(3)
-          expect($lis.eq(0), 'first item').to.contain('Walk the dog')
-          expect($lis.eq(1), 'second item').to.contain('Feed the cat')
-          expect($lis.eq(2), 'third item').to.contain('Write JavaScript')
-        })
-    })
-
-    it('yields the returned value to the next command', () => {
-      cy.wrap(1)
-        .then((num) => {
-          expect(num).to.equal(1)
-
-          return 2
-        })
-        .then((num) => {
-          expect(num).to.equal(2)
-        })
-    })
-
-    it('yields the original subject without return', () => {
-      cy.wrap(1)
-        .then((num) => {
-          expect(num).to.equal(1)
-          // note that nothing is returned from this callback
-        })
-        .then((num) => {
-          // this callback receives the original unchanged value 1
-          expect(num).to.equal(1)
-        })
-    })
-
-    it('yields the value yielded by the last Cypress command inside', () => {
-      cy.wrap(1)
-        .then((num) => {
-          expect(num).to.equal(1)
-          // note how we run a Cypress command
-          // the result yielded by this Cypress command
-          // will be passed to the second ".then"
-          cy.wrap(2)
-        })
-        .then((num) => {
-          // this callback receives the value yielded by "cy.wrap(2)"
-          expect(num).to.equal(2)
-        })
-    })
-  })
-})
diff --git a/cypress/integration/examples/cookies.spec.js b/cypress/integration/examples/cookies.spec.js
deleted file mode 100644
index bb540e95eb0a..000000000000
--- a/cypress/integration/examples/cookies.spec.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/// <reference types="Cypress" />
-
-context('Cookies', () => {
-  beforeEach(() => {
-    Cypress.Cookies.debug(true)
-
-    cy.visit('https://example.cypress.io/commands/cookies')
-
-    // clear cookies again after visiting to remove
-    // any 3rd party cookies picked up such as cloudflare
-    cy.clearCookies()
-  })
-
-  it('cy.getCookie() - get a browser cookie', () => {
-    // https://on.cypress.io/getcookie
-    cy.get('#getCookie .set-a-cookie').click()
-
-    // cy.getCookie() yields a cookie object
-    cy.getCookie('token').should('have.property', 'value', '123ABC')
-  })
-
-  it('cy.getCookies() - get browser cookies', () => {
-    // https://on.cypress.io/getcookies
-    cy.getCookies().should('be.empty')
-
-    cy.get('#getCookies .set-a-cookie').click()
-
-    // cy.getCookies() yields an array of cookies
-    cy.getCookies().should('have.length', 1).should((cookies) => {
-
-      // each cookie has these properties
-      expect(cookies[0]).to.have.property('name', 'token')
-      expect(cookies[0]).to.have.property('value', '123ABC')
-      expect(cookies[0]).to.have.property('httpOnly', false)
-      expect(cookies[0]).to.have.property('secure', false)
-      expect(cookies[0]).to.have.property('domain')
-      expect(cookies[0]).to.have.property('path')
-    })
-  })
-
-  it('cy.setCookie() - set a browser cookie', () => {
-    // https://on.cypress.io/setcookie
-    cy.getCookies().should('be.empty')
-
-    cy.setCookie('foo', 'bar')
-
-    // cy.getCookie() yields a cookie object
-    cy.getCookie('foo').should('have.property', 'value', 'bar')
-  })
-
-  it('cy.clearCookie() - clear a browser cookie', () => {
-    // https://on.cypress.io/clearcookie
-    cy.getCookie('token').should('be.null')
-
-    cy.get('#clearCookie .set-a-cookie').click()
-
-    cy.getCookie('token').should('have.property', 'value', '123ABC')
-
-    // cy.clearCookies() yields null
-    cy.clearCookie('token').should('be.null')
-
-    cy.getCookie('token').should('be.null')
-  })
-
-  it('cy.clearCookies() - clear browser cookies', () => {
-    // https://on.cypress.io/clearcookies
-    cy.getCookies().should('be.empty')
-
-    cy.get('#clearCookies .set-a-cookie').click()
-
-    cy.getCookies().should('have.length', 1)
-
-    // cy.clearCookies() yields null
-    cy.clearCookies()
-
-    cy.getCookies().should('be.empty')
-  })
-})
diff --git a/cypress/integration/examples/cypress_api.spec.js b/cypress/integration/examples/cypress_api.spec.js
deleted file mode 100644
index 0e46520cd161..000000000000
--- a/cypress/integration/examples/cypress_api.spec.js
+++ /dev/null
@@ -1,222 +0,0 @@
-/// <reference types="Cypress" />
-
-context('Cypress.Commands', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/cypress-api')
-  })
-
-  // https://on.cypress.io/custom-commands
-
-  it('.add() - create a custom command', () => {
-    Cypress.Commands.add('console', {
-      prevSubject: true,
-    }, (subject, method) => {
-      // the previous subject is automatically received
-      // and the commands arguments are shifted
-
-      // allow us to change the console method used
-      method = method || 'log'
-
-      // log the subject to the console
-      // @ts-ignore TS7017
-      console[method]('The subject is', subject)
-
-      // whatever we return becomes the new subject
-      // we don't want to change the subject so
-      // we return whatever was passed in
-      return subject
-    })
-
-    // @ts-ignore TS2339
-    cy.get('button').console('info').then(($button) => {
-      // subject is still $button
-    })
-  })
-})
-
-
-context('Cypress.Cookies', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/cypress-api')
-  })
-
-  // https://on.cypress.io/cookies
-  it('.debug() - enable or disable debugging', () => {
-    Cypress.Cookies.debug(true)
-
-    // Cypress will now log in the console when
-    // cookies are set or cleared
-    cy.setCookie('fakeCookie', '123ABC')
-    cy.clearCookie('fakeCookie')
-    cy.setCookie('fakeCookie', '123ABC')
-    cy.clearCookie('fakeCookie')
-    cy.setCookie('fakeCookie', '123ABC')
-  })
-
-  it('.preserveOnce() - preserve cookies by key', () => {
-    // normally cookies are reset after each test
-    cy.getCookie('fakeCookie').should('not.be.ok')
-
-    // preserving a cookie will not clear it when
-    // the next test starts
-    cy.setCookie('lastCookie', '789XYZ')
-    Cypress.Cookies.preserveOnce('lastCookie')
-  })
-
-  it('.defaults() - set defaults for all cookies', () => {
-    // now any cookie with the name 'session_id' will
-    // not be cleared before each new test runs
-    Cypress.Cookies.defaults({
-      whitelist: 'session_id',
-    })
-  })
-})
-
-
-context('Cypress.Server', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/cypress-api')
-  })
-
-  // Permanently override server options for
-  // all instances of cy.server()
-
-  // https://on.cypress.io/cypress-server
-  it('.defaults() - change default config of server', () => {
-    Cypress.Server.defaults({
-      delay: 0,
-      force404: false,
-    })
-  })
-})
-
-context('Cypress.arch', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/cypress-api')
-  })
-
-  it('Get CPU architecture name of underlying OS', () => {
-    // https://on.cypress.io/arch
-    expect(Cypress.arch).to.exist
-  })
-})
-
-context('Cypress.config()', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/cypress-api')
-  })
-
-  it('Get and set configuration options', () => {
-    // https://on.cypress.io/config
-    let myConfig = Cypress.config()
-
-    expect(myConfig).to.have.property('animationDistanceThreshold', 5)
-    expect(myConfig).to.have.property('baseUrl', null)
-    expect(myConfig).to.have.property('defaultCommandTimeout', 4000)
-    expect(myConfig).to.have.property('requestTimeout', 5000)
-    expect(myConfig).to.have.property('responseTimeout', 30000)
-    expect(myConfig).to.have.property('viewportHeight', 660)
-    expect(myConfig).to.have.property('viewportWidth', 1000)
-    expect(myConfig).to.have.property('pageLoadTimeout', 60000)
-    expect(myConfig).to.have.property('waitForAnimations', true)
-
-    expect(Cypress.config('pageLoadTimeout')).to.eq(60000)
-
-    // this will change the config for the rest of your tests!
-    Cypress.config('pageLoadTimeout', 20000)
-
-    expect(Cypress.config('pageLoadTimeout')).to.eq(20000)
-
-    Cypress.config('pageLoadTimeout', 60000)
-  })
-})
-
-context('Cypress.dom', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/cypress-api')
-  })
-
-  // https://on.cypress.io/dom
-  it('.isHidden() - determine if a DOM element is hidden', () => {
-    let hiddenP = Cypress.$('.dom-p p.hidden').get(0)
-    let visibleP = Cypress.$('.dom-p p.visible').get(0)
-
-    // our first paragraph has css class 'hidden'
-    expect(Cypress.dom.isHidden(hiddenP)).to.be.true
-    expect(Cypress.dom.isHidden(visibleP)).to.be.false
-  })
-})
-
-context('Cypress.env()', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/cypress-api')
-  })
-
-  // We can set environment variables for highly dynamic values
-
-  // https://on.cypress.io/environment-variables
-  it('Get environment variables', () => {
-    // https://on.cypress.io/env
-    // set multiple environment variables
-    Cypress.env({
-      host: 'veronica.dev.local',
-      api_server: 'http://localhost:8888/v1/',
-    })
-
-    // get environment variable
-    expect(Cypress.env('host')).to.eq('veronica.dev.local')
-
-    // set environment variable
-    Cypress.env('api_server', 'http://localhost:8888/v2/')
-    expect(Cypress.env('api_server')).to.eq('http://localhost:8888/v2/')
-
-    // get all environment variable
-    expect(Cypress.env()).to.have.property('host', 'veronica.dev.local')
-    expect(Cypress.env()).to.have.property('api_server', 'http://localhost:8888/v2/')
-  })
-})
-
-context('Cypress.log', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/cypress-api')
-  })
-
-  it('Control what is printed to the Command Log', () => {
-    // https://on.cypress.io/cypress-log
-  })
-})
-
-
-context('Cypress.platform', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/cypress-api')
-  })
-
-  it('Get underlying OS name', () => {
-    // https://on.cypress.io/platform
-    expect(Cypress.platform).to.be.exist
-  })
-})
-
-context('Cypress.version', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/cypress-api')
-  })
-
-  it('Get current version of Cypress being run', () => {
-    // https://on.cypress.io/version
-    expect(Cypress.version).to.be.exist
-  })
-})
-
-context('Cypress.spec', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/cypress-api')
-  })
-
-  it('Get current spec information', () => {
-    // https://on.cypress.io/spec
-    // wrap the object so we can inspect it easily by clicking in the command log
-    cy.wrap(Cypress.spec).should('have.keys', ['name', 'relative', 'absolute'])
-  })
-})
diff --git a/cypress/integration/examples/files.spec.js b/cypress/integration/examples/files.spec.js
deleted file mode 100644
index 6f41c637c8f8..000000000000
--- a/cypress/integration/examples/files.spec.js
+++ /dev/null
@@ -1,114 +0,0 @@
-/// <reference types="Cypress" />
-
-/// JSON fixture file can be loaded directly using
-// the built-in JavaScript bundler
-// @ts-ignore
-const requiredExample = require('../../fixtures/example')
-
-context('Files', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/commands/files')
-  })
-
-  beforeEach(() => {
-    // load example.json fixture file and store
-    // in the test context object
-    cy.fixture('example.json').as('example')
-  })
-
-  it('cy.fixture() - load a fixture', () => {
-    // https://on.cypress.io/fixture
-
-    // Instead of writing a response inline you can
-    // use a fixture file's content.
-
-    cy.server()
-    cy.fixture('example.json').as('comment')
-    // when application makes an Ajax request matching "GET comments/*"
-    // Cypress will intercept it and reply with object
-    // from the "comment" alias
-    cy.route('GET', 'comments/*', '@comment').as('getComment')
-
-    // we have code that gets a comment when
-    // the button is clicked in scripts.js
-    cy.get('.fixture-btn').click()
-
-    cy.wait('@getComment').its('responseBody')
-      .should('have.property', 'name')
-      .and('include', 'Using fixtures to represent data')
-
-    // you can also just write the fixture in the route
-    cy.route('GET', 'comments/*', 'fixture:example.json').as('getComment')
-
-    // we have code that gets a comment when
-    // the button is clicked in scripts.js
-    cy.get('.fixture-btn').click()
-
-    cy.wait('@getComment').its('responseBody')
-      .should('have.property', 'name')
-      .and('include', 'Using fixtures to represent data')
-
-    // or write fx to represent fixture
-    // by default it assumes it's .json
-    cy.route('GET', 'comments/*', 'fx:example').as('getComment')
-
-    // we have code that gets a comment when
-    // the button is clicked in scripts.js
-    cy.get('.fixture-btn').click()
-
-    cy.wait('@getComment').its('responseBody')
-      .should('have.property', 'name')
-      .and('include', 'Using fixtures to represent data')
-  })
-
-  it('cy.fixture() or require - load a fixture', function () {
-    // we are inside the "function () { ... }"
-    // callback and can use test context object "this"
-    // "this.example" was loaded in "beforeEach" function callback
-    expect(this.example, 'fixture in the test context')
-      .to.deep.equal(requiredExample)
-
-    // or use "cy.wrap" and "should('deep.equal', ...)" assertion
-    // @ts-ignore
-    cy.wrap(this.example, 'fixture vs require')
-      .should('deep.equal', requiredExample)
-  })
-
-  it('cy.readFile() - read file contents', () => {
-    // https://on.cypress.io/readfile
-
-    // You can read a file and yield its contents
-    // The filePath is relative to your project's root.
-    cy.readFile('cypress.json').then((json) => {
-      expect(json).to.be.an('object')
-    })
-  })
-
-  it('cy.writeFile() - write to a file', () => {
-    // https://on.cypress.io/writefile
-
-    // You can write to a file
-
-    // Use a response from a request to automatically
-    // generate a fixture file for use later
-    cy.request('https://jsonplaceholder.cypress.io/users')
-      .then((response) => {
-        cy.writeFile('cypress/fixtures/users.json', response.body)
-      })
-    cy.fixture('users').should((users) => {
-      expect(users[0].name).to.exist
-    })
-
-    // JavaScript arrays and objects are stringified
-    // and formatted into text.
-    cy.writeFile('cypress/fixtures/profile.json', {
-      id: 8739,
-      name: 'Jane',
-      email: 'jane@example.com',
-    })
-
-    cy.fixture('profile').should((profile) => {
-      expect(profile.name).to.eq('Jane')
-    })
-  })
-})
diff --git a/cypress/integration/examples/local_storage.spec.js b/cypress/integration/examples/local_storage.spec.js
deleted file mode 100644
index 076b096fc373..000000000000
--- a/cypress/integration/examples/local_storage.spec.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/// <reference types="Cypress" />
-
-context('Local Storage', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/commands/local-storage')
-  })
-  // Although local storage is automatically cleared
-  // in between tests to maintain a clean state
-  // sometimes we need to clear the local storage manually
-
-  it('cy.clearLocalStorage() - clear all data in local storage', () => {
-    // https://on.cypress.io/clearlocalstorage
-    cy.get('.ls-btn').click().should(() => {
-      expect(localStorage.getItem('prop1')).to.eq('red')
-      expect(localStorage.getItem('prop2')).to.eq('blue')
-      expect(localStorage.getItem('prop3')).to.eq('magenta')
-    })
-
-    // clearLocalStorage() yields the localStorage object
-    cy.clearLocalStorage().should((ls) => {
-      expect(ls.getItem('prop1')).to.be.null
-      expect(ls.getItem('prop2')).to.be.null
-      expect(ls.getItem('prop3')).to.be.null
-    })
-
-    // Clear key matching string in Local Storage
-    cy.get('.ls-btn').click().should(() => {
-      expect(localStorage.getItem('prop1')).to.eq('red')
-      expect(localStorage.getItem('prop2')).to.eq('blue')
-      expect(localStorage.getItem('prop3')).to.eq('magenta')
-    })
-
-    cy.clearLocalStorage('prop1').should((ls) => {
-      expect(ls.getItem('prop1')).to.be.null
-      expect(ls.getItem('prop2')).to.eq('blue')
-      expect(ls.getItem('prop3')).to.eq('magenta')
-    })
-
-    // Clear keys matching regex in Local Storage
-    cy.get('.ls-btn').click().should(() => {
-      expect(localStorage.getItem('prop1')).to.eq('red')
-      expect(localStorage.getItem('prop2')).to.eq('blue')
-      expect(localStorage.getItem('prop3')).to.eq('magenta')
-    })
-
-    cy.clearLocalStorage(/prop1|2/).should((ls) => {
-      expect(ls.getItem('prop1')).to.be.null
-      expect(ls.getItem('prop2')).to.be.null
-      expect(ls.getItem('prop3')).to.eq('magenta')
-    })
-  })
-})
diff --git a/cypress/integration/examples/location.spec.js b/cypress/integration/examples/location.spec.js
deleted file mode 100644
index 68e755c101ca..000000000000
--- a/cypress/integration/examples/location.spec.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/// <reference types="Cypress" />
-
-context('Location', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/commands/location')
-  })
-
-  it('cy.hash() - get the current URL hash', () => {
-    // https://on.cypress.io/hash
-    cy.hash().should('be.empty')
-  })
-
-  it('cy.location() - get window.location', () => {
-    // https://on.cypress.io/location
-    cy.location().should((location) => {
-      expect(location.hash).to.be.empty
-      expect(location.href).to.eq('https://example.cypress.io/commands/location')
-      expect(location.host).to.eq('example.cypress.io')
-      expect(location.hostname).to.eq('example.cypress.io')
-      expect(location.origin).to.eq('https://example.cypress.io')
-      expect(location.pathname).to.eq('/commands/location')
-      expect(location.port).to.eq('')
-      expect(location.protocol).to.eq('https:')
-      expect(location.search).to.be.empty
-    })
-  })
-
-  it('cy.url() - get the current URL', () => {
-    // https://on.cypress.io/url
-    cy.url().should('eq', 'https://example.cypress.io/commands/location')
-  })
-})
diff --git a/cypress/integration/examples/misc.spec.js b/cypress/integration/examples/misc.spec.js
deleted file mode 100644
index 97edd8be0a47..000000000000
--- a/cypress/integration/examples/misc.spec.js
+++ /dev/null
@@ -1,83 +0,0 @@
-/// <reference types="Cypress" />
-
-context('Misc', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/commands/misc')
-  })
-
-  it('.end() - end the command chain', () => {
-    // https://on.cypress.io/end
-
-    // cy.end is useful when you want to end a chain of commands
-    // and force Cypress to re-query from the root element
-    cy.get('.misc-table').within(() => {
-      // ends the current chain and yields null
-      cy.contains('Cheryl').click().end()
-
-      // queries the entire table again
-      cy.contains('Charles').click()
-    })
-  })
-
-  it('cy.exec() - execute a system command', () => {
-    // https://on.cypress.io/exec
-
-    // execute a system command.
-    // so you can take actions necessary for
-    // your test outside the scope of Cypress.
-    cy.exec('echo Jane Lane')
-      .its('stdout').should('contain', 'Jane Lane')
-
-    // we can use Cypress.platform string to
-    // select appropriate command
-    // https://on.cypress/io/platform
-    cy.log(`Platform ${Cypress.platform} architecture ${Cypress.arch}`)
-
-    if (Cypress.platform === 'win32') {
-      cy.exec('print cypress.json')
-        .its('stderr').should('be.empty')
-    } else {
-      cy.exec('cat cypress.json')
-        .its('stderr').should('be.empty')
-
-      cy.exec('pwd')
-        .its('code').should('eq', 0)
-    }
-  })
-
-  it('cy.focused() - get the DOM element that has focus', () => {
-    // https://on.cypress.io/focused
-    cy.get('.misc-form').find('#name').click()
-    cy.focused().should('have.id', 'name')
-
-    cy.get('.misc-form').find('#description').click()
-    cy.focused().should('have.id', 'description')
-  })
-
-  context('Cypress.Screenshot', function () {
-    it('cy.screenshot() - take a screenshot', () => {
-      // https://on.cypress.io/screenshot
-      cy.screenshot('my-image')
-    })
-
-    it('Cypress.Screenshot.defaults() - change default config of screenshots', function () {
-      Cypress.Screenshot.defaults({
-        blackout: ['.foo'],
-        capture: 'viewport',
-        clip: { x: 0, y: 0, width: 200, height: 200 },
-        scale: false,
-        disableTimersAndAnimations: true,
-        screenshotOnRunFailure: true,
-        beforeScreenshot () { },
-        afterScreenshot () { },
-      })
-    })
-  })
-
-  it('cy.wrap() - wrap an object', () => {
-    // https://on.cypress.io/wrap
-    cy.wrap({ foo: 'bar' })
-      .should('have.property', 'foo')
-      .and('include', 'bar')
-  })
-})
diff --git a/cypress/integration/examples/navigation.spec.js b/cypress/integration/examples/navigation.spec.js
deleted file mode 100644
index bbd9d479c811..000000000000
--- a/cypress/integration/examples/navigation.spec.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/// <reference types="Cypress" />
-
-context('Navigation', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io')
-    cy.get('.navbar-nav').contains('Commands').click()
-    cy.get('.dropdown-menu').contains('Navigation').click()
-  })
-
-  it('cy.go() - go back or forward in the browser\'s history', () => {
-    // https://on.cypress.io/go
-
-    cy.location('pathname').should('include', 'navigation')
-
-    cy.go('back')
-    cy.location('pathname').should('not.include', 'navigation')
-
-    cy.go('forward')
-    cy.location('pathname').should('include', 'navigation')
-
-    // clicking back
-    cy.go(-1)
-    cy.location('pathname').should('not.include', 'navigation')
-
-    // clicking forward
-    cy.go(1)
-    cy.location('pathname').should('include', 'navigation')
-  })
-
-  it('cy.reload() - reload the page', () => {
-    // https://on.cypress.io/reload
-    cy.reload()
-
-    // reload the page without using the cache
-    cy.reload(true)
-  })
-
-  it('cy.visit() - visit a remote url', () => {
-    // https://on.cypress.io/visit
-
-    // Visit any sub-domain of your current domain
-
-    // Pass options to the visit
-    cy.visit('https://example.cypress.io/commands/navigation', {
-      timeout: 50000, // increase total time for the visit to resolve
-      onBeforeLoad (contentWindow) {
-        // contentWindow is the remote page's window object
-        expect(typeof contentWindow === 'object').to.be.true
-      },
-      onLoad (contentWindow) {
-        // contentWindow is the remote page's window object
-        expect(typeof contentWindow === 'object').to.be.true
-      },
-    })
-    })
-})
diff --git a/cypress/integration/examples/network_requests.spec.js b/cypress/integration/examples/network_requests.spec.js
deleted file mode 100644
index ca4b404b72a7..000000000000
--- a/cypress/integration/examples/network_requests.spec.js
+++ /dev/null
@@ -1,195 +0,0 @@
-/// <reference types="Cypress" />
-
-context('Network Requests', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/commands/network-requests')
-  })
-
-  // Manage AJAX / XHR requests in your app
-
-  it('cy.server() - control behavior of network requests and responses', () => {
-    // https://on.cypress.io/server
-
-    cy.server().should((server) => {
-      // the default options on server
-      // you can override any of these options
-      expect(server.delay).to.eq(0)
-      expect(server.method).to.eq('GET')
-      expect(server.status).to.eq(200)
-      expect(server.headers).to.be.null
-      expect(server.response).to.be.null
-      expect(server.onRequest).to.be.undefined
-      expect(server.onResponse).to.be.undefined
-      expect(server.onAbort).to.be.undefined
-
-      // These options control the server behavior
-      // affecting all requests
-
-      // pass false to disable existing route stubs
-      expect(server.enable).to.be.true
-      // forces requests that don't match your routes to 404
-      expect(server.force404).to.be.false
-      // whitelists requests from ever being logged or stubbed
-      expect(server.whitelist).to.be.a('function')
-    })
-
-    cy.server({
-      method: 'POST',
-      delay: 1000,
-      status: 422,
-      response: {},
-    })
-
-    // any route commands will now inherit the above options
-    // from the server. anything we pass specifically
-    // to route will override the defaults though.
-  })
-
-  it('cy.request() - make an XHR request', () => {
-    // https://on.cypress.io/request
-    cy.request('https://jsonplaceholder.cypress.io/comments')
-      .should((response) => {
-        expect(response.status).to.eq(200)
-        expect(response.body).to.have.length(500)
-        expect(response).to.have.property('headers')
-        expect(response).to.have.property('duration')
-      })
-  })
-
-
-  it('cy.request() - verify response using BDD syntax', () => {
-    cy.request('https://jsonplaceholder.cypress.io/comments')
-    .then((response) => {
-      // https://on.cypress.io/assertions
-      expect(response).property('status').to.equal(200)
-      expect(response).property('body').to.have.length(500)
-      expect(response).to.include.keys('headers', 'duration')
-    })
-  })
-
-  it('cy.request() with query parameters', () => {
-    // will execute request
-    // https://jsonplaceholder.cypress.io/comments?postId=1&id=3
-    cy.request({
-      url: 'https://jsonplaceholder.cypress.io/comments',
-      qs: {
-        postId: 1,
-        id: 3,
-      },
-    })
-    .its('body')
-    .should('be.an', 'array')
-    .and('have.length', 1)
-    .its('0') // yields first element of the array
-    .should('contain', {
-      postId: 1,
-      id: 3,
-    })
-  })
-
-  it('cy.request() - pass result to the second request', () => {
-    // first, let's find out the userId of the first user we have
-    cy.request('https://jsonplaceholder.cypress.io/users?_limit=1')
-      .its('body') // yields the response object
-      .its('0') // yields the first element of the returned list
-      // the above two commands its('body').its('0')
-      // can be written as its('body.0')
-      // if you do not care about TypeScript checks
-      .then((user) => {
-        expect(user).property('id').to.be.a('number')
-        // make a new post on behalf of the user
-        cy.request('POST', 'https://jsonplaceholder.cypress.io/posts', {
-          userId: user.id,
-          title: 'Cypress Test Runner',
-          body: 'Fast, easy and reliable testing for anything that runs in a browser.',
-        })
-      })
-      // note that the value here is the returned value of the 2nd request
-      // which is the new post object
-      .then((response) => {
-        expect(response).property('status').to.equal(201) // new entity created
-        expect(response).property('body').to.contain({
-          id: 101, // there are already 100 posts, so new entity gets id 101
-          title: 'Cypress Test Runner',
-        })
-        // we don't know the user id here - since it was in above closure
-        // so in this test just confirm that the property is there
-        expect(response.body).property('userId').to.be.a('number')
-      })
-  })
-
-  it('cy.request() - save response in the shared test context', () => {
-    // https://on.cypress.io/variables-and-aliases
-    cy.request('https://jsonplaceholder.cypress.io/users?_limit=1')
-      .its('body').its('0') // yields the first element of the returned list
-      .as('user') // saves the object in the test context
-      .then(function () {
-        // NOTE 👀
-        //  By the time this callback runs the "as('user')" command
-        //  has saved the user object in the test context.
-        //  To access the test context we need to use
-        //  the "function () { ... }" callback form,
-        //  otherwise "this" points at a wrong or undefined object!
-        cy.request('POST', 'https://jsonplaceholder.cypress.io/posts', {
-          userId: this.user.id,
-          title: 'Cypress Test Runner',
-          body: 'Fast, easy and reliable testing for anything that runs in a browser.',
-        })
-        .its('body').as('post') // save the new post from the response
-      })
-      .then(function () {
-        // When this callback runs, both "cy.request" API commands have finished
-        // and the test context has "user" and "post" objects set.
-        // Let's verify them.
-        expect(this.post, 'post has the right user id').property('userId').to.equal(this.user.id)
-      })
-  })
-
-  it('cy.route() - route responses to matching requests', () => {
-    // https://on.cypress.io/route
-
-    let message = 'whoa, this comment does not exist'
-
-    cy.server()
-
-    // Listen to GET to comments/1
-    cy.route('GET', 'comments/*').as('getComment')
-
-    // we have code that gets a comment when
-    // the button is clicked in scripts.js
-    cy.get('.network-btn').click()
-
-    // https://on.cypress.io/wait
-    cy.wait('@getComment').its('status').should('eq', 200)
-
-    // Listen to POST to comments
-    cy.route('POST', '/comments').as('postComment')
-
-    // we have code that posts a comment when
-    // the button is clicked in scripts.js
-    cy.get('.network-post').click()
-    cy.wait('@postComment').should((xhr) => {
-      expect(xhr.requestBody).to.include('email')
-      expect(xhr.requestHeaders).to.have.property('Content-Type')
-      expect(xhr.responseBody).to.have.property('name', 'Using POST in cy.route()')
-    })
-
-    // Stub a response to PUT comments/ ****
-    cy.route({
-      method: 'PUT',
-      url: 'comments/*',
-      status: 404,
-      response: { error: message },
-      delay: 500,
-    }).as('putComment')
-
-    // we have code that puts a comment when
-    // the button is clicked in scripts.js
-    cy.get('.network-put').click()
-
-    cy.wait('@putComment')
-
-    // our 404 statusCode logic in scripts.js executed
-    cy.get('.network-put-comment').should('contain', message)
-  })
-})
diff --git a/cypress/integration/examples/querying.spec.js b/cypress/integration/examples/querying.spec.js
deleted file mode 100644
index e3f7c9b67f16..000000000000
--- a/cypress/integration/examples/querying.spec.js
+++ /dev/null
@@ -1,114 +0,0 @@
-/// <reference types="Cypress" />
-
-context('Querying', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/commands/querying')
-  })
-
-  // The most commonly used query is 'cy.get()', you can
-  // think of this like the '$' in jQuery
-
-  it('cy.get() - query DOM elements', () => {
-    // https://on.cypress.io/get
-
-    cy.get('#query-btn').should('contain', 'Button')
-
-    cy.get('.query-btn').should('contain', 'Button')
-
-    cy.get('#querying .well>button:first').should('contain', 'Button')
-    //              ↲
-    // Use CSS selectors just like jQuery
-
-    cy.get('[data-test-id="test-example"]').should('have.class', 'example')
-
-    // 'cy.get()' yields jQuery object, you can get its attribute
-    // by invoking `.attr()` method
-    cy.get('[data-test-id="test-example"]')
-      .invoke('attr', 'data-test-id')
-      .should('equal', 'test-example')
-
-    // or you can get element's CSS property
-    cy.get('[data-test-id="test-example"]')
-      .invoke('css', 'position')
-      .should('equal', 'static')
-
-    // or use assertions directly during 'cy.get()'
-    // https://on.cypress.io/assertions
-    cy.get('[data-test-id="test-example"]')
-      .should('have.attr', 'data-test-id', 'test-example')
-      .and('have.css', 'position', 'static')
-  })
-
-  it('cy.contains() - query DOM elements with matching content', () => {
-    // https://on.cypress.io/contains
-    cy.get('.query-list')
-      .contains('bananas')
-      .should('have.class', 'third')
-
-    // we can pass a regexp to `.contains()`
-    cy.get('.query-list')
-      .contains(/^b\w+/)
-      .should('have.class', 'third')
-
-    cy.get('.query-list')
-      .contains('apples')
-      .should('have.class', 'first')
-
-    // passing a selector to contains will
-    // yield the selector containing the text
-    cy.get('#querying')
-      .contains('ul', 'oranges')
-      .should('have.class', 'query-list')
-
-    cy.get('.query-button')
-      .contains('Save Form')
-      .should('have.class', 'btn')
-  })
-
-  it('.within() - query DOM elements within a specific element', () => {
-    // https://on.cypress.io/within
-    cy.get('.query-form').within(() => {
-      cy.get('input:first').should('have.attr', 'placeholder', 'Email')
-      cy.get('input:last').should('have.attr', 'placeholder', 'Password')
-    })
-  })
-
-  it('cy.root() - query the root DOM element', () => {
-    // https://on.cypress.io/root
-
-    // By default, root is the document
-    cy.root().should('match', 'html')
-
-    cy.get('.query-ul').within(() => {
-      // In this within, the root is now the ul DOM element
-      cy.root().should('have.class', 'query-ul')
-    })
-  })
-
-  it('best practices - selecting elements', () => {
-    // https://on.cypress.io/best-practices#Selecting-Elements
-    cy.get('[data-cy=best-practices-selecting-elements]').within(() => {
-      // Worst - too generic, no context
-      cy.get('button').click()
-
-      // Bad. Coupled to styling. Highly subject to change.
-      cy.get('.btn.btn-large').click()
-
-      // Average. Coupled to the `name` attribute which has HTML semantics.
-      cy.get('[name=submission]').click()
-
-      // Better. But still coupled to styling or JS event listeners.
-      cy.get('#main').click()
-
-      // Slightly better. Uses an ID but also ensures the element
-      // has an ARIA role attribute
-      cy.get('#main[role=button]').click()
-
-      // Much better. But still coupled to text content that may change.
-      cy.contains('Submit').click()
-
-      // Best. Insulated from all changes.
-      cy.get('[data-cy=submit]').click()
-    })
-  })
-})
diff --git a/cypress/integration/examples/spies_stubs_clocks.spec.js b/cypress/integration/examples/spies_stubs_clocks.spec.js
deleted file mode 100644
index ee677e6a2042..000000000000
--- a/cypress/integration/examples/spies_stubs_clocks.spec.js
+++ /dev/null
@@ -1,95 +0,0 @@
-/// <reference types="Cypress" />
-
-context('Spies, Stubs, and Clock', () => {
-  it('cy.spy() - wrap a method in a spy', () => {
-    // https://on.cypress.io/spy
-    cy.visit('https://example.cypress.io/commands/spies-stubs-clocks')
-
-    const obj = {
-      foo () {},
-    }
-
-    const spy = cy.spy(obj, 'foo').as('anyArgs')
-
-    obj.foo()
-
-    expect(spy).to.be.called
-  })
-
-  it('cy.spy() retries until assertions pass', () => {
-    cy.visit('https://example.cypress.io/commands/spies-stubs-clocks')
-
-    const obj = {
-      /**
-       * Prints the argument passed
-       * @param x {any}
-      */
-      foo (x) {
-        console.log('obj.foo called with', x)
-      },
-    }
-
-    cy.spy(obj, 'foo').as('foo')
-
-    setTimeout(() => {
-      obj.foo('first')
-    }, 500)
-
-    setTimeout(() => {
-      obj.foo('second')
-    }, 2500)
-
-    cy.get('@foo').should('have.been.calledTwice')
-  })
-
-  it('cy.stub() - create a stub and/or replace a function with stub', () => {
-    // https://on.cypress.io/stub
-    cy.visit('https://example.cypress.io/commands/spies-stubs-clocks')
-
-    const obj = {
-      /**
-       * prints both arguments to the console
-       * @param a {string}
-       * @param b {string}
-      */
-      foo (a, b) {
-        console.log('a', a, 'b', b)
-      },
-    }
-
-    const stub = cy.stub(obj, 'foo').as('foo')
-
-    obj.foo('foo', 'bar')
-
-    expect(stub).to.be.called
-  })
-
-  it('cy.clock() - control time in the browser', () => {
-    // https://on.cypress.io/clock
-
-    // create the date in UTC so its always the same
-    // no matter what local timezone the browser is running in
-    const now = new Date(Date.UTC(2017, 2, 14)).getTime()
-
-    cy.clock(now)
-    cy.visit('https://example.cypress.io/commands/spies-stubs-clocks')
-    cy.get('#clock-div').click()
-      .should('have.text', '1489449600')
-  })
-
-  it('cy.tick() - move time in the browser', () => {
-    // https://on.cypress.io/tick
-
-    // create the date in UTC so its always the same
-    // no matter what local timezone the browser is running in
-    const now = new Date(Date.UTC(2017, 2, 14)).getTime()
-
-    cy.clock(now)
-    cy.visit('https://example.cypress.io/commands/spies-stubs-clocks')
-    cy.get('#tick-div').click()
-      .should('have.text', '1489449600')
-    cy.tick(10000) // 10 seconds passed
-    cy.get('#tick-div').click()
-      .should('have.text', '1489449610')
-  })
-})
diff --git a/cypress/integration/examples/traversal.spec.js b/cypress/integration/examples/traversal.spec.js
deleted file mode 100644
index 1082eca6cc13..000000000000
--- a/cypress/integration/examples/traversal.spec.js
+++ /dev/null
@@ -1,121 +0,0 @@
-/// <reference types="Cypress" />
-
-context('Traversal', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/commands/traversal')
-  })
-
-  it('.children() - get child DOM elements', () => {
-    // https://on.cypress.io/children
-    cy.get('.traversal-breadcrumb')
-      .children('.active')
-      .should('contain', 'Data')
-  })
-
-  it('.closest() - get closest ancestor DOM element', () => {
-    // https://on.cypress.io/closest
-    cy.get('.traversal-badge')
-      .closest('ul')
-      .should('have.class', 'list-group')
-  })
-
-  it('.eq() - get a DOM element at a specific index', () => {
-    // https://on.cypress.io/eq
-    cy.get('.traversal-list>li')
-      .eq(1).should('contain', 'siamese')
-  })
-
-  it('.filter() - get DOM elements that match the selector', () => {
-    // https://on.cypress.io/filter
-    cy.get('.traversal-nav>li')
-      .filter('.active').should('contain', 'About')
-  })
-
-  it('.find() - get descendant DOM elements of the selector', () => {
-    // https://on.cypress.io/find
-    cy.get('.traversal-pagination')
-      .find('li').find('a')
-      .should('have.length', 7)
-  })
-
-  it('.first() - get first DOM element', () => {
-    // https://on.cypress.io/first
-    cy.get('.traversal-table td')
-      .first().should('contain', '1')
-  })
-
-  it('.last() - get last DOM element', () => {
-    // https://on.cypress.io/last
-    cy.get('.traversal-buttons .btn')
-      .last().should('contain', 'Submit')
-  })
-
-  it('.next() - get next sibling DOM element', () => {
-    // https://on.cypress.io/next
-    cy.get('.traversal-ul')
-      .contains('apples').next().should('contain', 'oranges')
-  })
-
-  it('.nextAll() - get all next sibling DOM elements', () => {
-    // https://on.cypress.io/nextall
-    cy.get('.traversal-next-all')
-      .contains('oranges')
-      .nextAll().should('have.length', 3)
-  })
-
-  it('.nextUntil() - get next sibling DOM elements until next el', () => {
-    // https://on.cypress.io/nextuntil
-    cy.get('#veggies')
-      .nextUntil('#nuts').should('have.length', 3)
-  })
-
-  it('.not() - remove DOM elements from set of DOM elements', () => {
-    // https://on.cypress.io/not
-    cy.get('.traversal-disabled .btn')
-      .not('[disabled]').should('not.contain', 'Disabled')
-  })
-
-  it('.parent() - get parent DOM element from DOM elements', () => {
-    // https://on.cypress.io/parent
-    cy.get('.traversal-mark')
-      .parent().should('contain', 'Morbi leo risus')
-  })
-
-  it('.parents() - get parent DOM elements from DOM elements', () => {
-    // https://on.cypress.io/parents
-    cy.get('.traversal-cite')
-      .parents().should('match', 'blockquote')
-  })
-
-  it('.parentsUntil() - get parent DOM elements from DOM elements until el', () => {
-    // https://on.cypress.io/parentsuntil
-    cy.get('.clothes-nav')
-      .find('.active')
-      .parentsUntil('.clothes-nav')
-      .should('have.length', 2)
-  })
-
-  it('.prev() - get previous sibling DOM element', () => {
-    // https://on.cypress.io/prev
-    cy.get('.birds').find('.active')
-      .prev().should('contain', 'Lorikeets')
-  })
-
-  it('.prevAll() - get all previous sibling DOM elements', () => {
-    // https://on.cypress.io/prevAll
-    cy.get('.fruits-list').find('.third')
-      .prevAll().should('have.length', 2)
-  })
-
-  it('.prevUntil() - get all previous sibling DOM elements until el', () => {
-    // https://on.cypress.io/prevUntil
-    cy.get('.foods-list').find('#nuts')
-      .prevUntil('#veggies').should('have.length', 3)
-  })
-
-  it('.siblings() - get all sibling DOM elements', () => {
-    // https://on.cypress.io/siblings
-    cy.get('.traversal-pills .active')
-      .siblings().should('have.length', 2)
-  })
-})
diff --git a/cypress/integration/examples/utilities.spec.js b/cypress/integration/examples/utilities.spec.js
deleted file mode 100644
index 9a52cb414267..000000000000
--- a/cypress/integration/examples/utilities.spec.js
+++ /dev/null
@@ -1,133 +0,0 @@
-/// <reference types="Cypress" />
-
-context('Utilities', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/utilities')
-  })
-
-  it('Cypress._ - call a lodash method', () => {
-    // https://on.cypress.io/_
-    cy.request('https://jsonplaceholder.cypress.io/users')
-      .then((response) => {
-        let ids = Cypress._.chain(response.body).map('id').take(3).value()
-
-        expect(ids).to.deep.eq([1, 2, 3])
-      })
-  })
-
-  it('Cypress.$ - call a jQuery method', () => {
-    // https://on.cypress.io/$
-    let $li = Cypress.$('.utility-jquery li:first')
-
-    cy.wrap($li)
-      .should('not.have.class', 'active')
-      .click()
-      .should('have.class', 'active')
-  })
-
-  it('Cypress.Blob - blob utilities and base64 string conversion', () => {
-    // https://on.cypress.io/blob
-    cy.get('.utility-blob').then(($div) =>
-    // https://github.com/nolanlawson/blob-util#imgSrcToDataURL
-    // get the dataUrl string for the javascript-logo
-      Cypress.Blob.imgSrcToDataURL('https://example.cypress.io/assets/img/javascript-logo.png', undefined, 'anonymous')
-      .then((dataUrl) => {
-        // create an <img> element and set its src to the dataUrl
-        let img = Cypress.$('<img />', { src: dataUrl })
-
-        // need to explicitly return cy here since we are initially returning
-        // the Cypress.Blob.imgSrcToDataURL promise to our test
-        // append the image
-        $div.append(img)
-
-        cy.get('.utility-blob img').click()
-          .should('have.attr', 'src', dataUrl)
-      }))
-  })
-
-  it('Cypress.minimatch - test out glob patterns against strings', () => {
-    // https://on.cypress.io/minimatch
-    let matching = Cypress.minimatch('/users/1/comments', '/users/*/comments', {
-      matchBase: true,
-    })
-
-    expect(matching, 'matching wildcard').to.be.true
-
-    matching = Cypress.minimatch('/users/1/comments/2', '/users/*/comments', {
-      matchBase: true,
-    })
-    expect(matching, 'comments').to.be.false
-
-    // ** matches against all downstream path segments
-    matching = Cypress.minimatch('/foo/bar/baz/123/quux?a=b&c=2', '/foo/**', {
-      matchBase: true,
-    })
-    expect(matching, 'comments').to.be.true
-
-    // whereas * matches only the next path segment
-
-    matching = Cypress.minimatch('/foo/bar/baz/123/quux?a=b&c=2', '/foo/*', {
-      matchBase: false,
-    })
-    expect(matching, 'comments').to.be.false
-  })
-
-
-  it('Cypress.moment() - format or parse dates using a moment method', () => {
-    // https://on.cypress.io/moment
-    const time = Cypress.moment('2014-04-25T19:38:53.196Z').utc().format('h:mm A')
-
-    expect(time).to.be.a('string')
-
-    cy.get('.utility-moment').contains('3:38 PM')
-      .should('have.class', 'badge')
-
-    // the time in the element should be between 3pm and 5pm
-    const start = Cypress.moment('3:00 PM', 'LT')
-    const end = Cypress.moment('5:00 PM', 'LT')
-
-    cy.get('.utility-moment .badge')
-      .should(($el) => {
-        // parse American time like "3:38 PM"
-        const m = Cypress.moment($el.text().trim(), 'LT')
-
-        // display hours + minutes + AM|PM
-        const f = 'h:mm A'
-
-        expect(m.isBetween(start, end),
-          `${m.format(f)} should be between ${start.format(f)} and ${end.format(f)}`).to.be.true
-      })
-  })
-
-
-  it('Cypress.Promise - instantiate a bluebird promise', () => {
-    // https://on.cypress.io/promise
-    let waited = false
-
-    /**
-     * @return Bluebird<string>
-     */
-    function waitOneSecond () {
-      // return a promise that resolves after 1 second
-      // @ts-ignore TS2351 (new Cypress.Promise)
-      return new Cypress.Promise((resolve, reject) => {
-        setTimeout(() => {
-          // set waited to true
-          waited = true
-
-          // resolve with 'foo' string
-          resolve('foo')
-        }, 1000)
-      })
-    }
-
-    cy.then(() =>
-    // return a promise to cy.then() that
-    // is awaited until it resolves
-      // @ts-ignore TS7006
-      waitOneSecond().then((str) => {
-        expect(str).to.eq('foo')
-        expect(waited).to.be.true
-      }))
-  })
-})
diff --git a/cypress/integration/examples/viewport.spec.js b/cypress/integration/examples/viewport.spec.js
deleted file mode 100644
index 711fe74efb11..000000000000
--- a/cypress/integration/examples/viewport.spec.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/// <reference types="Cypress" />
-
-context('Viewport', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/commands/viewport')
-  })
-
-  it('cy.viewport() - set the viewport size and dimension', () => {
-    // https://on.cypress.io/viewport
-
-    cy.get('#navbar').should('be.visible')
-    cy.viewport(320, 480)
-
-    // the navbar should have collapse since our screen is smaller
-    cy.get('#navbar').should('not.be.visible')
-    cy.get('.navbar-toggle').should('be.visible').click()
-    cy.get('.nav').find('a').should('be.visible')
-
-    // lets see what our app looks like on a super large screen
-    cy.viewport(2999, 2999)
-
-    // cy.viewport() accepts a set of preset sizes
-    // to easily set the screen to a device's width and height
-
-    // We added a cy.wait() between each viewport change so you can see
-    // the change otherwise it is a little too fast to see :)
-
-    cy.viewport('macbook-15')
-    cy.wait(200)
-    cy.viewport('macbook-13')
-    cy.wait(200)
-    cy.viewport('macbook-11')
-    cy.wait(200)
-    cy.viewport('ipad-2')
-    cy.wait(200)
-    cy.viewport('ipad-mini')
-    cy.wait(200)
-    cy.viewport('iphone-6+')
-    cy.wait(200)
-    cy.viewport('iphone-6')
-    cy.wait(200)
-    cy.viewport('iphone-5')
-    cy.wait(200)
-    cy.viewport('iphone-4')
-    cy.wait(200)
-    cy.viewport('iphone-3')
-    cy.wait(200)
-
-    // cy.viewport() accepts an orientation for all presets
-    // the default orientation is 'portrait'
-    cy.viewport('ipad-2', 'portrait')
-    cy.wait(200)
-    cy.viewport('iphone-4', 'landscape')
-    cy.wait(200)
-
-    // The viewport will be reset back to the default dimensions
-    // in between tests (the  default can be set in cypress.json)
-  })
-})
diff --git a/cypress/integration/examples/waiting.spec.js b/cypress/integration/examples/waiting.spec.js
deleted file mode 100644
index e11d9ca9382f..000000000000
--- a/cypress/integration/examples/waiting.spec.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/// <reference types="Cypress" />
-
-context('Waiting', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/commands/waiting')
-  })
-  // BE CAREFUL of adding unnecessary wait times.
-  // https://on.cypress.io/best-practices#Unnecessary-Waiting
-
-  // https://on.cypress.io/wait
-  it('cy.wait() - wait for a specific amount of time', () => {
-    cy.get('.wait-input1').type('Wait 1000ms after typing')
-    cy.wait(1000)
-    cy.get('.wait-input2').type('Wait 1000ms after typing')
-    cy.wait(1000)
-    cy.get('.wait-input3').type('Wait 1000ms after typing')
-    cy.wait(1000)
-  })
-
-  it('cy.wait() - wait for a specific route', () => {
-    cy.server()
-
-    // Listen to GET to comments/1
-    cy.route('GET', 'comments/*').as('getComment')
-
-    // we have code that gets a comment when
-    // the button is clicked in scripts.js
-    cy.get('.network-btn').click()
-
-    // wait for GET comments/1
-    cy.wait('@getComment').its('status').should('eq', 200)
-  })
-
-})
diff --git a/cypress/integration/examples/window.spec.js b/cypress/integration/examples/window.spec.js
deleted file mode 100644
index 00bff9f7fa99..000000000000
--- a/cypress/integration/examples/window.spec.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/// <reference types="Cypress" />
-
-context('Window', () => {
-  beforeEach(() => {
-    cy.visit('https://example.cypress.io/commands/window')
-  })
-
-  it('cy.window() - get the global window object', () => {
-    // https://on.cypress.io/window
-    cy.window().should('have.property', 'top')
-  })
-
-  it('cy.document() - get the document object', () => {
-    // https://on.cypress.io/document
-    cy.document().should('have.property', 'charset').and('eq', 'UTF-8')
-  })
-
-  it('cy.title() - get the title', () => {
-    // https://on.cypress.io/title
-    cy.title().should('include', 'Kitchen Sink')
-  })
-})
diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js
deleted file mode 100644
index fd170fba6912..000000000000
--- a/cypress/plugins/index.js
+++ /dev/null
@@ -1,17 +0,0 @@
-// ***********************************************************
-// This example plugins/index.js can be used to load plugins
-//
-// You can change the location of this file or turn off loading
-// the plugins file with the 'pluginsFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/plugins-guide
-// ***********************************************************
-
-// This function is called when a project is opened or re-opened (e.g. due to
-// the project's config changing)
-
-module.exports = (on, config) => {
-  // `on` is used to hook into various events Cypress emits
-  // `config` is the resolved Cypress config
-}
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
deleted file mode 100644
index ca4d256f3eb1..000000000000
--- a/cypress/support/commands.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// ***********************************************
-// This example commands.js shows you how to
-// create various custom commands and overwrite
-// existing commands.
-//
-// For more comprehensive examples of custom
-// commands please read more here:
-// https://on.cypress.io/custom-commands
-// ***********************************************
-//
-//
-// -- This is a parent command --
-// Cypress.Commands.add("login", (email, password) => { ... })
-//
-//
-// -- This is a child command --
-// Cypress.Commands.add("drag", { prevSubject: 'element'}, (subject, options) => { ... })
-//
-//
-// -- This is a dual command --
-// Cypress.Commands.add("dismiss", { prevSubject: 'optional'}, (subject, options) => { ... })
-//
-//
-// -- This will overwrite an existing command --
-// Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
diff --git a/cypress/support/index.js b/cypress/support/index.js
deleted file mode 100644
index d68db96df269..000000000000
--- a/cypress/support/index.js
+++ /dev/null
@@ -1,20 +0,0 @@
-// ***********************************************************
-// This example support/index.js is processed and
-// loaded automatically before your test files.
-//
-// This is a great place to put global configuration and
-// behavior that modifies Cypress.
-//
-// You can change the location of this file or turn off
-// automatically serving support files with the
-// 'supportFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/configuration
-// ***********************************************************
-
-// Import commands.js using ES2015 syntax:
-import './commands'
-
-// Alternatively you can use CommonJS syntax:
-// require('./commands')
diff --git a/tests/cypress/integration/pwa/00-service-worker.js b/tests/cypress/integration/00a-service-worker.js
similarity index 61%
rename from tests/cypress/integration/pwa/00-service-worker.js
rename to tests/cypress/integration/00a-service-worker.js
index 2edbddd840b0..73f7155854f4 100644
--- a/tests/cypress/integration/pwa/00-service-worker.js
+++ b/tests/cypress/integration/00a-service-worker.js
@@ -1,4 +1,4 @@
-import loginPage from '../../pageobjects/login.page';
+import loginPage from '../pageobjects/login.page';
 
 const version = 'viasat-0.1';
 const file = '/manifest.json';
@@ -9,28 +9,26 @@ describe('[Service-Worker]', () => {
 	});
 
 	it('it should support service worker', () => {
-		cy.window().then(win => { expect(!!win.navigator.serviceWorker).to.equal(true); });
+		cy.window().then((win) => { expect(!!win.navigator.serviceWorker).to.equal(true); });
 	});
 
 	it('it should be in active state', () => {
-		cy.window().then(win => {
+		cy.window().then((win) => {
 			const value = win.navigator.serviceWorker.controller;
 			expect(value.state).to.equal('activated');
 		});
 	});
 
 	it('it should create the cache storage', () => {
-		cy.window().then(win => {
-			return caches.has(version);
-		}).then(exist => {
+		cy.window().then(() => caches.has(version)).then((exist) => {
 			expect(exist).to.equal(true);
 		});
 	});
 
 	it('it should cache the manifest file', () => {
-		cy.window().then(win => {
-			caches.open(version).then(storage =>{
-				storage.match(file).then(response => {
+		cy.window().then(() => {
+			caches.open(version).then((storage) => {
+				storage.match(file).then((response) => {
 					expect(response.status).to.equal(200);
 				});
 			});
diff --git a/tests/cypress/integration/pwa/01-login.js b/tests/cypress/integration/00b-login-offline.js
similarity index 98%
rename from tests/cypress/integration/pwa/01-login.js
rename to tests/cypress/integration/00b-login-offline.js
index b288c6d13643..6c5d6ca3ccd7 100644
--- a/tests/cypress/integration/pwa/01-login.js
+++ b/tests/cypress/integration/00b-login-offline.js
@@ -1,9 +1,10 @@
-import loginPage from '../../pageobjects/login.page';
+import loginPage from '../pageobjects/login.page';
 
 describe('Test login page in Offline', () => {
 	before(() => {
 		localStorage.clear();
 		loginPage.open();
+		// time to register sw
 		cy.wait(5000);
 		loginPage.gotToForgotPassword();
 		loginPage.gotBackToLogin();
@@ -13,7 +14,6 @@ describe('Test login page in Offline', () => {
 
 	describe('[Render]', () => {
 		before(() => {
-			// time to register sw and cache files
 			loginPage.offlineMode(true);
 		});
 
@@ -270,4 +270,3 @@ describe('Test Forgot Password in Offline', () => {
 		});
 	});
 });
-
diff --git a/tests/cypress/integration/06-messaging.js b/tests/cypress/integration/06-messaging.js
index 633be78508a5..9c1ebd82ef4e 100644
--- a/tests/cypress/integration/06-messaging.js
+++ b/tests/cypress/integration/06-messaging.js
@@ -81,7 +81,7 @@ function messagingTest(currentTest) {
 		});
 
 		it('it should show the file in the message', () => {
-			mainContent.lastMessageDesc.get('text').should('contain' ,'File Description');
+			mainContent.lastMessageDesc.invoke('text').should('contain', 'File Description');
 		});
 	});
 }
diff --git a/tests/cypress/integration/06a-messaging-offline.js b/tests/cypress/integration/06a-messaging-offline.js
new file mode 100644
index 000000000000..60adbb54addb
--- /dev/null
+++ b/tests/cypress/integration/06a-messaging-offline.js
@@ -0,0 +1,216 @@
+import mainContent from '../pageobjects/main-content.page';
+import sideNav from '../pageobjects/side-nav.page';
+import Global from '../pageobjects/global';
+import { username, email, password } from '../../data/user.js';
+import { fileName } from '../../data/interactions.js';
+import { checkIfUserIsValid } from '../../data/checks';
+
+const storage = {
+	db: 'localforage',
+	transaction: 'keyvaluepairs',
+	store: 'chatMessage',
+};
+const version = 'viasat-0.1';
+const message = `message on ${ Date.now() }`;
+
+function isOfflineMsg({ msg, message, action }) {
+	return !!(msg && msg.msg === message && msg.temp && msg.tempActions && msg.tempActions[action]);
+}
+
+function isOfflineAttachment({ msg, message, action }) {
+	const exist = msg && msg.attachments && msg.attachments[0] && msg.attachments[0].description === message;
+	if (exist) {
+		cy.window().then(() => {
+			caches.open(version).then((storage) => {
+				storage.match(msg.attachments[0].image_url).then((response) => {
+					expect(response.status).to.equal(200);
+				});
+			});
+		});
+	}
+	return !!(exist && msg.temp && msg.tempActions && msg.tempActions[action] && msg.uploads && msg.uploads.percentage === 0);
+}
+
+function isOnlineMsg({ msg, message }) {
+	return !!(msg && msg.msg === message && !msg.temp && !msg.tempActions);
+}
+
+function isOnlineAttachment({ msg, message }) {
+	return !!(msg && msg.attachments && msg.attachments[0] && msg.attachments[0].description === message && !msg.temp && !msg.tempActions);
+}
+
+function testMsgFromForge(message, attachment = false, callback) {
+	cy.window().then(async () => {
+		await new Promise((done) => {
+			indexedDB.open(storage.db).onsuccess = (event) => {
+				const _db = event.target.result;
+				const tx = _db.transaction(storage.transaction);
+				const _store = tx.objectStore(storage.transaction);
+
+				_store.openCursor(storage.store).onsuccess = (event) => {
+					const cursor = event.target.result;
+					if (cursor && cursor.value && cursor.value.records) {
+						const msgs = cursor.value.records;
+						const msg = msgs && (attachment ? msgs.find((msg) => msg.attachments && msg.attachments[0] && msg.attachments[0].description === message) : msgs.find((msg) => msg.msg === message));
+						callback(msg);
+						done();
+					}
+				};
+			};
+		});
+	});
+}
+
+function offlineMessageTest(message, action) {
+	it('it should save the message in localforge', () => {
+		testMsgFromForge(message, false, (msg) => {
+			expect(isOfflineMsg({ msg, message, action })).to.equal(true);
+		});
+	});
+
+	it('it should show the offline message after refresh', () => {
+		mainContent.lastMessage.should('be.visible');
+	});
+
+	it(`it should ${ action } the offline message after coming online`, () => {
+		mainContent.offlineMode(false);
+		cy.wait(6000); // wait for the indexedDb to update the message + reconnect time
+		if (action === 'delete') {
+			testMsgFromForge(message, false, (msg) => {
+				expect(msg === undefined).to.equal(true);
+			});
+		} else {
+			testMsgFromForge(message, false, (msg) => {
+				expect(isOnlineMsg({ msg, message })).to.equal(true);
+			});
+		}
+	});
+}
+
+describe('[Message]', () => {
+	before(() => {
+		checkIfUserIsValid(username, email, password);
+		sideNav.openChannel('general');
+		cy.wait(3000); // time to cache the process.
+	});
+
+	describe('Normal message:', () => {
+		beforeEach(() => {
+			mainContent.offlineMode(true);
+		});
+
+		it('it should show reconnecting alert', () => {
+			mainContent.warningAlert.should('be.visible');
+		});
+
+		it('it should send a message in offline', () => {
+			mainContent.sendMessage(message);
+			cy.wait(1000); // wait for the indexedDb to update the message
+		});
+
+		offlineMessageTest(message, 'send');
+	});
+
+	describe('[Actions]', () => {
+		describe('Render:', () => {
+			before(() => {
+				mainContent.offlineMode(true);
+				mainContent.openMessageActionMenu();
+			});
+
+			after(() => {
+				mainContent.popoverWrapper.click();
+			});
+
+			it('it should show the message action menu and the actions', () => {
+				mainContent.messageActionMenu.should('be.visible');
+				mainContent.messageReply.should('be.visible');
+				mainContent.messageEdit.should('be.visible');
+				mainContent.messageDelete.should('be.visible');
+				mainContent.messagePermalink.should('be.visible');
+				mainContent.messageCopy.should('be.visible');
+				mainContent.messageQuote.should('be.visible');
+				mainContent.messageStar.should('be.visible');
+				mainContent.messagePin.should('not.be.visible');
+				mainContent.messageUnread.should('not.be.visible');
+			});
+		});
+
+		describe('[Usage]', () => {
+			beforeEach(() => {
+				mainContent.offlineMode(true);
+			});
+
+			describe('Edit:', () => {
+				it('it should edit the message', () => {
+					mainContent.openMessageActionMenu();
+					mainContent.selectAction('edit');
+					mainContent.sendBtn.click();
+					cy.wait(1000); // time to update indexedDb
+				});
+
+				offlineMessageTest(`${ message }this message was edited`, 'update');
+			});
+
+			describe('Delete:', () => {
+				it('it should delete the message', () => {
+					mainContent.openMessageActionMenu();
+					mainContent.selectAction('delete');
+					Global.modalConfirm.click();
+					Global.modalOverlay.should('not.be.visible');
+					cy.wait(1000);
+				});
+
+				it('it should not show the deleted message', () => {
+					mainContent.lastMessage.should('contain', 'Message deleted');
+				});
+
+				offlineMessageTest('Message deleted', 'delete');
+			});
+		});
+	});
+
+	describe('fileUpload:', () => {
+		beforeEach(() => {
+			mainContent.offlineMode(true);
+		});
+
+		it('it should send an attachment in offline', () => {
+			mainContent.fileUpload(fileName);
+			Global.modalConfirm.should('be.visible');
+			Global.modalCancel.should('be.visible');
+			Global.modalFilePreview.should('be.visible');
+			Global.modalFileTitle.should('be.visible');
+			Global.modalFileName.should('be.visible');
+			Global.modalFileName.type('File Name');
+			Global.modalFileDescription.should('be.visible');
+			Global.modalFileDescription.type(message);
+			Global.modalConfirm.click();
+			cy.wait(1000);
+		});
+
+		it('it should show the file in the message', () => {
+			mainContent.lastMessageDesc.invoke('text').should('contain', message);
+		});
+
+		it('it should save the file in localforge', () => {
+			testMsgFromForge(message, true, (msg) => {
+				expect(isOfflineAttachment({ msg, message, action: 'send' })).to.equal(true);
+			});
+		});
+
+		it('it should show the file after refresh', () => {
+			cy.reload();
+			mainContent.lastMessageDesc.should('be.visible');
+			mainContent.lastMessageDesc.invoke('text').should('contain', message);
+		});
+
+		it('it should send the file after coming online', () => {
+			mainContent.offlineMode(false);
+			cy.wait(6000); // wait for the indexedDb to update the message + reconnect time
+			testMsgFromForge(message, true, (msg) => {
+				expect(isOnlineAttachment({ msg, message })).to.equal(true);
+			});
+		});
+	});
+});
diff --git a/tests/cypress/integration/pwa/02-messaging.js b/tests/cypress/integration/pwa/02-messaging.js
deleted file mode 100644
index 15f7ed3ee0ff..000000000000
--- a/tests/cypress/integration/pwa/02-messaging.js
+++ /dev/null
@@ -1,277 +0,0 @@
-import mainContent from '../../pageobjects/main-content.page';
-import sideNav from '../../pageobjects/side-nav.page';
-import Global from '../../pageobjects/global';
-import { username, email, password } from '../../../data/user.js';
-import { imgURL } from '../../../data/interactions.js';
-import { checkIfUserIsValid } from '../../../data/checks';
-
-const storage = {
-	db: 'localforage',
-	transaction: 'keyvaluepairs',
-	store: 'chatMessage',
-};
-const version = 'viasat-0.1';
-const message = `message on ${ Date.now() }`;
-
-function isOfflineMsg(msg, message, action) {
-	return !!(msg && msg.msg === message && msg.temp && msg.tempActions && msg.tempActions[action]);
-}
-
-function isOfflineAttachment(msg, message, action) {
-	let exist = msg && msg.attachments && msg.attachments[0] && msg.attachments[0].description === message;
-	if (exist) {
-		const { value } = browser.executeAsync((version, file, done) => {
-			caches.open(version)
-				.then((storage) => storage.match(file)
-					.then((res) => done(res)));
-		}, version, msg.attachments[0].image_url);
-		exist = (value.status === 200);
-	}
-	return !!(exist && msg.temp && msg.tempActions && msg.tempActions[action] && msg.uploads && msg.uploads.percentage === 0);
-}
-
-function isOnlineMsg(msg, message) {
-	return !!(msg && msg.msg === message && !msg.temp && !msg.tempActions);
-}
-
-function isOnlineAttachment(msg, message) {
-	return !!(msg && msg.attachments && msg.attachments[0] && msg.attachments[0].description === message && !msg.temp && !msg.tempActions);
-}
-
-function getMsgFromIndexDB(message, attachment = false) {
-	const { value: msgs } = browser.executeAsync(({ db, transaction, store }, done) => {
-		indexedDB.open(db).onsuccess = (event) => {
-			const _db = event.target.result;
-			const tx = _db.transaction(transaction);
-			const _store = tx.objectStore(transaction);
-
-			_store.openCursor(store).onsuccess = function(event) {
-				const cursor = event.target.result;
-				if (cursor && cursor.value && cursor.value.records) {
-					done(cursor.value.records);
-				}
-				done(null);
-			};
-		};
-	}, storage);
-
-	return msgs && (attachment ? msgs.find((msg) => msg.attachments && msg.attachments[0] && msg.attachments[0].description === message) : msgs.find((msg) => msg.msg === message));
-}
-
-function offlineMessageTest(message, action) {
-	it('it should save the message in localforge', () => {
-		isOfflineMsg(getMsgFromIndexDB(message), message, action).should.be.true;
-	});
-
-	it('it should show the offline message after refresh', () => {
-		browser.refresh();
-		mainContent.waitForLastMessageEqualsText(message);
-	});
-
-	it(`it should ${ action } the offline message after coming online`, () => {
-		mainContent.offlineMode(false);
-		browser.pause(8000); // wait for the indexedDb to update the message + reconnect time
-		if (action === 'delete') {
-			(getMsgFromIndexDB(message) === undefined).should.be.true;
-		} else {
-			isOnlineMsg(getMsgFromIndexDB(message), message).should.be.true;
-		}
-	});
-}
-
-describe('[Message]', () => {
-	before(() => {
-		mainContent.useProxy(true);
-		checkIfUserIsValid(username, email, password);
-		sideNav.openChannel('general');
-		browser.pause(15000); // time to cache the process.
-		mainContent.offlineMode(true);
-		browser.refresh();
-	});
-	after(() => {
-		mainContent.useProxy(false);
-	});
-
-	it('it should show reconnecting alert', () => {
-		mainContent.warningAlert.waitForVisible(10000);
-		mainContent.warningAlert.isVisible().should.be.true;
-	});
-
-	describe('Normal message:', () => {
-		after(() => {
-			mainContent.offlineMode(true);
-			browser.refresh();
-		});
-		it('it should send a message in offline', () => {
-			mainContent.sendMessage(message);
-		});
-
-		it('it should show the last message in offline', () => {
-			mainContent.lastMessage.isVisible().should.be.true;
-			browser.pause(1000); // wait for the indexedDb to update the message
-		});
-
-		offlineMessageTest(message, 'send');
-	});
-
-	describe.skip('fileUpload:', () => {
-		after(() => {
-			mainContent.offlineMode(true);
-			browser.refresh();
-		});
-		it('it should send a attachment', () => {
-			mainContent.fileUpload(imgURL);
-		});
-
-		it('it should show the confirm button', () => {
-			Global.modalConfirm.isVisible().should.be.true;
-		});
-
-		it('it should show the cancel button', () => {
-			Global.modalCancel.isVisible().should.be.true;
-		});
-
-		it('it should show the file preview', () => {
-			Global.modalFilePreview.isVisible().should.be.true;
-		});
-
-		it('it should show the confirm button', () => {
-			Global.modalConfirm.isVisible().should.be.true;
-		});
-
-		it('it should show the file title', () => {
-			Global.modalFileTitle.isVisible().should.be.true;
-		});
-
-		it('it should show the file name input', () => {
-			Global.modalFileName.isVisible().should.be.true;
-		});
-
-		it('it should fill the file name input', () => {
-			Global.modalFileName.setValue('File Name');
-		});
-
-		it('it should show the file name input', () => {
-			Global.modalFileDescription.isVisible().should.be.true;
-		});
-
-		it('it should fill the file name input', () => {
-			Global.modalFileDescription.setValue(message);
-		});
-
-		it('it should click the confirm', () => {
-			Global.modalConfirm.click();
-			Global.modalConfirm.waitForVisible(5000, true);
-		});
-
-		it('it should show the file in the message', () => {
-			mainContent.lastMessageDesc.waitForVisible(10000);
-			mainContent.lastMessageDesc.getText().should.equal(message);
-			browser.pause(1000);
-		});
-		
-		it('it should save the file in localforge', () => {
-			isOfflineAttachment(getMsgFromIndexDB(message, true), message, 'send').should.be.true;
-		});
-
-		it('it should show the file after refresh', () => {
-			browser.refresh();
-			mainContent.lastMessageDesc.waitForVisible(10000);
-			mainContent.lastMessageDesc.getText().should.equal(message);
-		});
-
-		it(`it should send the file after coming online`, () => {
-			mainContent.offlineMode(false);
-			browser.pause(8000); // wait for the indexedDb to update the message + reconnect time
-			isOnlineAttachment(getMsgFromIndexDB(message, true), message).should.be.true;
-		});
-	});
-
-	describe.skip('[Actions]', () => {
-		describe('Render:', () => {
-			before(() => {
-				mainContent.openMessageActionMenu();
-			});
-
-			after(() => {
-				mainContent.popoverWrapper.click();
-			});
-
-			it('it should show the message action menu', () => {
-				mainContent.messageActionMenu.isVisible().should.be.true;
-			});
-
-			it('it should show the reply action', () => {
-				mainContent.messageReply.isVisible().should.be.true;
-			});
-
-			it('it should show the edit action', () => {
-				mainContent.messageEdit.isVisible().should.be.true;
-			});
-
-			it('it should show the delete action', () => {
-				mainContent.messageDelete.isVisible().should.be.true;
-			});
-
-			it('it should show the permalink action', () => {
-				mainContent.messagePermalink.isVisible().should.be.true;
-			});
-
-			it('it should show the copy action', () => {
-				mainContent.messageCopy.isVisible().should.be.true;
-			});
-
-			it('it should show the quote the action', () => {
-				mainContent.messageQuote.isVisible().should.be.true;
-			});
-
-			it('it should show the star action', () => {
-				mainContent.messageStar.isVisible().should.be.true;
-			});
-
-			it('it should not show the pin action', () => {
-				mainContent.messagePin.isVisible().should.be.false;
-			});
-
-			it('it should not show the mark as unread action', () => {
-				mainContent.messageUnread.isVisible().should.be.false;
-			});
-		});
-
-		describe('[Usage]', () => {
-			describe('Edit:', () => {
-				before(() => {
-					browser.pause(1000);
-					mainContent.openMessageActionMenu();
-				});
-
-				it('it should edit the message', () => {
-					mainContent.selectAction('edit');
-					mainContent.sendBtn.click();
-					browser.pause(1000);
-				});
-
-				offlineMessageTest(`${ message }this message was edited`, 'update');
-			});
-
-			describe('Delete:', () => {
-				before(() => {
-					mainContent.openMessageActionMenu();
-				});
-
-				it('it should delete the message', () => {
-					mainContent.selectAction('delete');
-					Global.modalConfirm.click();
-					Global.modalOverlay.waitForVisible(3000, true);
-					browser.pause(10000);
-				});
-
-				it('it should not show the deleted message', () => {
-					mainContent.lastMessage.getText().should.equal('Message deleted');
-				});
-
-				offlineMessageTest('Message deleted', 'delete');
-			});
-		});
-	});
-});
diff --git a/tests/cypress/pageobjects/Page.js b/tests/cypress/pageobjects/Page.js
index fba60a0a35b1..844a87d4d172 100644
--- a/tests/cypress/pageobjects/Page.js
+++ b/tests/cypress/pageobjects/Page.js
@@ -8,7 +8,7 @@ class Page {
 
 	offlineMode(offline) {
 		cy.server(offline ? { force404: true } : { enable: false });
-		cy.reload();
+		offline && cy.reload();
 	}
 }
 module.exports = Page;
diff --git a/tests/cypress/pageobjects/login.page.js b/tests/cypress/pageobjects/login.page.js
index c157dbe93565..1c16db5beac4 100644
--- a/tests/cypress/pageobjects/login.page.js
+++ b/tests/cypress/pageobjects/login.page.js
@@ -35,7 +35,7 @@ class LoginPage extends Page {
 
 	get registrationSucceededCard() { return browser.element('#login-card h2'); }
 
-	get warningAlert() { return browser.element('.alert-warning'); } 
+	get warningAlert() { return browser.element('.alert-warning'); }
 
 	open(options = {}) {
 		super.open('', options);
diff --git a/tests/cypress/pageobjects/main-content.page.js b/tests/cypress/pageobjects/main-content.page.js
index afed94dade7f..198f00fbb032 100644
--- a/tests/cypress/pageobjects/main-content.page.js
+++ b/tests/cypress/pageobjects/main-content.page.js
@@ -17,7 +17,7 @@ class MainContent extends Page {
 
 	get plusBtn() { return browser.element('.rc-message-box__icon.js-plus'); }
 
-	get fileUploadBtn() { return browser.element('.rc-popover__item[data-id="file-upload"]'); } 
+	get fileUploadBtn() { return browser.element('.rc-popover__item[data-id="file-upload"]'); }
 
 	get messageBoxActions() { return browser.element('.rc-message-box__icon'); }
 
@@ -44,7 +44,7 @@ class MainContent extends Page {
 
 	get lastMessage() { return browser.element('.message:last-child'); }
 
-	get lastMessageDesc() { return browser.element('.message:last-child .attachment .attachment-description'); }
+	get lastMessageDesc() { return browser.element('.message:last-child .attachment-image .attachment-description'); }
 
 	get lastMessageRoleAdded() { return browser.element('.message:last-child.subscription-role-added .body'); }
 
@@ -153,7 +153,7 @@ class MainContent extends Page {
 		this.plusBtn.click();
 		this.fileUploadBtn.click();
 		cy.get('[id="fileupload-input"]').attachFile(fileName, { force: true });
-	}	
+	}
 
 	waitForLastMessageEqualsText(text) {
 		cy.get('.message:last-child .body').should('contain', text);
diff --git a/tests/cypress/support/commands.js b/tests/cypress/support/commands.js
index 4bfb8839d521..90e059277f14 100644
--- a/tests/cypress/support/commands.js
+++ b/tests/cypress/support/commands.js
@@ -11,6 +11,7 @@
 //
 // -- This is a parent command --
 import 'cypress-file-upload';
+
 Cypress.Commands.add('login', (email, password) => cy.window().then(({ Meteor }) => new Promise((resolve) => {
 	Meteor.loginWithPassword(email, password, resolve);
 })));

From d4768d4c63317d2fe1c2dbbcb92ba436ed274cc4 Mon Sep 17 00:00:00 2001
From: shubhsherl <shubham.singh094@yahoo.com>
Date: Thu, 2 Apr 2020 11:36:15 +0530
Subject: [PATCH 183/223] remove http-proxy and add package-lock

---
 package-lock.json | 17 +++++++++++++++++
 package.json      |  1 -
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/package-lock.json b/package-lock.json
index cf3dde4ff492..3401086dae7e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12063,6 +12063,23 @@
 				}
 			}
 		},
+		"cypress-file-upload": {
+			"version": "4.0.4",
+			"resolved": "https://registry.npmjs.org/cypress-file-upload/-/cypress-file-upload-4.0.4.tgz",
+			"integrity": "sha512-q04HoVb8OQTpusHOadGER+9Dvif7kfoM8MjVAF37O+X5VEZlUARbXrKECH6pUH0vKmWRGcrsoB6mKah9ZJa4Pw==",
+			"dev": true,
+			"requires": {
+				"mime": "^2.4.4"
+			},
+			"dependencies": {
+				"mime": {
+					"version": "2.4.4",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
+					"integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
+					"dev": true
+				}
+			}
+		},
 		"dashdash": {
 			"version": "1.14.1",
 			"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
diff --git a/package.json b/package.json
index 96165bfa7db3..db1dd1ce2b5a 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,6 @@
 		"eslint-plugin-import": "^2.19.1",
 		"eslint-plugin-react": "^7.17.0",
 		"fast-glob": "^2.2.6",
-		"http-proxy": "^1.18.0",
 		"husky": "^1.2.0",
 		"i18next": "^17.0.17",
 		"inquirer": "^7.0.3",

From 2a3e3bccba236729850cf45db357df963db4e489 Mon Sep 17 00:00:00 2001
From: shubhsherl <shubham.singh094@yahoo.com>
Date: Thu, 2 Apr 2020 21:23:09 +0530
Subject: [PATCH 184/223] add some comments

---
 app/lib/server/methods/deleteMessage.js | 2 ++
 app/lib/server/methods/sendMessage.js   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/app/lib/server/methods/deleteMessage.js b/app/lib/server/methods/deleteMessage.js
index 067fcef7b03f..69d227256cc3 100644
--- a/app/lib/server/methods/deleteMessage.js
+++ b/app/lib/server/methods/deleteMessage.js
@@ -28,6 +28,8 @@ Meteor.methods({
 			},
 		});
 
+		// return if message does not exist, instead of error, for offline messages
+		// which are deleted before they are send (e.g. file uploads)
 		if (!originalMessage) {
 			return;
 		}
diff --git a/app/lib/server/methods/sendMessage.js b/app/lib/server/methods/sendMessage.js
index 6c9f08f26033..62ecab9343d7 100644
--- a/app/lib/server/methods/sendMessage.js
+++ b/app/lib/server/methods/sendMessage.js
@@ -21,6 +21,7 @@ export function executeSendMessage(uid, message) {
 		});
 	}
 
+	// don't check for ts diff for offline messages which are send after long time
 	message.ts = new Date();
 
 	if (message.msg) {

From 89debf671ba45c5df8b2628a452398a112d89b08 Mon Sep 17 00:00:00 2001
From: shubhsherl <shubham.singh094@yahoo.com>
Date: Tue, 7 Apr 2020 17:29:49 +0530
Subject: [PATCH 185/223] add message retain test

---
 tests/cypress/integration/06-messaging.js     |  1 +
 .../integration/06a-messaging-offline.js      | 35 ++++++++++++++++++-
 .../cypress/pageobjects/main-content.page.js  |  1 -
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/tests/cypress/integration/06-messaging.js b/tests/cypress/integration/06-messaging.js
index 9c1ebd82ef4e..e89846904cf3 100644
--- a/tests/cypress/integration/06-messaging.js
+++ b/tests/cypress/integration/06-messaging.js
@@ -18,6 +18,7 @@ function messagingTest(currentTest) {
 
 		it('it should show the last message', () => {
 			mainContent.lastMessage.should('be.visible');
+			mainContent.lastMessage.should('contain', message);
 		});
 
 		if (currentTest !== 'direct') {
diff --git a/tests/cypress/integration/06a-messaging-offline.js b/tests/cypress/integration/06a-messaging-offline.js
index 60adbb54addb..822f48824dc9 100644
--- a/tests/cypress/integration/06a-messaging-offline.js
+++ b/tests/cypress/integration/06a-messaging-offline.js
@@ -4,6 +4,12 @@ import Global from '../pageobjects/global';
 import { username, email, password } from '../../data/user.js';
 import { fileName } from '../../data/interactions.js';
 import { checkIfUserIsValid } from '../../data/checks';
+import {
+	api,
+	request,
+	credentials,
+	getCredentials,
+} from '../../data/api-data.js';
 
 const storage = {
 	db: 'localforage',
@@ -70,6 +76,7 @@ function offlineMessageTest(message, action) {
 
 	it('it should show the offline message after refresh', () => {
 		mainContent.lastMessage.should('be.visible');
+		mainContent.lastMessage.should('contain', message);
 	});
 
 	it(`it should ${ action } the offline message after coming online`, () => {
@@ -87,6 +94,15 @@ function offlineMessageTest(message, action) {
 	});
 }
 
+function sendMessageRequest(done = () => {}) {
+	request.post(api('chat.sendMessage'))
+		.set(credentials)
+		.send({ message: { _id: `id-${ Date.now() }`, rid: 'GENERAL', msg: `Check ${ message }` } })
+		.expect('Content-Type', 'application/json')
+		.expect(200)
+		.end(done);
+}
+
 describe('[Message]', () => {
 	before(() => {
 		checkIfUserIsValid(username, email, password);
@@ -186,7 +202,7 @@ describe('[Message]', () => {
 			Global.modalFileDescription.should('be.visible');
 			Global.modalFileDescription.type(message);
 			Global.modalConfirm.click();
-			cy.wait(1000);
+			cy.wait(3000);
 		});
 
 		it('it should show the file in the message', () => {
@@ -213,4 +229,21 @@ describe('[Message]', () => {
 			});
 		});
 	});
+
+	describe('Message retain:', () => {
+		before((done) => {
+			getCredentials(done);
+		});
+
+		it('it should send API message request', (done) => {
+			sendMessageRequest(done);
+		});
+
+		it('it should show the message after refresh', () => {
+			cy.reload();
+			mainContent.lastMessage.should('be.visible');
+			mainContent.lastMessage.should('contain', `Check ${ message }`);
+			cy.wait(3000);
+		});
+	});
 });
diff --git a/tests/cypress/pageobjects/main-content.page.js b/tests/cypress/pageobjects/main-content.page.js
index 198f00fbb032..53c1b5881bff 100644
--- a/tests/cypress/pageobjects/main-content.page.js
+++ b/tests/cypress/pageobjects/main-content.page.js
@@ -149,7 +149,6 @@ class MainContent extends Page {
 
 	// uploads a file in the given fileName (url).
 	fileUpload(fileName) {
-		this.sendMessage('Prepare for the file');
 		this.plusBtn.click();
 		this.fileUploadBtn.click();
 		cy.get('[id="fileupload-input"]').attachFile(fileName, { force: true });

From 6d679921039333288f7f51a25cda18a3353d6a30 Mon Sep 17 00:00:00 2001
From: Shailesh Baldaniya <shaileshbaldaniya351@gmail.com>
Date: Tue, 7 Apr 2020 15:14:16 +0000
Subject: [PATCH 186/223] Fix Three Dot Menu for Non Admin Users

---
 app/ui-sidenav/client/sidebarHeader.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/ui-sidenav/client/sidebarHeader.js b/app/ui-sidenav/client/sidebarHeader.js
index 290853bc3884..f247d02f80e6 100644
--- a/app/ui-sidenav/client/sidebarHeader.js
+++ b/app/ui-sidenav/client/sidebarHeader.js
@@ -250,7 +250,6 @@ const toolbarButtons = (user) => [{
 {
 	name: t('Options'),
 	icon: 'menu',
-	condition: () => AccountBox.getItems().length || hasAtLeastOnePermission(['manage-emoji', 'manage-oauth-apps', 'manage-outgoing-integrations', 'manage-incoming-integrations', 'manage-own-outgoing-integrations', 'manage-own-incoming-integrations', 'manage-selected-settings', 'manage-sounds', 'view-logs', 'view-privileged-setting', 'view-room-administration', 'view-statistics', 'view-user-administration', 'access-setting-permissions']),
 	hasPopup: true,
 	action: (e) => {
 		let adminOption;

From e090c860681db86bd23dbac6911772c3d897084c Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Tue, 7 Apr 2020 18:37:47 -0300
Subject: [PATCH 187/223] Regression: Fix users raw model (#17204)

---
 app/api/server/lib/users.js       |  4 ++-
 app/models/server/models/Users.js | 48 -------------------------------
 app/models/server/raw/Users.js    | 23 ++++++++++-----
 3 files changed, 19 insertions(+), 56 deletions(-)

diff --git a/app/api/server/lib/users.js b/app/api/server/lib/users.js
index 0742c9feab7d..82194832ceb8 100644
--- a/app/api/server/lib/users.js
+++ b/app/api/server/lib/users.js
@@ -1,3 +1,5 @@
+import s from 'underscore.string';
+
 import { Users } from '../../../models/server/raw';
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 
@@ -19,7 +21,7 @@ export async function findUsersToAutocomplete({ uid, selector }) {
 		limit: 10,
 	};
 
-	const users = await Users.findActiveByUsernameOrNameRegexWithExceptionsAndConditions(selector.term, exceptions, conditions, options).toArray();
+	const users = await Users.findActiveByUsernameOrNameRegexWithExceptionsAndConditions(new RegExp(s.escapeRegExp(selector.term), 'i'), exceptions, conditions, options).toArray();
 
 	return {
 		items: users,
diff --git a/app/models/server/models/Users.js b/app/models/server/models/Users.js
index 43c9c03530b2..6930ec7a2b3a 100644
--- a/app/models/server/models/Users.js
+++ b/app/models/server/models/Users.js
@@ -221,20 +221,6 @@ export class Users extends Base {
 		return null;
 	}
 
-	setLastRoutingTime(userId) {
-		const query = {
-			_id: userId,
-		};
-
-		const update = {
-			$set: {
-				lastRoutingTime: new Date(),
-			},
-		};
-
-		return this.update(query, update);
-	}
-
 	setLivechatStatus(userId, status) {
 		const query = {
 			_id: userId,
@@ -628,40 +614,6 @@ export class Users extends Base {
 		}, options);
 	}
 
-	findActiveByUsernameOrNameRegexWithExceptionsAndConditions(searchTerm, exceptions, conditions, options) {
-		if (exceptions == null) { exceptions = []; }
-		if (conditions == null) { conditions = {}; }
-		if (options == null) { options = {}; }
-		if (!_.isArray(exceptions)) {
-			exceptions = [exceptions];
-		}
-
-		const termRegex = new RegExp(s.escapeRegExp(searchTerm), 'i');
-		const query = {
-			$or: [{
-				username: termRegex,
-			}, {
-				name: termRegex,
-			}],
-			active: true,
-			type: {
-				$in: ['user', 'bot'],
-			},
-			$and: [{
-				username: {
-					$exists: true,
-				},
-			}, {
-				username: {
-					$nin: exceptions,
-				},
-			}],
-			...conditions,
-		};
-
-		return this.find(query, options);
-	}
-
 	findByActiveUsersExcept(searchTerm, exceptions, options, forcedSearchFields, extraQuery = []) {
 		if (exceptions == null) { exceptions = []; }
 		if (options == null) { options = {}; }
diff --git a/app/models/server/raw/Users.js b/app/models/server/raw/Users.js
index f42be432eb21..803e1c82e128 100644
--- a/app/models/server/raw/Users.js
+++ b/app/models/server/raw/Users.js
@@ -1,9 +1,5 @@
-import s from 'underscore.string';
-
 import { BaseRaw } from './BaseRaw';
 
-import { Users } from '..';
-
 export class UsersRaw extends BaseRaw {
 	findUsersInRoles(roles, scope, options) {
 		roles = [].concat(roles);
@@ -54,12 +50,26 @@ export class UsersRaw extends BaseRaw {
 
 		const [agent] = await this.col.aggregate(aggregate).toArray();
 		if (agent) {
-			Users.setLastRoutingTime(agent.agentId);
+			await this.setLastRoutingTime(agent.agentId);
 		}
 
 		return agent;
 	}
 
+	setLastRoutingTime(userId) {
+		const query = {
+			_id: userId,
+		};
+
+		const update = {
+			$set: {
+				lastRoutingTime: new Date(),
+			},
+		};
+
+		return this.col.updateOne(query, update);
+	}
+
 	async getAgentAndAmountOngoingChats(userId) {
 		const aggregate = [
 			{ $match: { _id: userId, status: { $exists: true, $ne: 'offline' }, statusLivechat: 'available', roles: 'livechat-agent' } },
@@ -97,7 +107,7 @@ export class UsersRaw extends BaseRaw {
 		]).toArray();
 	}
 
-	findActiveByUsernameOrNameRegexWithExceptionsAndConditions(searchTerm, exceptions, conditions, options) {
+	findActiveByUsernameOrNameRegexWithExceptionsAndConditions(termRegex, exceptions, conditions, options) {
 		if (exceptions == null) { exceptions = []; }
 		if (conditions == null) { conditions = {}; }
 		if (options == null) { options = {}; }
@@ -105,7 +115,6 @@ export class UsersRaw extends BaseRaw {
 			exceptions = [exceptions];
 		}
 
-		const termRegex = new RegExp(s.escapeRegExp(searchTerm), 'i');
 		const query = {
 			$or: [{
 				username: termRegex,

From 0c132518e9c74aec72da897180ea855bfe3e2bbc Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Tue, 7 Apr 2020 18:56:02 -0300
Subject: [PATCH 188/223] Bump version to 3.1.0-rc.10

---
 .docker/Dockerfile.rhel   |  2 +-
 .github/history.json      | 19 +++++++++++++++++++
 HISTORY.md                | 15 +++++++++++++++
 app/utils/rocketchat.info |  2 +-
 package.json              |  2 +-
 5 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index fd2f6ad1e80f..c5ed1f5e950b 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.1.0-rc.9
+ENV RC_VERSION 3.1.0-rc.10
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index edd063897e03..be8c08525e4e 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -42246,6 +42246,25 @@
           ]
         }
       ]
+    },
+    "3.1.0-rc.10": {
+      "node_version": "12.16.1",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "17204",
+          "title": "Regression: Fix users raw model",
+          "userLogin": "sampaiodiego",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/HISTORY.md b/HISTORY.md
index 1d993f57e987..2fc08c4ee305 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,6 +1,21 @@
 
 # 3.1.0 (Under Release Candidate Process)
 
+## 3.1.0-rc.10
+`2020-04-07  ·  1 🔍  ·  1 👩‍💻👨‍💻`
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Regression: Fix users raw model ([#17204](https://github.com/RocketChat/Rocket.Chat/pull/17204))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 ## 3.1.0-rc.9
 `2020-04-07  ·  1 🎉  ·  3 🚀  ·  1 🐛  ·  9 🔍  ·  11 👩‍💻👨‍💻`
 
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index e7b659b5a2fb..9aca78afeac8 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.1.0-rc.9"
+	"version": "3.1.0-rc.10"
 }
diff --git a/package.json b/package.json
index 36b4a5e7c7ce..a1671196d3c7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.1.0-rc.9",
+	"version": "3.1.0-rc.10",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

From 04ce058035349ccdbf6315e66522e1b6314016f3 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Tue, 7 Apr 2020 23:22:30 -0300
Subject: [PATCH 189/223] Add statistics and metrics about push queue (#17208)

---
 app/metrics/server/lib/metrics.js       | 4 ++++
 app/statistics/server/lib/statistics.js | 3 +++
 server/startup/migrations/v181.js       | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/metrics/server/lib/metrics.js b/app/metrics/server/lib/metrics.js
index d5f7b3953091..6dad7c38be2d 100644
--- a/app/metrics/server/lib/metrics.js
+++ b/app/metrics/server/lib/metrics.js
@@ -75,6 +75,8 @@ metrics.oplog = new client.Counter({
 	labelNames: ['collection', 'op'],
 });
 
+metrics.pushQueue = new client.Gauge({ name: 'rocketchat_push_queue', labelNames: ['queue'], help: 'push queue' });
+
 // User statistics
 metrics.totalUsers = new client.Gauge({ name: 'rocketchat_users_total', help: 'total of users' });
 metrics.activeUsers = new client.Gauge({ name: 'rocketchat_users_active', help: 'total of active users' });
@@ -144,6 +146,8 @@ const setPrometheusData = async () => {
 
 	const oplogQueue = getOplogInfo().mongo._oplogHandle?._entryQueue?.length || 0;
 	metrics.oplogQueue.set(oplogQueue);
+
+	metrics.pushQueue.set(statistics.pushQueue || 0);
 };
 
 const app = connect();
diff --git a/app/statistics/server/lib/statistics.js b/app/statistics/server/lib/statistics.js
index c7b79f75948e..b2907cd0ad81 100644
--- a/app/statistics/server/lib/statistics.js
+++ b/app/statistics/server/lib/statistics.js
@@ -1,6 +1,7 @@
 import os from 'os';
 
 import _ from 'underscore';
+import { Push } from 'meteor/rocketchat:push';
 import { Meteor } from 'meteor/meteor';
 import { InstanceStatus } from 'meteor/konecty:multiple-instances-status';
 
@@ -165,6 +166,8 @@ export const statistics = {
 			totalWithScriptEnabled: integrations.filter((integration) => integration.scriptEnabled === true).length,
 		};
 
+		statistics.pushQueue = Push.notifications.find().count();
+
 		return statistics;
 	},
 	save() {
diff --git a/server/startup/migrations/v181.js b/server/startup/migrations/v181.js
index 4d00b5ab7397..bdcf8fbfd08c 100644
--- a/server/startup/migrations/v181.js
+++ b/server/startup/migrations/v181.js
@@ -13,6 +13,6 @@ Migrations.add({
 		date.setHours(date.getHours() - 2); // 2 hours ago;
 
 		// Remove all records older than 2h
-		await Push.notifications.rawCollection().removeMany({ createdAt: { $lt: date } });
+		Push.notifications.rawCollection().removeMany({ createdAt: { $lt: date } });
 	},
 });

From 090dbee89a7e6d79b5d9563262ae8d17e7e707a3 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Tue, 7 Apr 2020 23:33:36 -0300
Subject: [PATCH 190/223] Bump version to 3.1.0-rc.11

---
 .docker/Dockerfile.rhel   |  2 +-
 .github/history.json      | 20 ++++++++++++++++++++
 HISTORY.md                | 15 +++++++++++++++
 app/utils/rocketchat.info |  2 +-
 package.json              |  2 +-
 5 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index c5ed1f5e950b..4df973d8a41c 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.1.0-rc.10
+ENV RC_VERSION 3.1.0-rc.11
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index be8c08525e4e..201edb648e08 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -42265,6 +42265,26 @@
           ]
         }
       ]
+    },
+    "3.1.0-rc.11": {
+      "node_version": "12.16.1",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "17208",
+          "title": "Add statistics and metrics about push queue",
+          "userLogin": "rodrigok",
+          "milestone": "3.1.0",
+          "contributors": [
+            "rodrigok"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/HISTORY.md b/HISTORY.md
index 2fc08c4ee305..47bdaa9d9bc9 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,6 +1,21 @@
 
 # 3.1.0 (Under Release Candidate Process)
 
+## 3.1.0-rc.11
+`2020-04-07  ·  1 🔍  ·  1 👩‍💻👨‍💻`
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Add statistics and metrics about push queue ([#17208](https://github.com/RocketChat/Rocket.Chat/pull/17208))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@rodrigok](https://github.com/rodrigok)
+
 ## 3.1.0-rc.10
 `2020-04-07  ·  1 🔍  ·  1 👩‍💻👨‍💻`
 
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index 9aca78afeac8..d4d991a7ecb8 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.1.0-rc.10"
+	"version": "3.1.0-rc.11"
 }
diff --git a/package.json b/package.json
index a1671196d3c7..5c66684a3f81 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.1.0-rc.10",
+	"version": "3.1.0-rc.11",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

From 44c40690b0a84165d2874ed1b7d92204c268a644 Mon Sep 17 00:00:00 2001
From: pierre-lehnen-rc <55164754+pierre-lehnen-rc@users.noreply.github.com>
Date: Wed, 8 Apr 2020 13:51:46 -0300
Subject: [PATCH 191/223] [FIX] SAML login errors not showing on UI (#17219)

---
 .../server/saml_server.js                     | 251 +++++++++---------
 client/routes.js                              |  14 +-
 2 files changed, 141 insertions(+), 124 deletions(-)

diff --git a/app/meteor-accounts-saml/server/saml_server.js b/app/meteor-accounts-saml/server/saml_server.js
index b2767fc8e70b..0b2c69bf16a1 100644
--- a/app/meteor-accounts-saml/server/saml_server.js
+++ b/app/meteor-accounts-saml/server/saml_server.js
@@ -243,170 +243,177 @@ Accounts.registerLoginHandler(function(loginRequest) {
 			error: new Meteor.Error(Accounts.LoginCancelledError.numericError, 'No matching login attempt found'),
 		};
 	}
-
 	const { emailField, usernameField, nameField, userDataFieldMap, regexes } = getUserDataMapping();
 	const { defaultUserRole = 'user', roleAttributeName, roleAttributeSync } = Accounts.saml.settings;
 
 	if (loginResult && loginResult.profile && loginResult.profile[emailField]) {
-		const emailList = Array.isArray(loginResult.profile[emailField]) ? loginResult.profile[emailField] : [loginResult.profile[emailField]];
-		const emailRegex = new RegExp(emailList.map((email) => `^${ RegExp.escape(email) }$`).join('|'), 'i');
+		try {
+			const emailList = Array.isArray(loginResult.profile[emailField]) ? loginResult.profile[emailField] : [loginResult.profile[emailField]];
+			const emailRegex = new RegExp(emailList.map((email) => `^${ RegExp.escape(email) }$`).join('|'), 'i');
 
-		const eduPersonPrincipalName = loginResult.profile.eppn;
-		const profileFullName = getProfileValue(loginResult.profile, nameField, regexes.name);
-		const fullName = profileFullName || loginResult.profile.displayName || loginResult.profile.username;
+			const eduPersonPrincipalName = loginResult.profile.eppn;
+			const profileFullName = getProfileValue(loginResult.profile, nameField, regexes.name);
+			const fullName = profileFullName || loginResult.profile.displayName || loginResult.profile.username;
 
-		let eppnMatch = false;
-		let user = null;
+			let eppnMatch = false;
+			let user = null;
 
-		// Check eppn
-		if (eduPersonPrincipalName) {
-			user = Meteor.users.findOne({
-				eppn: eduPersonPrincipalName,
-			});
+			// Check eppn
+			if (eduPersonPrincipalName) {
+				user = Meteor.users.findOne({
+					eppn: eduPersonPrincipalName,
+				});
 
-			if (user) {
-				eppnMatch = true;
+				if (user) {
+					eppnMatch = true;
+				}
 			}
-		}
 
-		let username;
-		if (loginResult.profile[usernameField]) {
-			const profileUsername = getProfileValue(loginResult.profile, usernameField, regexes.username);
-			if (profileUsername) {
-				username = Accounts.normalizeUsername(profileUsername);
+			let username;
+			if (loginResult.profile[usernameField]) {
+				const profileUsername = getProfileValue(loginResult.profile, usernameField, regexes.username);
+				if (profileUsername) {
+					username = Accounts.normalizeUsername(profileUsername);
+				}
 			}
-		}
 
-		// If eppn is not exist
-		if (!user) {
-			if (Accounts.saml.settings.immutableProperty === 'Username') {
-				if (username) {
+			// If eppn is not exist
+			if (!user) {
+				if (Accounts.saml.settings.immutableProperty === 'Username') {
+					if (username) {
+						user = Meteor.users.findOne({
+							username,
+						});
+					}
+				} else {
 					user = Meteor.users.findOne({
-						username,
+						'emails.address': emailRegex,
 					});
 				}
+			}
+
+			const emails = emailList.map((email) => ({
+				address: email,
+				verified: settings.get('Accounts_Verify_Email_For_External_Accounts'),
+			}));
+
+			let globalRoles;
+			if (roleAttributeName && loginResult.profile[roleAttributeName]) {
+				globalRoles = [].concat(loginResult.profile[roleAttributeName]);
 			} else {
-				user = Meteor.users.findOne({
-					'emails.address': emailRegex,
-				});
+				globalRoles = [].concat(defaultUserRole.split(','));
 			}
-		}
 
-		const emails = emailList.map((email) => ({
-			address: email,
-			verified: settings.get('Accounts_Verify_Email_For_External_Accounts'),
-		}));
+			if (!user) {
+				const newUser = {
+					name: fullName,
+					active: true,
+					eppn: eduPersonPrincipalName,
+					globalRoles,
+					emails,
+					services: {},
+				};
 
-		let globalRoles;
-		if (roleAttributeName && loginResult.profile[roleAttributeName]) {
-			globalRoles = [].concat(loginResult.profile[roleAttributeName]);
-		} else {
-			globalRoles = [].concat(defaultUserRole.split(','));
-		}
+				if (Accounts.saml.settings.generateUsername === true) {
+					username = generateUsernameSuggestion(newUser);
+				}
 
-		if (!user) {
-			const newUser = {
-				name: fullName,
-				active: true,
-				eppn: eduPersonPrincipalName,
-				globalRoles,
-				emails,
-				services: {},
-			};
+				if (username) {
+					newUser.username = username;
+					newUser.name = newUser.name || guessNameFromUsername(username);
+				}
 
-			if (Accounts.saml.settings.generateUsername === true) {
-				username = generateUsernameSuggestion(newUser);
-			}
+				const languages = TAPi18n.getLanguages();
+				if (languages[loginResult.profile.language]) {
+					newUser.language = loginResult.profile.language;
+				}
 
-			if (username) {
-				newUser.username = username;
-				newUser.name = newUser.name || guessNameFromUsername(username);
-			}
+				const userId = Accounts.insertUserDoc({}, newUser);
+				user = Meteor.users.findOne(userId);
 
-			const languages = TAPi18n.getLanguages();
-			if (languages[loginResult.profile.language]) {
-				newUser.language = loginResult.profile.language;
+				if (loginResult.profile.channels) {
+					const channels = loginResult.profile.channels.split(',');
+					Accounts.saml.subscribeToSAMLChannels(channels, user);
+				}
 			}
 
-			const userId = Accounts.insertUserDoc({}, newUser);
-			user = Meteor.users.findOne(userId);
-
-			if (loginResult.profile.channels) {
-				const channels = loginResult.profile.channels.split(',');
-				Accounts.saml.subscribeToSAMLChannels(channels, user);
+			// If eppn is not exist then update
+			if (eppnMatch === false) {
+				Meteor.users.update({
+					_id: user._id,
+				}, {
+					$set: {
+						eppn: eduPersonPrincipalName,
+					},
+				});
 			}
-		}
 
-		// If eppn is not exist then update
-		if (eppnMatch === false) {
-			Meteor.users.update({
-				_id: user._id,
-			}, {
-				$set: {
-					eppn: eduPersonPrincipalName,
+			// creating the token and adding to the user
+			const stampedToken = Accounts._generateStampedLoginToken();
+			Meteor.users.update(user, {
+				$push: {
+					'services.resume.loginTokens': stampedToken,
 				},
 			});
-		}
 
-		// creating the token and adding to the user
-		const stampedToken = Accounts._generateStampedLoginToken();
-		Meteor.users.update(user, {
-			$push: {
-				'services.resume.loginTokens': stampedToken,
-			},
-		});
+			const samlLogin = {
+				provider: Accounts.saml.RelayState,
+				idp: loginResult.profile.issuer,
+				idpSession: loginResult.profile.sessionIndex,
+				nameID: loginResult.profile.nameID,
+			};
 
-		const samlLogin = {
-			provider: Accounts.saml.RelayState,
-			idp: loginResult.profile.issuer,
-			idpSession: loginResult.profile.sessionIndex,
-			nameID: loginResult.profile.nameID,
-		};
+			const updateData = {
+				// TBD this should be pushed, otherwise we're only able to SSO into a single IDP at a time
+				'services.saml': samlLogin,
+			};
 
-		const updateData = {
-			// TBD this should be pushed, otherwise we're only able to SSO into a single IDP at a time
-			'services.saml': samlLogin,
-		};
+			for (const field in userDataFieldMap) {
+				if (!userDataFieldMap.hasOwnProperty(field)) {
+					continue;
+				}
 
-		for (const field in userDataFieldMap) {
-			if (!userDataFieldMap.hasOwnProperty(field)) {
-				continue;
+				if (loginResult.profile[field]) {
+					const rcField = userDataFieldMap[field];
+					const value = getProfileValue(loginResult.profile, field, regexes[rcField]);
+					updateData[`customFields.${ rcField }`] = value;
+				}
 			}
 
-			if (loginResult.profile[field]) {
-				const rcField = userDataFieldMap[field];
-				const value = getProfileValue(loginResult.profile, field, regexes[rcField]);
-				updateData[`customFields.${ rcField }`] = value;
+			if (Accounts.saml.settings.immutableProperty !== 'EMail') {
+				updateData.emails = emails;
 			}
-		}
-
-		if (Accounts.saml.settings.immutableProperty !== 'EMail') {
-			updateData.emails = emails;
-		}
 
-		if (roleAttributeSync) {
-			updateData.roles = globalRoles;
-		}
+			if (roleAttributeSync) {
+				updateData.roles = globalRoles;
+			}
 
-		Meteor.users.update({
-			_id: user._id,
-		}, {
-			$set: updateData,
-		});
+			Meteor.users.update({
+				_id: user._id,
+			}, {
+				$set: updateData,
+			});
 
-		if (username) {
-			_setUsername(user._id, username);
-		}
+			if (username) {
+				_setUsername(user._id, username);
+			}
 
-		overwriteData(user, fullName, eppnMatch, emailList);
+			overwriteData(user, fullName, eppnMatch, emailList);
 
-		// sending token along with the userId
-		const result = {
-			userId: user._id,
-			token: stampedToken.token,
-		};
+			// sending token along with the userId
+			const result = {
+				userId: user._id,
+				token: stampedToken.token,
+			};
 
-		return result;
+			return result;
+		} catch (error) {
+			console.error(error);
+			return {
+				type: 'saml',
+				error,
+			};
+		}
 	}
 	throw new Error('SAML Profile did not contain an email address');
 });
diff --git a/client/routes.js b/client/routes.js
index 08cd28a47ecf..d616b5deb29f 100644
--- a/client/routes.js
+++ b/client/routes.js
@@ -7,10 +7,11 @@ import { HTML } from 'meteor/htmljs';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 import { Session } from 'meteor/session';
+import toastr from 'toastr';
 
 import { KonchatNotification } from '../app/ui';
 import { ChatSubscription } from '../app/models';
-import { roomTypes } from '../app/utils';
+import { roomTypes, handleError } from '../app/utils';
 import { call } from '../app/ui-utils';
 import { createTemplateForComponent } from './createTemplateForComponent';
 
@@ -75,7 +76,16 @@ FlowRouter.route('/home', {
 					saml: true,
 					credentialToken: queryParams.saml_idp_credentialToken,
 				}],
-				userCallback() { BlazeLayout.render('main', { center: 'home' }); },
+				userCallback(error) {
+					if (error) {
+						if (error.reason) {
+							toastr.error(error.reason);
+						} else {
+							handleError(error);
+						}
+					}
+					BlazeLayout.render('main', { center: 'home' });
+				},
 			});
 		} else {
 			BlazeLayout.render('main', { center: 'home' });

From b7669f8651026527e27165c3492328cb731cb17e Mon Sep 17 00:00:00 2001
From: pierre-lehnen-rc <55164754+pierre-lehnen-rc@users.noreply.github.com>
Date: Wed, 8 Apr 2020 20:50:36 -0300
Subject: [PATCH 192/223] [FIX] Wrong SAML Response Signature Validation
 (#16922)

---
 .../server/saml_server.js                     |  28 +--
 app/meteor-accounts-saml/server/saml_utils.js | 184 ++++++++++++++----
 2 files changed, 160 insertions(+), 52 deletions(-)

diff --git a/app/meteor-accounts-saml/server/saml_server.js b/app/meteor-accounts-saml/server/saml_server.js
index 0b2c69bf16a1..15768ca68c34 100644
--- a/app/meteor-accounts-saml/server/saml_server.js
+++ b/app/meteor-accounts-saml/server/saml_server.js
@@ -229,6 +229,22 @@ const guessNameFromUsername = (username) =>
 		.replace(/^(.)/, (u) => u.toLowerCase())
 		.replace(/^\w/, (u) => u.toUpperCase());
 
+const findUser = (username, emailRegex) => {
+	if (Accounts.saml.settings.immutableProperty === 'Username') {
+		if (username) {
+			return Meteor.users.findOne({
+				username,
+			});
+		}
+
+		return null;
+	}
+
+	return Meteor.users.findOne({
+		'emails.address': emailRegex,
+	});
+};
+
 Accounts.registerLoginHandler(function(loginRequest) {
 	if (!loginRequest.saml || !loginRequest.credentialToken) {
 		return undefined;
@@ -279,17 +295,7 @@ Accounts.registerLoginHandler(function(loginRequest) {
 
 			// If eppn is not exist
 			if (!user) {
-				if (Accounts.saml.settings.immutableProperty === 'Username') {
-					if (username) {
-						user = Meteor.users.findOne({
-							username,
-						});
-					}
-				} else {
-					user = Meteor.users.findOne({
-						'emails.address': emailRegex,
-					});
-				}
+				user = findUser(username, emailRegex);
 			}
 
 			const emails = emailList.map((email) => ({
diff --git a/app/meteor-accounts-saml/server/saml_utils.js b/app/meteor-accounts-saml/server/saml_utils.js
index ac3a3d1ea08b..5c68621d281b 100644
--- a/app/meteor-accounts-saml/server/saml_utils.js
+++ b/app/meteor-accounts-saml/server/saml_utils.js
@@ -311,12 +311,8 @@ SAML.prototype.validateStatus = function(doc) {
 	};
 };
 
-SAML.prototype.validateSignature = function(xml, cert) {
+SAML.prototype.validateSignature = function(xml, cert, signature) {
 	const self = this;
-
-	const doc = new xmldom.DOMParser().parseFromString(xml);
-	const signature = xmlCrypto.xpath(doc, '//*[local-name(.)=\'Signature\' and namespace-uri(.)=\'http://www.w3.org/2000/09/xmldsig#\']')[0];
-
 	const sig = new xmlCrypto.SignedXml();
 
 	sig.keyInfoProvider = {
@@ -333,6 +329,35 @@ SAML.prototype.validateSignature = function(xml, cert) {
 	return sig.checkSignature(xml);
 };
 
+SAML.prototype.validateSignatureChildren = function(xml, cert, parent) {
+	const xpathSigQuery = ".//*[local-name(.)='Signature' and namespace-uri(.)='http://www.w3.org/2000/09/xmldsig#']";
+	const signatures = xmlCrypto.xpath(parent, xpathSigQuery);
+	let signature = null;
+
+	for (const sign of signatures) {
+		if (sign.parentNode !== parent) {
+			continue;
+		}
+
+		// Too many signatures
+		if (signature) {
+			return false;
+		}
+
+		signature = sign;
+	}
+
+	return this.validateSignature(xml, cert, signature);
+};
+
+SAML.prototype.validateResponseSignature = function(xml, cert, response) {
+	return this.validateSignatureChildren(xml, cert, response);
+};
+
+SAML.prototype.validateAssertionSignature = function(xml, cert, assertion) {
+	return this.validateSignatureChildren(xml, cert, assertion);
+};
+
 SAML.prototype.validateLogoutRequest = function(samlRequest, callback) {
 	const compressedSAMLRequest = new Buffer(samlRequest, 'base64');
 	zlib.inflateRaw(compressedSAMLRequest, function(err, decoded) {
@@ -464,6 +489,23 @@ SAML.prototype.mapAttributes = function(attributeStatement, profile) {
 	}
 };
 
+SAML.prototype.validateAssertionConditions = function(assertion) {
+	const conditions = assertion.getElementsByTagNameNS('urn:oasis:names:tc:SAML:2.0:assertion', 'Conditions')[0];
+	if (conditions && !this.validateNotBeforeNotOnOrAfterAssertions(conditions)) {
+		throw new Error('NotBefore / NotOnOrAfter assertion failed');
+	}
+};
+
+SAML.prototype.validateSubjectConditions = function(subject) {
+	const subjectConfirmation = subject.getElementsByTagNameNS('urn:oasis:names:tc:SAML:2.0:assertion', 'SubjectConfirmation')[0];
+	if (subjectConfirmation) {
+		const subjectConfirmationData = subjectConfirmation.getElementsByTagNameNS('urn:oasis:names:tc:SAML:2.0:assertion', 'SubjectConfirmationData')[0];
+		if (subjectConfirmationData && !this.validateNotBeforeNotOnOrAfterAssertions(subjectConfirmationData)) {
+			throw new Error('NotBefore / NotOnOrAfter assertion failed');
+		}
+	}
+};
+
 SAML.prototype.validateNotBeforeNotOnOrAfterAssertions = function(element) {
 	const sysnow = new Date();
 	const allowedclockdrift = this.options.allowedClockDrift;
@@ -491,6 +533,76 @@ SAML.prototype.validateNotBeforeNotOnOrAfterAssertions = function(element) {
 	return true;
 };
 
+SAML.prototype.getAssertion = function(response) {
+	const allAssertions = response.getElementsByTagNameNS('urn:oasis:names:tc:SAML:2.0:assertion', 'Assertion');
+	const allEncrypedAssertions = response.getElementsByTagNameNS('urn:oasis:names:tc:SAML:2.0:assertion', 'EncryptedAssertion');
+
+	if (allAssertions.length + allEncrypedAssertions.length > 1) {
+		throw new Error('Too many SAML assertions');
+	}
+
+	let assertion = allAssertions[0];
+	const encAssertion = allEncrypedAssertions[0];
+
+
+	if (typeof encAssertion !== 'undefined') {
+		const options = { key: this.options.privateKey };
+		xmlenc.decrypt(encAssertion.getElementsByTagNameNS('*', 'EncryptedData')[0], options, function(err, result) {
+			assertion = new xmldom.DOMParser().parseFromString(result, 'text/xml');
+		});
+	}
+
+	if (!assertion) {
+		throw new Error('Missing SAML assertion');
+	}
+
+	return assertion;
+};
+
+SAML.prototype.verifySignatures = function(response, assertion, xml) {
+	if (!this.options.cert) {
+		return;
+	}
+
+	debugLog('Verify Document Signature');
+	if (!this.validateResponseSignature(xml, this.options.cert, response)) {
+		debugLog('Document Signature WRONG');
+		throw new Error('Invalid Signature');
+	}
+	debugLog('Document Signature OK');
+
+	debugLog('Verify Assertion Signature');
+	if (!this.validateAssertionSignature(xml, this.options.cert, assertion)) {
+		debugLog('Assertion Signature WRONG');
+		throw new Error('Invalid Assertion signature');
+	}
+	debugLog('Assertion Signature OK');
+};
+
+SAML.prototype.getSubject = function(assertion) {
+	let subject = assertion.getElementsByTagNameNS('urn:oasis:names:tc:SAML:2.0:assertion', 'Subject')[0];
+	const encSubject = assertion.getElementsByTagNameNS('urn:oasis:names:tc:SAML:2.0:assertion', 'EncryptedID')[0];
+
+	if (typeof encSubject !== 'undefined') {
+		const options = { key: this.options.privateKey };
+		xmlenc.decrypt(encSubject.getElementsByTagNameNS('*', 'EncryptedData')[0], options, function(err, result) {
+			subject = new xmldom.DOMParser().parseFromString(result, 'text/xml');
+		});
+	}
+
+	return subject;
+};
+
+SAML.prototype.getIssuer = function(assertion) {
+	const issuers = assertion.getElementsByTagNameNS('urn:oasis:names:tc:SAML:2.0:assertion', 'Issuer');
+
+	if (issuers.length > 1) {
+		throw new Error('Too many Issuers');
+	}
+
+	return issuers[0];
+};
+
 SAML.prototype.validateResponse = function(samlResponse, relayState, callback) {
 	const self = this;
 	const xml = new Buffer(samlResponse, 'base64').toString('utf8');
@@ -510,15 +622,12 @@ SAML.prototype.validateResponse = function(samlResponse, relayState, callback) {
 	}
 	debugLog('Status ok');
 
-	// Verify signature
-	debugLog('Verify signature');
-	if (self.options.cert && !self.validateSignature(xml, self.options.cert)) {
-		debugLog('Signature WRONG');
-		return callback(new Error('Invalid signature'), null, false);
+	const allResponses = doc.getElementsByTagNameNS('urn:oasis:names:tc:SAML:2.0:protocol', 'Response');
+	if (allResponses.length !== 1) {
+		return callback(new Error('Too many SAML responses'), null, false);
 	}
-	debugLog('Signature OK');
 
-	const response = doc.getElementsByTagNameNS('urn:oasis:names:tc:SAML:2.0:protocol', 'Response')[0];
+	const response = allResponses[0];
 	if (!response) {
 		const logoutResponse = doc.getElementsByTagNameNS('urn:oasis:names:tc:SAML:2.0:protocol', 'LogoutResponse');
 
@@ -529,19 +638,15 @@ SAML.prototype.validateResponse = function(samlResponse, relayState, callback) {
 	}
 	debugLog('Got response');
 
-	let assertion = response.getElementsByTagNameNS('urn:oasis:names:tc:SAML:2.0:assertion', 'Assertion')[0];
-	const encAssertion = response.getElementsByTagNameNS('urn:oasis:names:tc:SAML:2.0:assertion', 'EncryptedAssertion')[0];
+	let assertion;
+	let issuer;
 
-	const options = { key: this.options.privateKey };
+	try {
+		assertion = this.getAssertion(response, callback);
 
-	if (typeof encAssertion !== 'undefined') {
-		xmlenc.decrypt(encAssertion.getElementsByTagNameNS('*', 'EncryptedData')[0], options, function(err, result) {
-			assertion = new xmldom.DOMParser().parseFromString(result, 'text/xml');
-		});
-	}
-
-	if (!assertion) {
-		return callback(new Error('Missing SAML assertion'), null, false);
+		this.verifySignatures(response, assertion, xml);
+	} catch (e) {
+		return callback(e, null, false);
 	}
 
 	const profile = {};
@@ -550,19 +655,17 @@ SAML.prototype.validateResponse = function(samlResponse, relayState, callback) {
 		profile.inResponseToId = response.getAttribute('InResponseTo');
 	}
 
-	const issuer = assertion.getElementsByTagNameNS('urn:oasis:names:tc:SAML:2.0:assertion', 'Issuer')[0];
+	try {
+		issuer = this.getIssuer(assertion);
+	} catch (e) {
+		return callback(e, null, false);
+	}
+
 	if (issuer) {
 		profile.issuer = issuer.textContent;
 	}
 
-	let subject = assertion.getElementsByTagNameNS('urn:oasis:names:tc:SAML:2.0:assertion', 'Subject')[0];
-	const encSubject = assertion.getElementsByTagNameNS('urn:oasis:names:tc:SAML:2.0:assertion', 'EncryptedID')[0];
-
-	if (typeof encSubject !== 'undefined') {
-		xmlenc.decrypt(encSubject.getElementsByTagNameNS('*', 'EncryptedData')[0], options, function(err, result) {
-			subject = new xmldom.DOMParser().parseFromString(result, 'text/xml');
-		});
-	}
+	const subject = this.getSubject(assertion);
 
 	if (subject) {
 		const nameID = subject.getElementsByTagNameNS('urn:oasis:names:tc:SAML:2.0:assertion', 'NameID')[0];
@@ -574,18 +677,17 @@ SAML.prototype.validateResponse = function(samlResponse, relayState, callback) {
 			}
 		}
 
-		const subjectConfirmation = subject.getElementsByTagNameNS('urn:oasis:names:tc:SAML:2.0:assertion', 'SubjectConfirmation')[0];
-		if (subjectConfirmation) {
-			const subjectConfirmationData = subjectConfirmation.getElementsByTagNameNS('urn:oasis:names:tc:SAML:2.0:assertion', 'SubjectConfirmationData')[0];
-			if (subjectConfirmationData && !this.validateNotBeforeNotOnOrAfterAssertions(subjectConfirmationData)) {
-				return callback(new Error('NotBefore / NotOnOrAfter assertion failed'), null, false);
-			}
+		try {
+			this.validateSubjectConditions(subject);
+		} catch (e) {
+			return callback(e, null, false);
 		}
 	}
 
-	const conditions = assertion.getElementsByTagNameNS('urn:oasis:names:tc:SAML:2.0:assertion', 'Conditions')[0];
-	if (conditions && !this.validateNotBeforeNotOnOrAfterAssertions(conditions)) {
-		return callback(new Error('NotBefore / NotOnOrAfter assertion failed'), null, false);
+	try {
+		this.validateAssertionConditions(assertion);
+	} catch (e) {
+		return callback(e, null, false);
 	}
 
 	const authnStatement = assertion.getElementsByTagNameNS('urn:oasis:names:tc:SAML:2.0:assertion', 'AuthnStatement')[0];

From e5aee3dcc8106f4c27551662520604ca26e72cd3 Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Wed, 8 Apr 2020 20:59:40 -0300
Subject: [PATCH 193/223] Removed the invalid and unnecessary parameter
 clientAction. (#17224)

---
 server/publications/room/emitter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/publications/room/emitter.js b/server/publications/room/emitter.js
index 82a489e12096..ad5dabb524fe 100644
--- a/server/publications/room/emitter.js
+++ b/server/publications/room/emitter.js
@@ -26,7 +26,7 @@ Rooms.on('change', ({ clientAction, id, data }) => {
 		return;
 	}
 	if (clientAction === 'removed') {
-		getSubscriptions(clientAction, id).forEach(({ u }) => {
+		getSubscriptions(id).forEach(({ u }) => {
 			Notifications.notifyUserInThisInstance(
 				u._id,
 				'rooms-changed',

From b5b74e8aa889888d6ea93b7120c3143da517ed67 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Wed, 8 Apr 2020 23:18:04 -0300
Subject: [PATCH 194/223] Collect metrics about meteor facts (#17216)

---
 .meteor/packages                  | 1 +
 .meteor/versions                  | 1 +
 app/metrics/server/lib/metrics.js | 8 ++++++++
 3 files changed, 10 insertions(+)

diff --git a/.meteor/packages b/.meteor/packages
index 4ffeb0af3f1a..e1895f9bc43e 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -97,3 +97,4 @@ webapp-hashing@1.0.9
 rocketchat:oauth2-server
 rocketchat:i18n
 dandv:caret-position
+facts-base
diff --git a/.meteor/versions b/.meteor/versions
index dd8bf4367eed..ee1d117926a6 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -43,6 +43,7 @@ ejson@1.1.1
 email@1.2.3
 es5-shim@4.8.0
 facebook-oauth@1.6.0
+facts-base@1.0.1
 fastclick@1.0.13
 fetch@0.1.1
 geojson-utils@1.0.10
diff --git a/app/metrics/server/lib/metrics.js b/app/metrics/server/lib/metrics.js
index 6dad7c38be2d..a3d5de8c8dbe 100644
--- a/app/metrics/server/lib/metrics.js
+++ b/app/metrics/server/lib/metrics.js
@@ -5,6 +5,7 @@ import connect from 'connect';
 import _ from 'underscore';
 import gcStats from 'prometheus-gc-stats';
 import { Meteor } from 'meteor/meteor';
+import { Facts } from 'meteor/facts-base';
 
 import { Info, getOplogInfo } from '../../../utils/server';
 import { Migrations } from '../../../migrations';
@@ -99,6 +100,13 @@ metrics.totalPrivateGroupMessages = new client.Gauge({ name: 'rocketchat_private
 metrics.totalDirectMessages = new client.Gauge({ name: 'rocketchat_direct_messages_total', help: 'total of messages in direct rooms' });
 metrics.totalLivechatMessages = new client.Gauge({ name: 'rocketchat_livechat_messages_total', help: 'total of messages in livechat rooms' });
 
+// Meteor Facts
+metrics.meteorFacts = new client.Gauge({ name: 'rocketchat_meteor_facts', labelNames: ['pkg', 'fact'], help: 'internal meteor facts' });
+
+Facts.incrementServerFact = function(pkg, fact, increment) {
+	metrics.meteorFacts.inc({ pkg, fact }, increment);
+};
+
 const setPrometheusData = async () => {
 	metrics.info.set({
 		version: Info.version,

From 7692896441d1b5bb884b3f4298e7bc6ea9c1b7c8 Mon Sep 17 00:00:00 2001
From: pierre-lehnen-rc <55164754+pierre-lehnen-rc@users.noreply.github.com>
Date: Wed, 8 Apr 2020 23:18:31 -0300
Subject: [PATCH 195/223] [FIX] Random errors on SAML logout (#17227)

---
 app/meteor-accounts-saml/client/saml_client.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/meteor-accounts-saml/client/saml_client.js b/app/meteor-accounts-saml/client/saml_client.js
index 0e4e06d93bd7..0c30b46093c6 100644
--- a/app/meteor-accounts-saml/client/saml_client.js
+++ b/app/meteor-accounts-saml/client/saml_client.js
@@ -58,8 +58,12 @@ Meteor.logoutWithSaml = function(options/* , callback*/) {
 			MeteorLogout.apply(Meteor);
 			return;
 		}
+
+		// Remove the userId from the client to prevent calls to the server while the logout is processed.
+		// If the logout fails, the userId will be reloaded on the resume call
+		Meteor._localStorage.removeItem(Accounts.USER_ID_KEY);
+
 		// A nasty bounce: 'result' has the SAML LogoutRequest but we need a proper 302 to redirected from the server.
-		// window.location.replace(Meteor.absoluteUrl('_saml/sloRedirect/' + options.provider + '/?redirect='+result));
 		window.location.replace(Meteor.absoluteUrl(`_saml/sloRedirect/${ options.provider }/?redirect=${ encodeURIComponent(result) }`));
 	});
 };

From b97e2140d7aae1ab0b9fb9f5ead5183c9e009cc9 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Wed, 8 Apr 2020 23:20:45 -0300
Subject: [PATCH 196/223] Bump version to 3.1.0-rc.12

---
 .docker/Dockerfile.rhel   |  2 +-
 .github/history.json      | 55 +++++++++++++++++++++++++++++++++++++++
 HISTORY.md                | 28 ++++++++++++++++++++
 app/utils/rocketchat.info |  2 +-
 package.json              |  2 +-
 5 files changed, 86 insertions(+), 3 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 4df973d8a41c..0a0cad2bf47d 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.1.0-rc.11
+ENV RC_VERSION 3.1.0-rc.12
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index 201edb648e08..8b810aadc269 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -42285,6 +42285,61 @@
           ]
         }
       ]
+    },
+    "3.1.0-rc.12": {
+      "node_version": "12.16.1",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "17227",
+          "title": "[FIX] Random errors on SAML logout",
+          "userLogin": "pierre-lehnen-rc",
+          "contributors": [
+            "pierre-lehnen-rc"
+          ]
+        },
+        {
+          "pr": "17216",
+          "title": "Collect metrics about meteor facts",
+          "userLogin": "rodrigok",
+          "milestone": "3.1.0",
+          "contributors": [
+            "rodrigok"
+          ]
+        },
+        {
+          "pr": "17224",
+          "title": "[FIX] Room event emitter passing an invalid parameter when finding removed subscriptions",
+          "userLogin": "renatobecker",
+          "milestone": "3.1.0",
+          "contributors": [
+            "renatobecker"
+          ]
+        },
+        {
+          "pr": "16922",
+          "title": "[FIX] Wrong SAML Response Signature Validation",
+          "userLogin": "pierre-lehnen-rc",
+          "milestone": "3.1.0",
+          "contributors": [
+            "pierre-lehnen-rc"
+          ]
+        },
+        {
+          "pr": "17219",
+          "title": "[FIX] SAML login errors not showing on UI",
+          "userLogin": "pierre-lehnen-rc",
+          "milestone": "3.1.0",
+          "contributors": [
+            "pierre-lehnen-rc"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/HISTORY.md b/HISTORY.md
index 47bdaa9d9bc9..70fc22035330 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,6 +1,34 @@
 
 # 3.1.0 (Under Release Candidate Process)
 
+## 3.1.0-rc.12
+`2020-04-08  ·  4 🐛  ·  1 🔍  ·  3 👩‍💻👨‍💻`
+
+### 🐛 Bug fixes
+
+
+- Random errors on SAML logout ([#17227](https://github.com/RocketChat/Rocket.Chat/pull/17227))
+
+- Room event emitter passing an invalid parameter when finding removed subscriptions ([#17224](https://github.com/RocketChat/Rocket.Chat/pull/17224))
+
+- Wrong SAML Response Signature Validation ([#16922](https://github.com/RocketChat/Rocket.Chat/pull/16922))
+
+- SAML login errors not showing on UI ([#17219](https://github.com/RocketChat/Rocket.Chat/pull/17219))
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Collect metrics about meteor facts ([#17216](https://github.com/RocketChat/Rocket.Chat/pull/17216))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@pierre-lehnen-rc](https://github.com/pierre-lehnen-rc)
+- [@renatobecker](https://github.com/renatobecker)
+- [@rodrigok](https://github.com/rodrigok)
+
 ## 3.1.0-rc.11
 `2020-04-07  ·  1 🔍  ·  1 👩‍💻👨‍💻`
 
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index d4d991a7ecb8..4f3fbd2ba384 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.1.0-rc.11"
+	"version": "3.1.0-rc.12"
 }
diff --git a/package.json b/package.json
index 5c66684a3f81..1e44264c63db 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.1.0-rc.11",
+	"version": "3.1.0-rc.12",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

From f1053b040925fb328b2307612a953e35880e85bc Mon Sep 17 00:00:00 2001
From: erosenthal <eric.rosenthal@viasat.com>
Date: Thu, 9 Apr 2020 13:05:48 -0400
Subject: [PATCH 197/223] deploy every pr tag to prod ECR as well as DEV for
 now

---
 .github/workflows/build_and_test.yml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 55f1116bc9db..a5565a2f2b02 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -507,7 +507,7 @@ jobs:
         rm Rocket.Chat.tar.gz
         cp "${GITHUB_WORKSPACE}/.docker/Dockerfile" .
 
-    - name: AWS Deploy to ECR
+    - name: AWS Deploy to ECR in DEV
       if: github.event_name == 'pull_request'
 
       uses: Terranovax/aws-ecr-deploy@v1
@@ -521,3 +521,18 @@ jobs:
         repo: widechat
         tags: ${{ env.PR_TAG }}
 
+    ## Temporarily we will deploy the PR tags to PROD as well as DEV
+    - name: AWS Deploy to ECR in PROD
+      if: github.event_name == 'pull_request'
+
+      uses: Terranovax/aws-ecr-deploy@v1
+      with:
+        access_key_id: ${{ secrets.AWS_PROD_ACCESS_KEY_ID }}
+        secret_access_key: ${{ secrets.AWS_PROD_SECRET_ACCESS_KEY }}
+        account_id: ${{ secrets.AWS_PROD_ACCOUNT_ID }}
+        region: us-east-1
+        dockerfile: /tmp/build/Dockerfile
+        path: /tmp/build
+        repo: widechat
+        tags: ${{ env.PR_TAG }}
+

From 76a1160713da7e9127b7eb01a97b25e585399eac Mon Sep 17 00:00:00 2001
From: gabriellsh <40830821+gabriellsh@users.noreply.github.com>
Date: Thu, 9 Apr 2020 18:10:17 -0300
Subject: [PATCH 198/223] [CHORE] Use REST API for sending audio messages
 (#17237)

---
 .../messageBox/messageBoxAudioMessage.js      |  76 +--------
 app/ui/client/lib/fileUpload.js               | 149 +++++++++---------
 2 files changed, 78 insertions(+), 147 deletions(-)

diff --git a/app/ui-message/client/messageBox/messageBoxAudioMessage.js b/app/ui-message/client/messageBox/messageBoxAudioMessage.js
index 1bcf4f8c7df8..a96832d1b01c 100644
--- a/app/ui-message/client/messageBox/messageBoxAudioMessage.js
+++ b/app/ui-message/client/messageBox/messageBoxAudioMessage.js
@@ -1,12 +1,9 @@
 import { ReactiveVar } from 'meteor/reactive-var';
-import { Session } from 'meteor/session';
-import { Tracker } from 'meteor/tracker';
 import { Template } from 'meteor/templating';
 
-import { fileUploadHandler } from '../../../file-upload';
+import { uploadFileWithMessage } from '../../../ui/client/lib/fileUpload';
 import { settings } from '../../../settings';
 import { AudioRecorder } from '../../../ui';
-import { call } from '../../../ui-utils';
 import { t } from '../../../utils';
 import './messageBoxAudioMessage.html';
 
@@ -15,74 +12,6 @@ const startRecording = () => new Promise((resolve, reject) =>
 
 const stopRecording = () => new Promise((resolve) => AudioRecorder.stop(resolve));
 
-const registerUploadProgress = (upload) => {
-	const uploads = Session.get('uploading') || [];
-	Session.set('uploading', [...uploads, {
-		id: upload.id,
-		name: upload.getFileName(),
-		percentage: 0,
-	}]);
-};
-
-const updateUploadProgress = (upload, { progress, error: { message: error } = {} }) => {
-	const uploads = Session.get('uploading') || [];
-	const item = uploads.find(({ id }) => id === upload.id) || {
-		id: upload.id,
-		name: upload.getFileName(),
-	};
-	item.percentage = Math.round(progress * 100) || 0;
-	item.error = error;
-	Session.set('uploading', uploads);
-};
-
-const unregisterUploadProgress = (upload) => setTimeout(() => {
-	const uploads = Session.get('uploading') || [];
-	Session.set('uploading', uploads.filter(({ id }) => id !== upload.id));
-}, 2000);
-
-const uploadRecord = async ({ rid, tmid, blob }) => {
-	const upload = fileUploadHandler('Uploads', {
-		name: `${ t('Audio record') }.mp3`,
-		size: blob.size,
-		type: 'audio/mpeg',
-		rid,
-		description: '',
-	}, blob);
-
-	upload.onProgress = (progress) => {
-		updateUploadProgress(upload, { progress });
-	};
-
-	registerUploadProgress(upload);
-
-	try {
-		const [file, storage] = await new Promise((resolve, reject) => {
-			upload.start((error, ...args) => (error ? reject(error) : resolve(args)));
-		});
-
-		await call('sendFileMessage', rid, storage, file, { tmid });
-
-		unregisterUploadProgress(upload);
-	} catch (error) {
-		updateUploadProgress(upload, { error, progress: 0 });
-		unregisterUploadProgress(upload);
-	}
-
-	Tracker.autorun((c) => {
-		const cancel = Session.get(`uploading-cancel-${ upload.id }`);
-
-		if (!cancel) {
-			return;
-		}
-
-		upload.stop();
-		c.stop();
-
-		updateUploadProgress(upload, { progress: 0 });
-		unregisterUploadProgress(upload);
-	});
-};
-
 const recordingInterval = new ReactiveVar(null);
 const recordingRoomId = new ReactiveVar(null);
 
@@ -206,6 +135,7 @@ Template.messageBoxAudioMessage.events({
 		instance.state.set(null);
 
 		const { rid, tmid } = this;
-		await uploadRecord({ rid, tmid, blob });
+
+		await uploadFileWithMessage(rid, tmid, { file: { file: blob }, fileName: `${ t('Audio record') }.mp3` });
 	},
 });
diff --git a/app/ui/client/lib/fileUpload.js b/app/ui/client/lib/fileUpload.js
index dae0bd618a10..41107998582d 100644
--- a/app/ui/client/lib/fileUpload.js
+++ b/app/ui/client/lib/fileUpload.js
@@ -16,6 +16,75 @@ const readAsDataURL = (file, callback) => {
 	return reader.readAsDataURL(file);
 };
 
+export const uploadFileWithMessage = async (rid, tmid, { description, fileName, msg, file }) => {
+	const data = new FormData();
+	description	&& data.append('description', description);
+	msg	&& data.append('msg', msg);
+	tmid && data.append('tmid', tmid);
+	data.append('file', file.file, fileName);
+
+	const uploads = Session.get('uploading') || [];
+
+	const upload = {
+		id: Random.id(),
+		name: fileName,
+		percentage: 0,
+	};
+
+	uploads.push(upload);
+	Session.set('uploading', uploads);
+
+	const { xhr, promise } = APIClient.upload(`v1/rooms.upload/${ rid }`, {}, data, {
+		progress(progress) {
+			const uploads = Session.get('uploading') || [];
+
+			if (progress === 100) {
+				return;
+			}
+			uploads.filter((u) => u.id === upload.id).forEach((u) => {
+				u.percentage = Math.round(progress) || 0;
+			});
+			Session.set('uploading', uploads);
+		},
+		error(error) {
+			const uploads = Session.get('uploading') || [];
+			uploads.filter((u) => u.id === upload.id).forEach((u) => {
+				u.error = error.message;
+				u.percentage = 0;
+			});
+			Session.set('uploading', uploads);
+		},
+	});
+
+	Tracker.autorun((computation) => {
+		const isCanceling = Session.get(`uploading-cancel-${ upload.id }`);
+		if (!isCanceling) {
+			return;
+		}
+		computation.stop();
+		Session.delete(`uploading-cancel-${ upload.id }`);
+
+		xhr.abort();
+
+		const uploads = Session.get('uploading') || {};
+		Session.set('uploading', uploads.filter((u) => u.id !== upload.id));
+	});
+
+	try {
+		await promise;
+		const uploads = Session.get('uploading') || [];
+		return Session.set('uploading', uploads.filter((u) => u.id !== upload.id));
+	} catch (error) {
+		const uploads = Session.get('uploading') || [];
+		uploads.filter((u) => u.id === upload.id).forEach((u) => {
+			u.error = (error.xhr && error.xhr.responseJSON && error.xhr.responseJSON.error) || error.message;
+			u.percentage = 0;
+		});
+		Session.set('uploading', uploads);
+	}
+};
+
+
 const showUploadPreview = (file, callback) => {
 	// If greater then 10MB don't try and show a preview
 	if (file.file.size > (10 * 1000000)) {
@@ -197,84 +266,16 @@ export const fileUpload = async (files, input, { rid, tmid }) => {
 				return;
 			}
 
-			const record = {
-				name: document.getElementById('file-name').value || file.name || file.file.name,
-				size: file.file.size,
-				type: file.file.type,
-				rid,
-				description: document.getElementById('file-description').value,
-			};
-
 			const fileName = document.getElementById('file-name').value || file.name || file.file.name;
 
-			const data = new FormData();
-			record.description && data.append('description', record.description);
-			msg && data.append('msg', msg);
-			tmid && data.append('tmid', tmid);
-			data.append('file', file.file, fileName);
-
-
-			const uploads = Session.get('uploading') || [];
-
-			const upload = {
-				id: Random.id(),
-				name: fileName,
-				percentage: 0,
-			};
-
-			uploads.push(upload);
-			Session.set('uploading', uploads);
-
-			uploadNextFile();
-
-			const { xhr, promise } = APIClient.upload(`v1/rooms.upload/${ rid }`, {}, data, {
-				progress(progress) {
-					const uploads = Session.get('uploading') || [];
-
-					if (progress === 100) {
-						return;
-					}
-					uploads.filter((u) => u.id === upload.id).forEach((u) => {
-						u.percentage = Math.round(progress) || 0;
-					});
-					Session.set('uploading', uploads);
-				},
-				error(error) {
-					const uploads = Session.get('uploading') || [];
-					uploads.filter((u) => u.id === upload.id).forEach((u) => {
-						u.error = error.message;
-						u.percentage = 0;
-					});
-					Session.set('uploading', uploads);
-				},
-			});
-
-			Tracker.autorun((computation) => {
-				const isCanceling = Session.get(`uploading-cancel-${ upload.id }`);
-				if (!isCanceling) {
-					return;
-				}
-				computation.stop();
-				Session.delete(`uploading-cancel-${ upload.id }`);
-
-				xhr.abort();
-
-				const uploads = Session.get('uploading') || {};
-				Session.set('uploading', uploads.filter((u) => u.id !== upload.id));
+			uploadFileWithMessage(rid, tmid, {
+				description: document.getElementById('file-description').value || undefined,
+				fileName,
+				msg: msg || undefined,
+				file,
 			});
 
-			try {
-				await promise;
-				const uploads = Session.get('uploading') || [];
-				return Session.set('uploading', uploads.filter((u) => u.id !== upload.id));
-			} catch (error) {
-				const uploads = Session.get('uploading') || [];
-				uploads.filter((u) => u.id === upload.id).forEach((u) => {
-					u.error = (error.xhr && error.xhr.responseJSON && error.xhr.responseJSON.error) || error.message;
-					u.percentage = 0;
-				});
-				Session.set('uploading', uploads);
-			}
+			uploadNextFile();
 		}));
 	};
 

From b61ba90c340142a54e8358f64934a3d8c7750bed Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Thu, 9 Apr 2020 19:16:57 -0300
Subject: [PATCH 199/223] Fix self DM (#17239)

---
 app/lib/server/functions/createDirectRoom.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/lib/server/functions/createDirectRoom.js b/app/lib/server/functions/createDirectRoom.js
index c8b5cd5cf081..93aaa63a4602 100644
--- a/app/lib/server/functions/createDirectRoom.js
+++ b/app/lib/server/functions/createDirectRoom.js
@@ -34,14 +34,14 @@ export const createDirectRoom = function(members, roomExtraData = {}, options =
 	const uids = members.map(({ _id }) => _id).sort();
 
 	// Deprecated: using users' _id to compose the room _id is deprecated
-	const room = uids.length <= 2
+	const room = uids.length === 2
 		? Rooms.findOneById(uids.join(''), { fields: { _id: 1 } })
 		: Rooms.findOneDirectRoomContainingAllUserIDs(uids, { fields: { _id: 1 } });
 
 	const isNewRoom = !room;
 
 	const rid = room?._id || Rooms.insert({
-		...uids.length <= 2 && { _id: uids.join('') }, // Deprecated: using users' _id to compose the room _id is deprecated
+		...uids.length === 2 && { _id: uids.join('') }, // Deprecated: using users' _id to compose the room _id is deprecated
 		t: 'd',
 		usernames,
 		usersCount: members.length,

From 8f2e89e8881a0873e8b716b1db8bce70d5ea2171 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Thu, 9 Apr 2020 19:43:31 -0300
Subject: [PATCH 200/223] Bump version to 3.1.0-rc.13

---
 .docker/Dockerfile.rhel   |  2 +-
 .github/history.json      | 28 ++++++++++++++++++++++++++++
 HISTORY.md                | 19 +++++++++++++++++++
 app/utils/rocketchat.info |  2 +-
 package.json              |  2 +-
 5 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 0a0cad2bf47d..204b8694ad8e 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.1.0-rc.12
+ENV RC_VERSION 3.1.0-rc.13
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index 8b810aadc269..09590dbf580d 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -42340,6 +42340,34 @@
           ]
         }
       ]
+    },
+    "3.1.0-rc.13": {
+      "node_version": "12.16.1",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "17239",
+          "title": "Fix self DMs created during release candidate",
+          "userLogin": "sampaiodiego",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "17237",
+          "title": "[CHORE] Use REST API for sending audio messages",
+          "userLogin": "gabriellsh",
+          "contributors": [
+            "gabriellsh",
+            "ggazzo"
+          ]
+        }
+      ]
     }
   }
 }
\ No newline at end of file
diff --git a/HISTORY.md b/HISTORY.md
index 70fc22035330..5c37d014ce9c 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,6 +1,25 @@
 
 # 3.1.0 (Under Release Candidate Process)
 
+## 3.1.0-rc.13
+`2020-04-09  ·  2 🔍  ·  3 👩‍💻👨‍💻`
+
+<details>
+<summary>🔍 Minor changes</summary>
+
+
+- Fix self DMs created during release candidate ([#17239](https://github.com/RocketChat/Rocket.Chat/pull/17239))
+
+- [CHORE] Use REST API for sending audio messages ([#17237](https://github.com/RocketChat/Rocket.Chat/pull/17237))
+
+</details>
+
+### 👩‍💻👨‍💻 Core Team 🤓
+
+- [@gabriellsh](https://github.com/gabriellsh)
+- [@ggazzo](https://github.com/ggazzo)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
 ## 3.1.0-rc.12
 `2020-04-08  ·  4 🐛  ·  1 🔍  ·  3 👩‍💻👨‍💻`
 
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index 4f3fbd2ba384..14168374f4e2 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.1.0-rc.12"
+	"version": "3.1.0-rc.13"
 }
diff --git a/package.json b/package.json
index 1e44264c63db..057659f699eb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.1.0-rc.12",
+	"version": "3.1.0-rc.13",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

From f07507bdb6245082418c3730cd16a6b041f6af11 Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Thu, 9 Apr 2020 19:46:37 -0300
Subject: [PATCH 201/223] Bump version to 3.1.0

---
 .docker/Dockerfile.rhel   |    2 +-
 .github/history.json      |   31 +-
 HISTORY.md                | 1059 ++++++++++---------------------------
 app/utils/rocketchat.info |    2 +-
 package.json              |    2 +-
 5 files changed, 298 insertions(+), 798 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index 204b8694ad8e..e0084ee1a1b6 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.1.0-rc.13
+ENV RC_VERSION 3.1.0
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/.github/history.json b/.github/history.json
index dab40bd5fb7f..a77a23b8ba67 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -42368,6 +42368,35 @@
           ]
         }
       ]
+    },
+    "3.1.0": {
+      "node_version": "12.16.1",
+      "npm_version": "6.13.4",
+      "mongo_versions": [
+        "3.4",
+        "3.6",
+        "4.0"
+      ],
+      "pull_requests": [
+        {
+          "pr": "17158",
+          "title": "Release 3.0.12",
+          "userLogin": "sampaiodiego",
+          "contributors": [
+            "rodrigok",
+            "sampaiodiego"
+          ]
+        },
+        {
+          "pr": "17093",
+          "title": "[FIX] Apps Engine notifyRoom sending notification to wrong users",
+          "userLogin": "sampaiodiego",
+          "milestone": "3.0.9",
+          "contributors": [
+            "sampaiodiego"
+          ]
+        }
+      ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/HISTORY.md b/HISTORY.md
index a73dd33edd8b..81183dfee7ec 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,400 +1,11 @@
 
-# 3.1.0 (Under Release Candidate Process)
+# 3.1.0
+`2020-04-09  ·  23 🎉  ·  22 🚀  ·  71 🐛  ·  86 🔍  ·  41 👩‍💻👨‍💻`
 
-## 3.1.0-rc.13
-`2020-04-09  ·  2 🔍  ·  3 👩‍💻👨‍💻`
-
-<details>
-<summary>🔍 Minor changes</summary>
-
-
-- Fix self DMs created during release candidate ([#17239](https://github.com/RocketChat/Rocket.Chat/pull/17239))
-
-- [CHORE] Use REST API for sending audio messages ([#17237](https://github.com/RocketChat/Rocket.Chat/pull/17237))
-
-</details>
-
-### 👩‍💻👨‍💻 Core Team 🤓
-
-- [@gabriellsh](https://github.com/gabriellsh)
-- [@ggazzo](https://github.com/ggazzo)
-- [@sampaiodiego](https://github.com/sampaiodiego)
-
-## 3.1.0-rc.12
-`2020-04-08  ·  4 🐛  ·  1 🔍  ·  3 👩‍💻👨‍💻`
-
-### 🐛 Bug fixes
-
-
-- Random errors on SAML logout ([#17227](https://github.com/RocketChat/Rocket.Chat/pull/17227))
-
-- Room event emitter passing an invalid parameter when finding removed subscriptions ([#17224](https://github.com/RocketChat/Rocket.Chat/pull/17224))
-
-- Wrong SAML Response Signature Validation ([#16922](https://github.com/RocketChat/Rocket.Chat/pull/16922))
-
-- SAML login errors not showing on UI ([#17219](https://github.com/RocketChat/Rocket.Chat/pull/17219))
-
-<details>
-<summary>🔍 Minor changes</summary>
-
-
-- Collect metrics about meteor facts ([#17216](https://github.com/RocketChat/Rocket.Chat/pull/17216))
-
-</details>
-
-### 👩‍💻👨‍💻 Core Team 🤓
-
-- [@pierre-lehnen-rc](https://github.com/pierre-lehnen-rc)
-- [@renatobecker](https://github.com/renatobecker)
-- [@rodrigok](https://github.com/rodrigok)
-
-## 3.1.0-rc.11
-`2020-04-07  ·  1 🔍  ·  1 👩‍💻👨‍💻`
-
-<details>
-<summary>🔍 Minor changes</summary>
-
-
-- Add statistics and metrics about push queue ([#17208](https://github.com/RocketChat/Rocket.Chat/pull/17208))
-
-</details>
-
-### 👩‍💻👨‍💻 Core Team 🤓
-
-- [@rodrigok](https://github.com/rodrigok)
-
-## 3.1.0-rc.10
-`2020-04-07  ·  1 🔍  ·  1 👩‍💻👨‍💻`
-
-<details>
-<summary>🔍 Minor changes</summary>
-
-
-- Regression: Fix users raw model ([#17204](https://github.com/RocketChat/Rocket.Chat/pull/17204))
-
-</details>
-
-### 👩‍💻👨‍💻 Core Team 🤓
-
-- [@sampaiodiego](https://github.com/sampaiodiego)
-
-## 3.1.0-rc.9
-`2020-04-07  ·  1 🎉  ·  3 🚀  ·  1 🐛  ·  9 🔍  ·  11 👩‍💻👨‍💻`
-
-### 🎉 New features
-
-
-- Add omnichannel external frame feature ([#17038](https://github.com/RocketChat/Rocket.Chat/pull/17038))
-
-### 🚀 Improvements
-
-
-- First data load from existing data on engagement dashboard ([#17035](https://github.com/RocketChat/Rocket.Chat/pull/17035))
-
-- Increase the push throughput to prevent queuing ([#17194](https://github.com/RocketChat/Rocket.Chat/pull/17194))
-
-- Change sidebar sort mode to activity by default ([#17189](https://github.com/RocketChat/Rocket.Chat/pull/17189))
-
-### 🐛 Bug fixes
-
-
-- WebRTC echo while talking ([#17145](https://github.com/RocketChat/Rocket.Chat/pull/17145) by [@1rV1N-git](https://github.com/1rV1N-git) & [@ndroo](https://github.com/ndroo))
-
-<details>
-<summary>🔍 Minor changes</summary>
-
-
-- Regression: Fix calling readmessage after mark as unread ([#17193](https://github.com/RocketChat/Rocket.Chat/pull/17193))
-
-- Add wrapper to make Meteor methods calls over REST ([#17092](https://github.com/RocketChat/Rocket.Chat/pull/17092))
-
-- Regression: Fix auditing for Multiple Direct Messages ([#17192](https://github.com/RocketChat/Rocket.Chat/pull/17192))
-
-- Regression: Admin create user button ([#17186](https://github.com/RocketChat/Rocket.Chat/pull/17186))
-
-- Regression: fix scroll after room loads ([#17188](https://github.com/RocketChat/Rocket.Chat/pull/17188))
-
-- Metrics: New metrics, performance and size improvements ([#17183](https://github.com/RocketChat/Rocket.Chat/pull/17183))
-
-- Fix: Huge amount of hasLicense calls to the server ([#17169](https://github.com/RocketChat/Rocket.Chat/pull/17169))
-
-- Fix: Missing checks for Troubleshoot > Disable Notifications ([#17155](https://github.com/RocketChat/Rocket.Chat/pull/17155))
-
-- Fix: Error message on startup of multiple instances related to the metrics’ server ([#17152](https://github.com/RocketChat/Rocket.Chat/pull/17152))
-
-</details>
-
-### 👩‍💻👨‍💻 Contributors 😍
-
-- [@1rV1N-git](https://github.com/1rV1N-git)
-- [@ndroo](https://github.com/ndroo)
-
-### 👩‍💻👨‍💻 Core Team 🤓
-
-- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
-- [@d-gubert](https://github.com/d-gubert)
-- [@engelgabriel](https://github.com/engelgabriel)
-- [@gabriellsh](https://github.com/gabriellsh)
-- [@ggazzo](https://github.com/ggazzo)
-- [@renatobecker](https://github.com/renatobecker)
-- [@rodrigok](https://github.com/rodrigok)
-- [@sampaiodiego](https://github.com/sampaiodiego)
-- [@tassoevan](https://github.com/tassoevan)
-
-## 3.1.0-rc.8
-`2020-04-02  ·  2 🐛  ·  2 🔍  ·  3 👩‍💻👨‍💻`
-
-### 🐛 Bug fixes
-
-
-- Option BYPASS_OPLOG_VALIDATION not working ([#17143](https://github.com/RocketChat/Rocket.Chat/pull/17143))
-
-- Omnichannel endpoint `inquiries.getOne` returning only queued inquiries ([#17132](https://github.com/RocketChat/Rocket.Chat/pull/17132))
-
-<details>
-<summary>🔍 Minor changes</summary>
-
-
-- New metric to track oplog queue ([#17142](https://github.com/RocketChat/Rocket.Chat/pull/17142))
-
-- Regression: fix design review of Directory ([#17133](https://github.com/RocketChat/Rocket.Chat/pull/17133))
-
-</details>
-
-### 👩‍💻👨‍💻 Core Team 🤓
-
-- [@ggazzo](https://github.com/ggazzo)
-- [@renatobecker](https://github.com/renatobecker)
-- [@rodrigok](https://github.com/rodrigok)
-
-## 3.1.0-rc.7
-`2020-04-02  ·  2 🎉  ·  1 🚀  ·  4 🐛  ·  9 🔍  ·  9 👩‍💻👨‍💻`
-
-### 🎉 New features
-
-
-- Directory page refactored, new user's bio field ([#17043](https://github.com/RocketChat/Rocket.Chat/pull/17043))
-
-- Merge Sort List and View Mode menus and improve its UI/UX ([#17103](https://github.com/RocketChat/Rocket.Chat/pull/17103))
-  ![image](https://user-images.githubusercontent.com/5263975/78036622-e8db2a80-7340-11ea-91d0-65728eabdcb6.png)
-
-### 🚀 Improvements
-
-
-- Apps Engine: Reduce some stream calls and remove a find user from the app's status changes ([#17115](https://github.com/RocketChat/Rocket.Chat/pull/17115))
-
-### 🐛 Bug fixes
-
-
-- Federation delete room event not being dispatched ([#16861](https://github.com/RocketChat/Rocket.Chat/pull/16861) by [@1rV1N-git](https://github.com/1rV1N-git))
-
-- Federation Event ROOM_ADD_USER not being dispatched ([#16878](https://github.com/RocketChat/Rocket.Chat/pull/16878) by [@1rV1N-git](https://github.com/1rV1N-git))
-
-- Discussions were not inheriting the public status of parent's channel ([#17070](https://github.com/RocketChat/Rocket.Chat/pull/17070))
-
-- Member's list only filtering users already on screen ([#17110](https://github.com/RocketChat/Rocket.Chat/pull/17110))
-
-<details>
-<summary>🔍 Minor changes</summary>
-
-
-- Regression: Direct message creation by REST ([#17109](https://github.com/RocketChat/Rocket.Chat/pull/17109))
-
-- Regression: Can't login with 2FA over REST API when 2FA via Email is enabled ([#17128](https://github.com/RocketChat/Rocket.Chat/pull/17128))
-
-- Regression: Fix engagement dashboard urls, fixing Flowrouter imports ([#17127](https://github.com/RocketChat/Rocket.Chat/pull/17127))
-
-- Regression: IE11 Support ([#17125](https://github.com/RocketChat/Rocket.Chat/pull/17125))
-
-- New Troubleshoot section for disabling features ([#17114](https://github.com/RocketChat/Rocket.Chat/pull/17114))
-
-- Regression: Wrong size of Directory search/sort icons and Sort Channels menu not showing on production build ([#17118](https://github.com/RocketChat/Rocket.Chat/pull/17118))
-
-- Regression: fix fuselage import, remove directory css ([#17116](https://github.com/RocketChat/Rocket.Chat/pull/17116))
-
-- Regression: Remove old and closed Omnichannel inquiries ([#17113](https://github.com/RocketChat/Rocket.Chat/pull/17113))
-
-- Single codebase announcement ([#17081](https://github.com/RocketChat/Rocket.Chat/pull/17081))
-
-</details>
-
-### 👩‍💻👨‍💻 Contributors 😍
-
-- [@1rV1N-git](https://github.com/1rV1N-git)
-
-### 👩‍💻👨‍💻 Core Team 🤓
-
-- [@Sing-Li](https://github.com/Sing-Li)
-- [@d-gubert](https://github.com/d-gubert)
-- [@djorkaeffalexandre](https://github.com/djorkaeffalexandre)
-- [@gabriellsh](https://github.com/gabriellsh)
-- [@ggazzo](https://github.com/ggazzo)
-- [@renatobecker](https://github.com/renatobecker)
-- [@rodrigok](https://github.com/rodrigok)
-- [@tassoevan](https://github.com/tassoevan)
-
-## 3.1.0-rc.6
-`2020-03-31  ·  3 🔍  ·  3 👩‍💻👨‍💻`
-
-<details>
-<summary>🔍 Minor changes</summary>
-
-
-- Regression: Files were been deleted when deleting users as last members of private rooms ([#17111](https://github.com/RocketChat/Rocket.Chat/pull/17111))
-
-- Regression: Block users was not possible for 1:1 DMs ([#17105](https://github.com/RocketChat/Rocket.Chat/pull/17105))
-
-- Regression: Collapsible elements didn't respect attachment parameter. ([#16994](https://github.com/RocketChat/Rocket.Chat/pull/16994))
-
-</details>
-
-### 👩‍💻👨‍💻 Core Team 🤓
-
-- [@gabriellsh](https://github.com/gabriellsh)
-- [@ggazzo](https://github.com/ggazzo)
-- [@rodrigok](https://github.com/rodrigok)
-
-## 3.1.0-rc.5
-`2020-03-31  ·  1 🐛  ·  1 👩‍💻👨‍💻`
-
-### 🐛 Bug fixes
-
-
-- Apps Engine notifyRoom sending notification to wrong users ([#17093](https://github.com/RocketChat/Rocket.Chat/pull/17093))
-
-### 👩‍💻👨‍💻 Core Team 🤓
-
-- [@sampaiodiego](https://github.com/sampaiodiego)
-
-## 3.1.0-rc.4
-`2020-03-30  ·  2 🐛  ·  2 🔍  ·  4 👩‍💻👨‍💻`
-
-### 🐛 Bug fixes
-
-
-- Emit livechat events to instace only ([#17086](https://github.com/RocketChat/Rocket.Chat/pull/17086))
-
-- Error when websocket received status update event ([#17089](https://github.com/RocketChat/Rocket.Chat/pull/17089))
-
-<details>
-<summary>🔍 Minor changes</summary>
-
-
-- Reduce notifyUser propagation ([#17088](https://github.com/RocketChat/Rocket.Chat/pull/17088))
-
-- Regression: Check Omnichannel routing system before emitting queue changes ([#17087](https://github.com/RocketChat/Rocket.Chat/pull/17087))
-
-</details>
-
-### 👩‍💻👨‍💻 Core Team 🤓
-
-- [@d-gubert](https://github.com/d-gubert)
-- [@renatobecker](https://github.com/renatobecker)
-- [@rodrigok](https://github.com/rodrigok)
-- [@sampaiodiego](https://github.com/sampaiodiego)
-
-## 3.1.0-rc.3
-`2020-03-30  ·  2 🎉  ·  2 🚀  ·  1 🐛  ·  3 🔍  ·  7 👩‍💻👨‍💻`
-
-### 🎉 New features
-
-
-- Add update method for user bridge ([#17077](https://github.com/RocketChat/Rocket.Chat/pull/17077))
-
-- Home button on sidebar ([#17052](https://github.com/RocketChat/Rocket.Chat/pull/17052))
-
-### 🚀 Improvements
-
-
-- Repeat “Reply In Thread” and “Add Reaction” inside the message actions menu ([#17073](https://github.com/RocketChat/Rocket.Chat/pull/17073))
-
-- Tab Bar actions reorder ([#17072](https://github.com/RocketChat/Rocket.Chat/pull/17072))
-
-### 🐛 Bug fixes
-
-
-- Verification email body ([#17062](https://github.com/RocketChat/Rocket.Chat/pull/17062) by [@GOVINDDIXIT](https://github.com/GOVINDDIXIT))
-
-<details>
-<summary>🔍 Minor changes</summary>
-
-
-- Add User’s index for field `appId` ([#17075](https://github.com/RocketChat/Rocket.Chat/pull/17075))
-
-- Regression: OmniChannel agent activity monitor was counting time wrongly ([#16979](https://github.com/RocketChat/Rocket.Chat/pull/16979))
-
-- Regression: Broken Search if users without DM subscriptions are listed ([#17074](https://github.com/RocketChat/Rocket.Chat/pull/17074))
-
-</details>
-
-### 👩‍💻👨‍💻 Contributors 😍
-
-- [@GOVINDDIXIT](https://github.com/GOVINDDIXIT)
-
-### 👩‍💻👨‍💻 Core Team 🤓
-
-- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
-- [@d-gubert](https://github.com/d-gubert)
-- [@engelgabriel](https://github.com/engelgabriel)
-- [@gabriellsh](https://github.com/gabriellsh)
-- [@rodrigok](https://github.com/rodrigok)
-- [@tassoevan](https://github.com/tassoevan)
-
-## 3.1.0-rc.2
-`2020-03-29  ·  9 🔍  ·  5 👩‍💻👨‍💻`
-
-<details>
-<summary>🔍 Minor changes</summary>
-
-
-- Regression: Overwrite model functions on EE only when license applied ([#17061](https://github.com/RocketChat/Rocket.Chat/pull/17061))
-
-- Regression: `users.setStatus` throwing an error if message is empty ([#17036](https://github.com/RocketChat/Rocket.Chat/pull/17036))
-
-- Regression: Omnichannel notification on new conversations displaying incorrect information ([#16346](https://github.com/RocketChat/Rocket.Chat/pull/16346))
-
-- Fix: Notifications of Group DM were not showing the room name ([#17058](https://github.com/RocketChat/Rocket.Chat/pull/17058))
-
-- Fix: Last message of Group DMs not showing the sender ([#17059](https://github.com/RocketChat/Rocket.Chat/pull/17059))
-
-- Regression: Invite links working for group DMs ([#17056](https://github.com/RocketChat/Rocket.Chat/pull/17056))
-
-- Regression: Do not refresh statistics when opening the info panel ([#17060](https://github.com/RocketChat/Rocket.Chat/pull/17060))
-
-- Regression: Fix removing user not removing his 1-on-1 DMs ([#17057](https://github.com/RocketChat/Rocket.Chat/pull/17057))
-
-- Regression: omnichannel manual queued sidebarlist ([#17048](https://github.com/RocketChat/Rocket.Chat/pull/17048))
-
-</details>
-
-### 👩‍💻👨‍💻 Core Team 🤓
-
-- [@MarcosSpessatto](https://github.com/MarcosSpessatto)
-- [@ggazzo](https://github.com/ggazzo)
-- [@renatobecker](https://github.com/renatobecker)
-- [@rodrigok](https://github.com/rodrigok)
-- [@sampaiodiego](https://github.com/sampaiodiego)
-
-## 3.1.0-rc.1
-`2020-03-26  ·  2 🔍  ·  2 👩‍💻👨‍💻`
-
-<details>
-<summary>🔍 Minor changes</summary>
-
-
-- Regression: Small fixes for Game Center ([#17018](https://github.com/RocketChat/Rocket.Chat/pull/17018))
-
-- Regression: Fix issue with opening rooms ([#17028](https://github.com/RocketChat/Rocket.Chat/pull/17028))
-
-</details>
-
-### 👩‍💻👨‍💻 Core Team 🤓
-
-- [@d-gubert](https://github.com/d-gubert)
-- [@sampaiodiego](https://github.com/sampaiodiego)
-
-## 3.1.0-rc.0
-`2020-03-26  ·  18 🎉  ·  16 🚀  ·  57 🐛  ·  41 🔍  ·  35 👩‍💻👨‍💻`
+### Engine versions
+- Node: `12.16.1`
+- NPM: `6.13.4`
+- MongoDB: `3.4, 3.6, 4.0`
 
 ### 🎉 New features
 
@@ -422,7 +33,7 @@
 - Two Factor authentication via email ([#15949](https://github.com/RocketChat/Rocket.Chat/pull/15949))
 
 - Translation via MS translate ([#16363](https://github.com/RocketChat/Rocket.Chat/pull/16363) by [@mrsimpson](https://github.com/mrsimpson))
-  Adds Microsoft's translation service (https://translator.microsoft.com/) as a provider for translation of messages.
+  Adds Microsoft's translation service (https://translator.microsoft.com/) as a provider for translation of messages.
   In addition to implementing the interface (similar to google and DeepL), a small change has been done in order to display the translation provider on the UI.
 
 - API `users.deactivateIdle` for mass-disabling of idle users ([#16849](https://github.com/RocketChat/Rocket.Chat/pull/16849))
@@ -437,6 +48,17 @@
 
 - Open the Visitor Info panel automatically when the agent enters an Omnichannel room ([#16496](https://github.com/RocketChat/Rocket.Chat/pull/16496))
 
+- Add update method for user bridge ([#17077](https://github.com/RocketChat/Rocket.Chat/pull/17077))
+
+- Home button on sidebar ([#17052](https://github.com/RocketChat/Rocket.Chat/pull/17052))
+
+- Directory page refactored, new user's bio field ([#17043](https://github.com/RocketChat/Rocket.Chat/pull/17043))
+
+- Merge Sort List and View Mode menus and improve its UI/UX ([#17103](https://github.com/RocketChat/Rocket.Chat/pull/17103))
+  ![image](https://user-images.githubusercontent.com/5263975/78036622-e8db2a80-7340-11ea-91d0-65728eabdcb6.png)
+
+- Add omnichannel external frame feature ([#17038](https://github.com/RocketChat/Rocket.Chat/pull/17038))
+
 ### 🚀 Improvements
 
 
@@ -472,6 +94,18 @@
 
 - Removed the 'reply in thread' from thread replies ([#16630](https://github.com/RocketChat/Rocket.Chat/pull/16630) by [@ritwizsinha](https://github.com/ritwizsinha))
 
+- Repeat “Reply In Thread” and “Add Reaction” inside the message actions menu ([#17073](https://github.com/RocketChat/Rocket.Chat/pull/17073))
+
+- Tab Bar actions reorder ([#17072](https://github.com/RocketChat/Rocket.Chat/pull/17072))
+
+- Apps Engine: Reduce some stream calls and remove a find user from the app's status changes ([#17115](https://github.com/RocketChat/Rocket.Chat/pull/17115))
+
+- First data load from existing data on engagement dashboard ([#17035](https://github.com/RocketChat/Rocket.Chat/pull/17035))
+
+- Increase the push throughput to prevent queuing ([#17194](https://github.com/RocketChat/Rocket.Chat/pull/17194))
+
+- Change sidebar sort mode to activity by default ([#17189](https://github.com/RocketChat/Rocket.Chat/pull/17189))
+
 ### 🐛 Bug fixes
 
 
@@ -590,96 +224,216 @@
 
 - UiKit not updating new actionIds received as responses from actions ([#16624](https://github.com/RocketChat/Rocket.Chat/pull/16624))
 
+- Verification email body ([#17062](https://github.com/RocketChat/Rocket.Chat/pull/17062) by [@GOVINDDIXIT](https://github.com/GOVINDDIXIT))
+
+- Emit livechat events to instace only ([#17086](https://github.com/RocketChat/Rocket.Chat/pull/17086))
+
+- Error when websocket received status update event ([#17089](https://github.com/RocketChat/Rocket.Chat/pull/17089))
+
+- Federation delete room event not being dispatched ([#16861](https://github.com/RocketChat/Rocket.Chat/pull/16861) by [@1rV1N-git](https://github.com/1rV1N-git))
+
+- Federation Event ROOM_ADD_USER not being dispatched ([#16878](https://github.com/RocketChat/Rocket.Chat/pull/16878) by [@1rV1N-git](https://github.com/1rV1N-git))
+
+- Discussions were not inheriting the public status of parent's channel ([#17070](https://github.com/RocketChat/Rocket.Chat/pull/17070))
+
+- Member's list only filtering users already on screen ([#17110](https://github.com/RocketChat/Rocket.Chat/pull/17110))
+
+- Option BYPASS_OPLOG_VALIDATION not working ([#17143](https://github.com/RocketChat/Rocket.Chat/pull/17143))
+
+- Omnichannel endpoint `inquiries.getOne` returning only queued inquiries ([#17132](https://github.com/RocketChat/Rocket.Chat/pull/17132))
+
+- WebRTC echo while talking ([#17145](https://github.com/RocketChat/Rocket.Chat/pull/17145) by [@1rV1N-git](https://github.com/1rV1N-git) & [@ndroo](https://github.com/ndroo))
+
+- Random errors on SAML logout ([#17227](https://github.com/RocketChat/Rocket.Chat/pull/17227))
+
+- Room event emitter passing an invalid parameter when finding removed subscriptions ([#17224](https://github.com/RocketChat/Rocket.Chat/pull/17224))
+
+- Wrong SAML Response Signature Validation ([#16922](https://github.com/RocketChat/Rocket.Chat/pull/16922))
+
+- SAML login errors not showing on UI ([#17219](https://github.com/RocketChat/Rocket.Chat/pull/17219))
+
 <details>
 <summary>🔍 Minor changes</summary>
 
 
+- Release 3.0.12 ([#17158](https://github.com/RocketChat/Rocket.Chat/pull/17158))
+
 - Fix: 2FA DDP method not getting code on API call that doesn’t requires 2FA ([#16998](https://github.com/RocketChat/Rocket.Chat/pull/16998))
 
 - Regression: Remove deprecated Omnichannel setting used to fetch the queue data through subscription  ([#17017](https://github.com/RocketChat/Rocket.Chat/pull/17017))
 
-- Regression: Replace the Omnichannel queue model observe with Stream ([#16999](https://github.com/RocketChat/Rocket.Chat/pull/16999))
+- Regression: Replace the Omnichannel queue model observe with Stream ([#16999](https://github.com/RocketChat/Rocket.Chat/pull/16999))
+
+- Fix StreamCast info ([#16995](https://github.com/RocketChat/Rocket.Chat/pull/16995))
+
+- Fix: StreamCast was not working correctly ([#16983](https://github.com/RocketChat/Rocket.Chat/pull/16983))
+
+- Change license version requested ([#16956](https://github.com/RocketChat/Rocket.Chat/pull/16956))
+
+- Fix: Padding required in the Facebook Messenger option in Livechat ([#16202](https://github.com/RocketChat/Rocket.Chat/pull/16202) by [@ritwizsinha](https://github.com/ritwizsinha))
+
+- Add some missing ES translations ([#16120](https://github.com/RocketChat/Rocket.Chat/pull/16120) by [@ivanape](https://github.com/ivanape))
+
+- Fix: Adding margin to click to load text ([#16210](https://github.com/RocketChat/Rocket.Chat/pull/16210) by [@ritwizsinha](https://github.com/ritwizsinha))
+
+- Redirected to home when a room has been deleted instead of getting broken link(blank page) of deleted room ([#16227](https://github.com/RocketChat/Rocket.Chat/pull/16227) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
+- Fixed translate variable in UnarchiveRoom Modal ([#16310](https://github.com/RocketChat/Rocket.Chat/pull/16310) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
+- Update cypress to version 4.0.2 ([#16685](https://github.com/RocketChat/Rocket.Chat/pull/16685))
+
+- Update presence package ([#16786](https://github.com/RocketChat/Rocket.Chat/pull/16786))
+
+- Add an index to the name field for omnichannel department ([#16953](https://github.com/RocketChat/Rocket.Chat/pull/16953))
+
+- Add lint to `.less` files ([#16893](https://github.com/RocketChat/Rocket.Chat/pull/16893))
+
+- Upgrade Livechat Widget version to 1.4.0 ([#16950](https://github.com/RocketChat/Rocket.Chat/pull/16950))
+
+- Bump acorn from 6.0.7 to 6.4.1 ([#16876](https://github.com/RocketChat/Rocket.Chat/pull/16876) by [@dependabot[bot]](https://github.com/dependabot[bot]))
+
+- Fix: Make the AppLivechatBridge.createMessage works properly as a promise ([#16941](https://github.com/RocketChat/Rocket.Chat/pull/16941))
+
+- Add new Omnichannel department forwarding callback ([#16779](https://github.com/RocketChat/Rocket.Chat/pull/16779))
+
+- Added border to page header ([#16792](https://github.com/RocketChat/Rocket.Chat/pull/16792))
+
+- Fixed Line break incorrectly being called apostrophe in code ([#16918](https://github.com/RocketChat/Rocket.Chat/pull/16918) by [@aKn1ghtOut](https://github.com/aKn1ghtOut))
+
+- Improve room types usage ([#16753](https://github.com/RocketChat/Rocket.Chat/pull/16753))
+
+- Fix: Removed some hardcoded texts ([#16304](https://github.com/RocketChat/Rocket.Chat/pull/16304) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
+- Add Enterprise Edition license ([#16801](https://github.com/RocketChat/Rocket.Chat/pull/16801))
+
+- Improve: Apps-engine E2E tests ([#16781](https://github.com/RocketChat/Rocket.Chat/pull/16781))
+
+- LingoHub based on develop ([#16837](https://github.com/RocketChat/Rocket.Chat/pull/16837))
+
+- Regression: Fix omnichannel icon missing on sidebar ([#16775](https://github.com/RocketChat/Rocket.Chat/pull/16775))
+
+- Removing Trailing Space ([#16470](https://github.com/RocketChat/Rocket.Chat/pull/16470) by [@aryamanpuri](https://github.com/aryamanpuri))
+
+- [Apps] Lazy load categories and marketplaceVersion in admin - apps page ([#16258](https://github.com/RocketChat/Rocket.Chat/pull/16258))
+
+- Fix Docker preview image ([#16736](https://github.com/RocketChat/Rocket.Chat/pull/16736))
+
+- [CHORE] Changed remaining SelectInput's to Select ([#16719](https://github.com/RocketChat/Rocket.Chat/pull/16719))
+
+- [CHORE] Update snap install instructions ([#16720](https://github.com/RocketChat/Rocket.Chat/pull/16720))
+
+- Fix: Console error on login ([#16704](https://github.com/RocketChat/Rocket.Chat/pull/16704))
+
+- Add methods to include room types on dashboard ([#16576](https://github.com/RocketChat/Rocket.Chat/pull/16576))
+
+- Regression: Show upload errors ([#16681](https://github.com/RocketChat/Rocket.Chat/pull/16681))
+
+- Fix: Correctly aligned input element of custom user status component ([#16151](https://github.com/RocketChat/Rocket.Chat/pull/16151) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+
+- [CHORE] Look for Storybook stories on `app/` too ([#16595](https://github.com/RocketChat/Rocket.Chat/pull/16595))
+
+- Changed Opt_In message, removed translations ([#16631](https://github.com/RocketChat/Rocket.Chat/pull/16631))
+
+- LingoHub based on develop ([#16640](https://github.com/RocketChat/Rocket.Chat/pull/16640))
+
+- fix: add option to mount media on snap ([#13591](https://github.com/RocketChat/Rocket.Chat/pull/13591) by [@knrt10](https://github.com/knrt10))
+
+- Merge master into develop & Set version to 3.1.0-develop ([#16609](https://github.com/RocketChat/Rocket.Chat/pull/16609))
+
+- Regression: Small fixes for Game Center ([#17018](https://github.com/RocketChat/Rocket.Chat/pull/17018))
+
+- Regression: Fix issue with opening rooms ([#17028](https://github.com/RocketChat/Rocket.Chat/pull/17028))
+
+- Regression: Overwrite model functions on EE only when license applied ([#17061](https://github.com/RocketChat/Rocket.Chat/pull/17061))
+
+- Regression: `users.setStatus` throwing an error if message is empty ([#17036](https://github.com/RocketChat/Rocket.Chat/pull/17036))
+
+- Regression: Omnichannel notification on new conversations displaying incorrect information ([#16346](https://github.com/RocketChat/Rocket.Chat/pull/16346))
+
+- Fix: Notifications of Group DM were not showing the room name ([#17058](https://github.com/RocketChat/Rocket.Chat/pull/17058))
 
-- Fix StreamCast info ([#16995](https://github.com/RocketChat/Rocket.Chat/pull/16995))
+- Fix: Last message of Group DMs not showing the sender ([#17059](https://github.com/RocketChat/Rocket.Chat/pull/17059))
 
-- Fix: StreamCast was not working correctly ([#16983](https://github.com/RocketChat/Rocket.Chat/pull/16983))
+- Regression: Invite links working for group DMs ([#17056](https://github.com/RocketChat/Rocket.Chat/pull/17056))
 
-- Change license version requested ([#16956](https://github.com/RocketChat/Rocket.Chat/pull/16956))
+- Regression: Do not refresh statistics when opening the info panel ([#17060](https://github.com/RocketChat/Rocket.Chat/pull/17060))
 
-- Fix: Padding required in the Facebook Messenger option in Livechat ([#16202](https://github.com/RocketChat/Rocket.Chat/pull/16202) by [@ritwizsinha](https://github.com/ritwizsinha))
+- Regression: Fix removing user not removing his 1-on-1 DMs ([#17057](https://github.com/RocketChat/Rocket.Chat/pull/17057))
 
-- Add some missing ES translations ([#16120](https://github.com/RocketChat/Rocket.Chat/pull/16120) by [@ivanape](https://github.com/ivanape))
+- Regression: omnichannel manual queued sidebarlist ([#17048](https://github.com/RocketChat/Rocket.Chat/pull/17048))
 
-- Fix: Adding margin to click to load text ([#16210](https://github.com/RocketChat/Rocket.Chat/pull/16210) by [@ritwizsinha](https://github.com/ritwizsinha))
+- Add User’s index for field `appId` ([#17075](https://github.com/RocketChat/Rocket.Chat/pull/17075))
 
-- Redirected to home when a room has been deleted instead of getting broken link(blank page) of deleted room ([#16227](https://github.com/RocketChat/Rocket.Chat/pull/16227) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+- Regression: OmniChannel agent activity monitor was counting time wrongly ([#16979](https://github.com/RocketChat/Rocket.Chat/pull/16979))
 
-- Fixed translate variable in UnarchiveRoom Modal ([#16310](https://github.com/RocketChat/Rocket.Chat/pull/16310) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+- Regression: Broken Search if users without DM subscriptions are listed ([#17074](https://github.com/RocketChat/Rocket.Chat/pull/17074))
 
-- Update cypress to version 4.0.2 ([#16685](https://github.com/RocketChat/Rocket.Chat/pull/16685))
+- Reduce notifyUser propagation ([#17088](https://github.com/RocketChat/Rocket.Chat/pull/17088))
 
-- Update presence package ([#16786](https://github.com/RocketChat/Rocket.Chat/pull/16786))
+- Regression: Check Omnichannel routing system before emitting queue changes ([#17087](https://github.com/RocketChat/Rocket.Chat/pull/17087))
 
-- Add an index to the name field for omnichannel department ([#16953](https://github.com/RocketChat/Rocket.Chat/pull/16953))
+- Regression: Files were been deleted when deleting users as last members of private rooms ([#17111](https://github.com/RocketChat/Rocket.Chat/pull/17111))
 
-- Add lint to `.less` files ([#16893](https://github.com/RocketChat/Rocket.Chat/pull/16893))
+- Regression: Block users was not possible for 1:1 DMs ([#17105](https://github.com/RocketChat/Rocket.Chat/pull/17105))
 
-- Upgrade Livechat Widget version to 1.4.0 ([#16950](https://github.com/RocketChat/Rocket.Chat/pull/16950))
+- Regression: Collapsible elements didn't respect attachment parameter. ([#16994](https://github.com/RocketChat/Rocket.Chat/pull/16994))
 
-- Bump acorn from 6.0.7 to 6.4.1 ([#16876](https://github.com/RocketChat/Rocket.Chat/pull/16876) by [@dependabot[bot]](https://github.com/dependabot[bot]))
+- Regression: Direct message creation by REST ([#17109](https://github.com/RocketChat/Rocket.Chat/pull/17109))
 
-- Fix: Make the AppLivechatBridge.createMessage works properly as a promise ([#16941](https://github.com/RocketChat/Rocket.Chat/pull/16941))
+- Regression: Can't login with 2FA over REST API when 2FA via Email is enabled ([#17128](https://github.com/RocketChat/Rocket.Chat/pull/17128))
 
-- Add new Omnichannel department forwarding callback ([#16779](https://github.com/RocketChat/Rocket.Chat/pull/16779))
+- Regression: Fix engagement dashboard urls, fixing Flowrouter imports ([#17127](https://github.com/RocketChat/Rocket.Chat/pull/17127))
 
-- Added border to page header ([#16792](https://github.com/RocketChat/Rocket.Chat/pull/16792))
+- Regression: IE11 Support ([#17125](https://github.com/RocketChat/Rocket.Chat/pull/17125))
 
-- Fixed Line break incorrectly being called apostrophe in code ([#16918](https://github.com/RocketChat/Rocket.Chat/pull/16918) by [@aKn1ghtOut](https://github.com/aKn1ghtOut))
+- New Troubleshoot section for disabling features ([#17114](https://github.com/RocketChat/Rocket.Chat/pull/17114))
 
-- Improve room types usage ([#16753](https://github.com/RocketChat/Rocket.Chat/pull/16753))
+- Regression: Wrong size of Directory search/sort icons and Sort Channels menu not showing on production build ([#17118](https://github.com/RocketChat/Rocket.Chat/pull/17118))
 
-- Fix: Removed some hardcoded texts ([#16304](https://github.com/RocketChat/Rocket.Chat/pull/16304) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+- Regression: fix fuselage import, remove directory css ([#17116](https://github.com/RocketChat/Rocket.Chat/pull/17116))
 
-- Add Enterprise Edition license ([#16801](https://github.com/RocketChat/Rocket.Chat/pull/16801))
+- Regression: Remove old and closed Omnichannel inquiries ([#17113](https://github.com/RocketChat/Rocket.Chat/pull/17113))
 
-- Improve: Apps-engine E2E tests ([#16781](https://github.com/RocketChat/Rocket.Chat/pull/16781))
+- Single codebase announcement ([#17081](https://github.com/RocketChat/Rocket.Chat/pull/17081))
 
-- LingoHub based on develop ([#16837](https://github.com/RocketChat/Rocket.Chat/pull/16837))
+- New metric to track oplog queue ([#17142](https://github.com/RocketChat/Rocket.Chat/pull/17142))
 
-- Regression: Fix omnichannel icon missing on sidebar ([#16775](https://github.com/RocketChat/Rocket.Chat/pull/16775))
+- Regression: fix design review of Directory ([#17133](https://github.com/RocketChat/Rocket.Chat/pull/17133))
 
-- Removing Trailing Space ([#16470](https://github.com/RocketChat/Rocket.Chat/pull/16470) by [@aryamanpuri](https://github.com/aryamanpuri))
+- Regression: Fix calling readmessage after mark as unread ([#17193](https://github.com/RocketChat/Rocket.Chat/pull/17193))
 
-- [Apps] Lazy load categories and marketplaceVersion in admin - apps page ([#16258](https://github.com/RocketChat/Rocket.Chat/pull/16258))
+- Add wrapper to make Meteor methods calls over REST ([#17092](https://github.com/RocketChat/Rocket.Chat/pull/17092))
 
-- Fix Docker preview image ([#16736](https://github.com/RocketChat/Rocket.Chat/pull/16736))
+- Regression: Fix auditing for Multiple Direct Messages ([#17192](https://github.com/RocketChat/Rocket.Chat/pull/17192))
 
-- [CHORE] Changed remaining SelectInput's to Select ([#16719](https://github.com/RocketChat/Rocket.Chat/pull/16719))
+- Regression: Admin create user button ([#17186](https://github.com/RocketChat/Rocket.Chat/pull/17186))
 
-- [CHORE] Update snap install instructions ([#16720](https://github.com/RocketChat/Rocket.Chat/pull/16720))
+- Regression: fix scroll after room loads ([#17188](https://github.com/RocketChat/Rocket.Chat/pull/17188))
 
-- Fix: Console error on login ([#16704](https://github.com/RocketChat/Rocket.Chat/pull/16704))
+- Metrics: New metrics, performance and size improvements ([#17183](https://github.com/RocketChat/Rocket.Chat/pull/17183))
 
-- Add methods to include room types on dashboard ([#16576](https://github.com/RocketChat/Rocket.Chat/pull/16576))
+- Fix: Huge amount of hasLicense calls to the server ([#17169](https://github.com/RocketChat/Rocket.Chat/pull/17169))
 
-- Regression: Show upload errors ([#16681](https://github.com/RocketChat/Rocket.Chat/pull/16681))
+- Fix: Missing checks for Troubleshoot > Disable Notifications ([#17155](https://github.com/RocketChat/Rocket.Chat/pull/17155))
 
-- Fix: Correctly aligned input element of custom user status component ([#16151](https://github.com/RocketChat/Rocket.Chat/pull/16151) by [@ashwaniYDV](https://github.com/ashwaniYDV))
+- Fix: Error message on startup of multiple instances related to the metrics’ server ([#17152](https://github.com/RocketChat/Rocket.Chat/pull/17152))
 
-- [CHORE] Look for Storybook stories on `app/` too ([#16595](https://github.com/RocketChat/Rocket.Chat/pull/16595))
+- Regression: Fix users raw model ([#17204](https://github.com/RocketChat/Rocket.Chat/pull/17204))
 
-- Changed Opt_In message, removed translations ([#16631](https://github.com/RocketChat/Rocket.Chat/pull/16631))
+- Add statistics and metrics about push queue ([#17208](https://github.com/RocketChat/Rocket.Chat/pull/17208))
 
-- LingoHub based on develop ([#16640](https://github.com/RocketChat/Rocket.Chat/pull/16640))
+- Collect metrics about meteor facts ([#17216](https://github.com/RocketChat/Rocket.Chat/pull/17216))
 
-- fix: add option to mount media on snap ([#13591](https://github.com/RocketChat/Rocket.Chat/pull/13591) by [@knrt10](https://github.com/knrt10))
+- Fix self DMs created during release candidate ([#17239](https://github.com/RocketChat/Rocket.Chat/pull/17239))
 
-- Merge master into develop & Set version to 3.1.0-develop ([#16609](https://github.com/RocketChat/Rocket.Chat/pull/16609))
+- [CHORE] Use REST API for sending audio messages ([#17237](https://github.com/RocketChat/Rocket.Chat/pull/17237))
 
 </details>
 
 ### 👩‍💻👨‍💻 Contributors 😍
 
+- [@1rV1N-git](https://github.com/1rV1N-git)
+- [@GOVINDDIXIT](https://github.com/GOVINDDIXIT)
 - [@Nikhil713](https://github.com/Nikhil713)
 - [@PrajvalRaval](https://github.com/PrajvalRaval)
 - [@Rodriq](https://github.com/Rodriq)
@@ -698,6 +452,7 @@
 - [@knrt10](https://github.com/knrt10)
 - [@localguru](https://github.com/localguru)
 - [@mrsimpson](https://github.com/mrsimpson)
+- [@ndroo](https://github.com/ndroo)
 - [@pmayer](https://github.com/pmayer)
 - [@ritwizsinha](https://github.com/ritwizsinha)
 - [@rm-yakovenko](https://github.com/rm-yakovenko)
@@ -707,7 +462,10 @@
 ### 👩‍💻👨‍💻 Core Team 🤓
 
 - [@MarcosSpessatto](https://github.com/MarcosSpessatto)
+- [@Sing-Li](https://github.com/Sing-Li)
 - [@d-gubert](https://github.com/d-gubert)
+- [@djorkaeffalexandre](https://github.com/djorkaeffalexandre)
+- [@engelgabriel](https://github.com/engelgabriel)
 - [@gabriellsh](https://github.com/gabriellsh)
 - [@geekgonecrazy](https://github.com/geekgonecrazy)
 - [@ggazzo](https://github.com/ggazzo)
@@ -5143,18 +4901,6 @@
 
 - Make Livechat's widget draggable ([#12378](https://github.com/RocketChat/Rocket.Chat/pull/12378))
 
-- Add permission to enable personal access token to specific roles ([#12309](https://github.com/RocketChat/Rocket.Chat/pull/12309))
-
-- Option to reset e2e key ([#12483](https://github.com/RocketChat/Rocket.Chat/pull/12483) by [@Hudell](https://github.com/Hudell))
-
-- /api/v1/spotlight: return joinCodeRequired field for rooms ([#12651](https://github.com/RocketChat/Rocket.Chat/pull/12651) by [@cardoso](https://github.com/cardoso))
-
-- New API Endpoints for the new version of JS SDK ([#12623](https://github.com/RocketChat/Rocket.Chat/pull/12623))
-
-- Setting to configure robots.txt content ([#12547](https://github.com/RocketChat/Rocket.Chat/pull/12547) by [@Hudell](https://github.com/Hudell))
-
-- Make Livechat's widget draggable ([#12378](https://github.com/RocketChat/Rocket.Chat/pull/12378))
-
 ### 🚀 Improvements
 
 
@@ -5375,289 +5121,131 @@
 
 - Convert rocketchat-ui-message to main module structure ([#12871](https://github.com/RocketChat/Rocket.Chat/pull/12871))
 
-- Convert rocketchat-videobridge to main module structure ([#12881](https://github.com/RocketChat/Rocket.Chat/pull/12881))
-
--  Convert rocketchat-reactions to main module structure ([#12888](https://github.com/RocketChat/Rocket.Chat/pull/12888))
-
-- Convert rocketchat-wordpress to main module structure ([#12887](https://github.com/RocketChat/Rocket.Chat/pull/12887))
-
-- Fix: snap push from ci ([#12883](https://github.com/RocketChat/Rocket.Chat/pull/12883))
-
-- Convert rocketchat-version-check to main module structure ([#12879](https://github.com/RocketChat/Rocket.Chat/pull/12879))
-
-- Convert rocketchat-user-data-dowload to main module structure ([#12877](https://github.com/RocketChat/Rocket.Chat/pull/12877))
-
-- Convert rocketchat-ui-vrecord to main module structure ([#12875](https://github.com/RocketChat/Rocket.Chat/pull/12875))
-
-- Convert rocketchat-ui-login to main module structure ([#12861](https://github.com/RocketChat/Rocket.Chat/pull/12861))
-
--  Convert rocketchat-ui-flextab to main module structure ([#12859](https://github.com/RocketChat/Rocket.Chat/pull/12859))
-
-- German translation typo fix for Reacted_with ([#12761](https://github.com/RocketChat/Rocket.Chat/pull/12761) by [@localguru](https://github.com/localguru))
-
--  Convert rocketchat-ui-account to main module structure ([#12842](https://github.com/RocketChat/Rocket.Chat/pull/12842))
-
-- Convert rocketchat-ui-clean-history to main module structure ([#12846](https://github.com/RocketChat/Rocket.Chat/pull/12846))
-
-- Convert rocketchat-ui-admin to main module structure ([#12844](https://github.com/RocketChat/Rocket.Chat/pull/12844))
-
-- Convert rocketchat-tokenpass to main module structure ([#12838](https://github.com/RocketChat/Rocket.Chat/pull/12838))
-
-- Remove rocketchat-tutum package ([#12840](https://github.com/RocketChat/Rocket.Chat/pull/12840))
-
-- Convert rocketchat-tooltip to main module structure ([#12839](https://github.com/RocketChat/Rocket.Chat/pull/12839))
-
-- Convert rocketchat-token-login to main module structure ([#12837](https://github.com/RocketChat/Rocket.Chat/pull/12837))
-
-- Convert rocketchat-statistics to main module structure ([#12833](https://github.com/RocketChat/Rocket.Chat/pull/12833))
-
-- Convert rocketchat-spotify to main module structure ([#12832](https://github.com/RocketChat/Rocket.Chat/pull/12832))
-
-- Convert rocketchat-sms to main module structure ([#12831](https://github.com/RocketChat/Rocket.Chat/pull/12831))
-
-- Convert rocketchat-search to main module structure ([#12801](https://github.com/RocketChat/Rocket.Chat/pull/12801))
-
-- Convert rocketchat-message-pin to main module structure ([#12767](https://github.com/RocketChat/Rocket.Chat/pull/12767))
-
-- Convert rocketchat-message-star to main module structure ([#12770](https://github.com/RocketChat/Rocket.Chat/pull/12770))
-
-- Convert rocketchat-slashcommands-msg to main module structure ([#12823](https://github.com/RocketChat/Rocket.Chat/pull/12823))
-
-- Convert rocketchat-smarsh-connector to main module structure ([#12830](https://github.com/RocketChat/Rocket.Chat/pull/12830))
-
-- Convert rocketchat-slider to main module structure ([#12828](https://github.com/RocketChat/Rocket.Chat/pull/12828))
-
-- Convert rocketchat-slashcommands-unarchiveroom to main module structure ([#12827](https://github.com/RocketChat/Rocket.Chat/pull/12827))
-
-- Dependencies update ([#12624](https://github.com/RocketChat/Rocket.Chat/pull/12624))
-
-- Convert rocketchat-slashcommands-topic to main module structure ([#12826](https://github.com/RocketChat/Rocket.Chat/pull/12826))
-
-- Convert rocketchat-slashcommands-open to main module structure ([#12825](https://github.com/RocketChat/Rocket.Chat/pull/12825))
-
-- Convert rocketchat-slashcommands-mute to main module structure ([#12824](https://github.com/RocketChat/Rocket.Chat/pull/12824))
-
-- Convert rocketchat-slashcommands-me to main module structure ([#12822](https://github.com/RocketChat/Rocket.Chat/pull/12822))
-
-- Convert rocketchat-slashcommands-leave to main module structure ([#12821](https://github.com/RocketChat/Rocket.Chat/pull/12821))
-
-- Convert rocketchat-slashcommands-kick to main module structure ([#12817](https://github.com/RocketChat/Rocket.Chat/pull/12817))
-
-- Convert rocketchat-slashcommands-join to main module structure ([#12816](https://github.com/RocketChat/Rocket.Chat/pull/12816))
-
-- Convert rocketchat-slashcommands-inviteall to main module structure ([#12815](https://github.com/RocketChat/Rocket.Chat/pull/12815))
-
-- Convert rocketchat-slashcommands-invite to main module structure ([#12814](https://github.com/RocketChat/Rocket.Chat/pull/12814))
-
-- Convert rocketchat-slashcommands-hide to main module structure ([#12813](https://github.com/RocketChat/Rocket.Chat/pull/12813))
-
-- Convert rocketchat-slashcommands-help to main module structure ([#12812](https://github.com/RocketChat/Rocket.Chat/pull/12812))
-
-- Convert rocketchat-slashcommands-create to main module structure ([#12811](https://github.com/RocketChat/Rocket.Chat/pull/12811))
-
-- Convert rocketchat-slashcomands-archiveroom to main module structure ([#12810](https://github.com/RocketChat/Rocket.Chat/pull/12810))
-
-- Convert rocketchat-slashcommands-asciiarts to main module structure ([#12808](https://github.com/RocketChat/Rocket.Chat/pull/12808))
-
-- Convert rocketchat-slackbridge to main module structure ([#12807](https://github.com/RocketChat/Rocket.Chat/pull/12807))
-
-- Convert rocketchat-setup-wizard to main module structure ([#12806](https://github.com/RocketChat/Rocket.Chat/pull/12806))
-
-- Convert rocketchat-sandstorm to main module structure ([#12799](https://github.com/RocketChat/Rocket.Chat/pull/12799))
-
-- Convert rocketchat-oauth2-server-config to main module structure ([#12773](https://github.com/RocketChat/Rocket.Chat/pull/12773))
-
-- Convert rocketchat-message-snippet to main module structure ([#12768](https://github.com/RocketChat/Rocket.Chat/pull/12768))
-
-- Fix CI deploy job ([#12803](https://github.com/RocketChat/Rocket.Chat/pull/12803))
-
-- Convert rocketchat-retention-policy to main module structure ([#12797](https://github.com/RocketChat/Rocket.Chat/pull/12797))
-
-- Convert rocketchat-push-notifications to main module structure ([#12778](https://github.com/RocketChat/Rocket.Chat/pull/12778))
-
-- Convert rocketchat-otr to main module structure ([#12777](https://github.com/RocketChat/Rocket.Chat/pull/12777))
-
-- Convert rocketchat-oembed to main module structure ([#12775](https://github.com/RocketChat/Rocket.Chat/pull/12775))
-
-- Convert rocketchat-migrations to main-module structure ([#12772](https://github.com/RocketChat/Rocket.Chat/pull/12772))
-
-- Convert rocketchat-message-mark-as-unread to main module structure ([#12766](https://github.com/RocketChat/Rocket.Chat/pull/12766))
-
-- Remove conventional changelog cli, we are using our own cli now (Houston) ([#12798](https://github.com/RocketChat/Rocket.Chat/pull/12798))
-
-- Convert rocketchat-message-attachments to main module structure ([#12760](https://github.com/RocketChat/Rocket.Chat/pull/12760))
-
-- Convert rocketchat-message-action to main module structure ([#12759](https://github.com/RocketChat/Rocket.Chat/pull/12759))
-
--  Convert rocketchat-mentions-flextab to main module structure ([#12757](https://github.com/RocketChat/Rocket.Chat/pull/12757))
-
-- Convert rocketchat-mentions to main module structure ([#12756](https://github.com/RocketChat/Rocket.Chat/pull/12756))
-
-- Convert rocketchat-markdown to main module structure ([#12755](https://github.com/RocketChat/Rocket.Chat/pull/12755))
-
-- Convert rocketchat-mapview to main module structure ([#12701](https://github.com/RocketChat/Rocket.Chat/pull/12701))
-
-- Add check to make sure releases was updated ([#12791](https://github.com/RocketChat/Rocket.Chat/pull/12791))
-
-- Merge master into develop & Set version to 0.73.0-develop ([#12776](https://github.com/RocketChat/Rocket.Chat/pull/12776))
-
-- Update Apps Engine to 1.3.1 ([#12741](https://github.com/RocketChat/Rocket.Chat/pull/12741))
-
-- Regression: Expand Administration sections by toggling section title ([#12736](https://github.com/RocketChat/Rocket.Chat/pull/12736))
-
-- Regression: Fix Safari detection in PDF previewing ([#12737](https://github.com/RocketChat/Rocket.Chat/pull/12737))
-
-- Regression: Account pages layout ([#12735](https://github.com/RocketChat/Rocket.Chat/pull/12735))
-
-- Regression: Inherit font-family for message box ([#12729](https://github.com/RocketChat/Rocket.Chat/pull/12729))
-
-- Fix some Ukrainian translations ([#12712](https://github.com/RocketChat/Rocket.Chat/pull/12712) by [@zdumitru](https://github.com/zdumitru))
-
-- Improve: Add missing translation keys. ([#12708](https://github.com/RocketChat/Rocket.Chat/pull/12708) by [@ura14h](https://github.com/ura14h))
-
-- Bump Apps Engine to 1.3.0 ([#12705](https://github.com/RocketChat/Rocket.Chat/pull/12705))
-
-- Fix: Exception when registering a user with gravatar ([#12699](https://github.com/RocketChat/Rocket.Chat/pull/12699))
-
-- Fix: Fix tests by increasing window size ([#12707](https://github.com/RocketChat/Rocket.Chat/pull/12707))
-
-- LingoHub based on develop ([#12684](https://github.com/RocketChat/Rocket.Chat/pull/12684))
-
-- Convert rocketchat-mail-messages to main module structure ([#12682](https://github.com/RocketChat/Rocket.Chat/pull/12682))
-
--  Convert rocketchat-livestream to main module structure ([#12679](https://github.com/RocketChat/Rocket.Chat/pull/12679))
-
-- Added "npm install" to quick start for developers ([#12374](https://github.com/RocketChat/Rocket.Chat/pull/12374) by [@wreiske](https://github.com/wreiske))
-
-- Convert rocketchat-ldap to main module structure ([#12678](https://github.com/RocketChat/Rocket.Chat/pull/12678))
-
-- Convert rocketchat-issuelinks to main module structure ([#12674](https://github.com/RocketChat/Rocket.Chat/pull/12674))
-
-- Convert rocketchat-integrations to main module structure ([#12670](https://github.com/RocketChat/Rocket.Chat/pull/12670))
+- Convert rocketchat-videobridge to main module structure ([#12881](https://github.com/RocketChat/Rocket.Chat/pull/12881))
 
-- Convert rocketchat-irc to main module structure ([#12672](https://github.com/RocketChat/Rocket.Chat/pull/12672))
+-  Convert rocketchat-reactions to main module structure ([#12888](https://github.com/RocketChat/Rocket.Chat/pull/12888))
 
-- Convert rocketchat-internal-hubot to main module structure ([#12671](https://github.com/RocketChat/Rocket.Chat/pull/12671))
+- Convert rocketchat-wordpress to main module structure ([#12887](https://github.com/RocketChat/Rocket.Chat/pull/12887))
 
-- Convert rocketchat-importer-hipchat-enterprise to main module structure ([#12665](https://github.com/RocketChat/Rocket.Chat/pull/12665))
+- Fix: snap push from ci ([#12883](https://github.com/RocketChat/Rocket.Chat/pull/12883))
 
-- Convert rocketchat-importer-slack-users to main module structure ([#12669](https://github.com/RocketChat/Rocket.Chat/pull/12669))
+- Convert rocketchat-version-check to main module structure ([#12879](https://github.com/RocketChat/Rocket.Chat/pull/12879))
 
--  Convert rocketchat-importer-slack to main module structure ([#12666](https://github.com/RocketChat/Rocket.Chat/pull/12666))
+- Convert rocketchat-user-data-dowload to main module structure ([#12877](https://github.com/RocketChat/Rocket.Chat/pull/12877))
 
-- Convert rocketchat-iframe-login to main module structure ([#12661](https://github.com/RocketChat/Rocket.Chat/pull/12661))
+- Convert rocketchat-ui-vrecord to main module structure ([#12875](https://github.com/RocketChat/Rocket.Chat/pull/12875))
 
-- Convert rocketchat-importer to main module structure ([#12662](https://github.com/RocketChat/Rocket.Chat/pull/12662))
+- Convert rocketchat-ui-login to main module structure ([#12861](https://github.com/RocketChat/Rocket.Chat/pull/12861))
 
-- Convert rocketchat-importer-csv to main module structure ([#12663](https://github.com/RocketChat/Rocket.Chat/pull/12663))
+-  Convert rocketchat-ui-flextab to main module structure ([#12859](https://github.com/RocketChat/Rocket.Chat/pull/12859))
 
-- Convert rocketchat-importer-hipchat to main module structure ([#12664](https://github.com/RocketChat/Rocket.Chat/pull/12664))
+- German translation typo fix for Reacted_with ([#12761](https://github.com/RocketChat/Rocket.Chat/pull/12761) by [@localguru](https://github.com/localguru))
 
-- Convert rocketchat-highlight-words to main module structure ([#12659](https://github.com/RocketChat/Rocket.Chat/pull/12659))
+-  Convert rocketchat-ui-account to main module structure ([#12842](https://github.com/RocketChat/Rocket.Chat/pull/12842))
 
-- Convert rocketchat-grant to main module structure ([#12657](https://github.com/RocketChat/Rocket.Chat/pull/12657))
+- Convert rocketchat-ui-clean-history to main module structure ([#12846](https://github.com/RocketChat/Rocket.Chat/pull/12846))
 
-- Convert rocketchat-graphql to main module structure ([#12658](https://github.com/RocketChat/Rocket.Chat/pull/12658))
+- Convert rocketchat-ui-admin to main module structure ([#12844](https://github.com/RocketChat/Rocket.Chat/pull/12844))
 
-- Convert rocketchat-google-vision to main module structure ([#12649](https://github.com/RocketChat/Rocket.Chat/pull/12649))
+- Convert rocketchat-tokenpass to main module structure ([#12838](https://github.com/RocketChat/Rocket.Chat/pull/12838))
 
-- Removed RocketChatFile from globals ([#12650](https://github.com/RocketChat/Rocket.Chat/pull/12650))
+- Remove rocketchat-tutum package ([#12840](https://github.com/RocketChat/Rocket.Chat/pull/12840))
 
-- Added imports for global variables in rocketchat-google-natural-language package ([#12647](https://github.com/RocketChat/Rocket.Chat/pull/12647))
+- Convert rocketchat-tooltip to main module structure ([#12839](https://github.com/RocketChat/Rocket.Chat/pull/12839))
 
-- Convert rocketchat-gitlab to main module structure ([#12646](https://github.com/RocketChat/Rocket.Chat/pull/12646))
+- Convert rocketchat-token-login to main module structure ([#12837](https://github.com/RocketChat/Rocket.Chat/pull/12837))
 
-- Convert rocketchat-file to main module structure ([#12644](https://github.com/RocketChat/Rocket.Chat/pull/12644))
+- Convert rocketchat-statistics to main module structure ([#12833](https://github.com/RocketChat/Rocket.Chat/pull/12833))
 
-- Convert rocketchat-github-enterprise to main module structure ([#12642](https://github.com/RocketChat/Rocket.Chat/pull/12642))
+- Convert rocketchat-spotify to main module structure ([#12832](https://github.com/RocketChat/Rocket.Chat/pull/12832))
 
-- Fix: Add email dependency in package.js ([#12645](https://github.com/RocketChat/Rocket.Chat/pull/12645))
+- Convert rocketchat-sms to main module structure ([#12831](https://github.com/RocketChat/Rocket.Chat/pull/12831))
 
-- Convert rocketchat-custom-sounds to main module structure ([#12599](https://github.com/RocketChat/Rocket.Chat/pull/12599))
+- Convert rocketchat-search to main module structure ([#12801](https://github.com/RocketChat/Rocket.Chat/pull/12801))
 
-- Fix crowd error with import of SyncedCron ([#12641](https://github.com/RocketChat/Rocket.Chat/pull/12641))
+- Convert rocketchat-message-pin to main module structure ([#12767](https://github.com/RocketChat/Rocket.Chat/pull/12767))
 
-- Convert emoji-emojione to main module structure ([#12605](https://github.com/RocketChat/Rocket.Chat/pull/12605))
+- Convert rocketchat-message-star to main module structure ([#12770](https://github.com/RocketChat/Rocket.Chat/pull/12770))
 
-- Convert rocketchat-favico to main module structure ([#12607](https://github.com/RocketChat/Rocket.Chat/pull/12607))
+- Convert rocketchat-slashcommands-msg to main module structure ([#12823](https://github.com/RocketChat/Rocket.Chat/pull/12823))
 
--  Convert rocketchat-emoji-custom to main module structure ([#12604](https://github.com/RocketChat/Rocket.Chat/pull/12604))
+- Convert rocketchat-smarsh-connector to main module structure ([#12830](https://github.com/RocketChat/Rocket.Chat/pull/12830))
 
-- Convert rocketchat-error-handler to main module structure ([#12606](https://github.com/RocketChat/Rocket.Chat/pull/12606))
+- Convert rocketchat-slider to main module structure ([#12828](https://github.com/RocketChat/Rocket.Chat/pull/12828))
 
-- Convert rocketchat-drupal to main module structure ([#12601](https://github.com/RocketChat/Rocket.Chat/pull/12601))
+- Convert rocketchat-slashcommands-unarchiveroom to main module structure ([#12827](https://github.com/RocketChat/Rocket.Chat/pull/12827))
 
-- Convert rocketchat-crowd to main module structure ([#12596](https://github.com/RocketChat/Rocket.Chat/pull/12596))
+- Dependencies update ([#12624](https://github.com/RocketChat/Rocket.Chat/pull/12624))
 
-- Convert rocketchat-emoji to main module structure ([#12603](https://github.com/RocketChat/Rocket.Chat/pull/12603))
+- Convert rocketchat-slashcommands-topic to main module structure ([#12826](https://github.com/RocketChat/Rocket.Chat/pull/12826))
 
-- Fix users.setAvatar endpoint tests and logic ([#12625](https://github.com/RocketChat/Rocket.Chat/pull/12625))
+- Convert rocketchat-slashcommands-open to main module structure ([#12825](https://github.com/RocketChat/Rocket.Chat/pull/12825))
 
-- [DOCS] Remove Cordova links, include F-Droid download button and few other adjustments ([#12583](https://github.com/RocketChat/Rocket.Chat/pull/12583) by [@rafaelks](https://github.com/rafaelks))
+- Convert rocketchat-slashcommands-mute to main module structure ([#12824](https://github.com/RocketChat/Rocket.Chat/pull/12824))
 
-- Convert rocketchat-dolphin to main module structure ([#12600](https://github.com/RocketChat/Rocket.Chat/pull/12600))
+- Convert rocketchat-slashcommands-me to main module structure ([#12822](https://github.com/RocketChat/Rocket.Chat/pull/12822))
 
--  Convert rocketchat-channel-settings to main module structure ([#12594](https://github.com/RocketChat/Rocket.Chat/pull/12594))
+- Convert rocketchat-slashcommands-leave to main module structure ([#12821](https://github.com/RocketChat/Rocket.Chat/pull/12821))
 
-- Convert rocketchat-cors to main module structure ([#12595](https://github.com/RocketChat/Rocket.Chat/pull/12595))
+- Convert rocketchat-slashcommands-kick to main module structure ([#12817](https://github.com/RocketChat/Rocket.Chat/pull/12817))
 
-- Convert rocketchat-autotranslate to main module structure ([#12530](https://github.com/RocketChat/Rocket.Chat/pull/12530))
+- Convert rocketchat-slashcommands-join to main module structure ([#12816](https://github.com/RocketChat/Rocket.Chat/pull/12816))
 
-- Convert rocketchat-channel-settings-mail-messages to main module structure ([#12537](https://github.com/RocketChat/Rocket.Chat/pull/12537))
+- Convert rocketchat-slashcommands-inviteall to main module structure ([#12815](https://github.com/RocketChat/Rocket.Chat/pull/12815))
 
-- Convert rocketchat-colors to main module structure ([#12538](https://github.com/RocketChat/Rocket.Chat/pull/12538))
+- Convert rocketchat-slashcommands-invite to main module structure ([#12814](https://github.com/RocketChat/Rocket.Chat/pull/12814))
 
-- Convert rocketchat-cas to main module structure ([#12532](https://github.com/RocketChat/Rocket.Chat/pull/12532))
+- Convert rocketchat-slashcommands-hide to main module structure ([#12813](https://github.com/RocketChat/Rocket.Chat/pull/12813))
 
-- Convert rocketchat-bot-helpers to main module structure ([#12531](https://github.com/RocketChat/Rocket.Chat/pull/12531))
+- Convert rocketchat-slashcommands-help to main module structure ([#12812](https://github.com/RocketChat/Rocket.Chat/pull/12812))
 
-- Convert rocketchat-autolinker to main module structure ([#12529](https://github.com/RocketChat/Rocket.Chat/pull/12529))
+- Convert rocketchat-slashcommands-create to main module structure ([#12811](https://github.com/RocketChat/Rocket.Chat/pull/12811))
 
-- Convert rocketchat-authorization to main module structure ([#12523](https://github.com/RocketChat/Rocket.Chat/pull/12523))
+- Convert rocketchat-slashcomands-archiveroom to main module structure ([#12810](https://github.com/RocketChat/Rocket.Chat/pull/12810))
 
-- Fix CSS import order ([#12524](https://github.com/RocketChat/Rocket.Chat/pull/12524))
+- Convert rocketchat-slashcommands-asciiarts to main module structure ([#12808](https://github.com/RocketChat/Rocket.Chat/pull/12808))
 
-- Remove template for feature requests as issues ([#12426](https://github.com/RocketChat/Rocket.Chat/pull/12426))
+- Convert rocketchat-slackbridge to main module structure ([#12807](https://github.com/RocketChat/Rocket.Chat/pull/12807))
 
-- Fix punctuation, spelling, and grammar ([#12451](https://github.com/RocketChat/Rocket.Chat/pull/12451) by [@imronras](https://github.com/imronras))
+- Convert rocketchat-setup-wizard to main module structure ([#12806](https://github.com/RocketChat/Rocket.Chat/pull/12806))
 
-- Convert rocketchat-assets to main module structure ([#12521](https://github.com/RocketChat/Rocket.Chat/pull/12521))
+- Convert rocketchat-sandstorm to main module structure ([#12799](https://github.com/RocketChat/Rocket.Chat/pull/12799))
 
-- Convert rocketchat-api to main module structure ([#12510](https://github.com/RocketChat/Rocket.Chat/pull/12510))
+- Convert rocketchat-oauth2-server-config to main module structure ([#12773](https://github.com/RocketChat/Rocket.Chat/pull/12773))
 
-- Convert rocketchat-analytics to main module structure ([#12506](https://github.com/RocketChat/Rocket.Chat/pull/12506))
+- Convert rocketchat-message-snippet to main module structure ([#12768](https://github.com/RocketChat/Rocket.Chat/pull/12768))
 
-- Convert rocketchat-action-links to main module structure ([#12503](https://github.com/RocketChat/Rocket.Chat/pull/12503))
+- Fix CI deploy job ([#12803](https://github.com/RocketChat/Rocket.Chat/pull/12803))
 
-- Convert rocketchat-2fa to main module structure ([#12501](https://github.com/RocketChat/Rocket.Chat/pull/12501))
+- Convert rocketchat-retention-policy to main module structure ([#12797](https://github.com/RocketChat/Rocket.Chat/pull/12797))
 
-- Convert meteor-timesync to main module structure ([#12495](https://github.com/RocketChat/Rocket.Chat/pull/12495))
+- Convert rocketchat-push-notifications to main module structure ([#12778](https://github.com/RocketChat/Rocket.Chat/pull/12778))
 
-- Convert meteor-autocomplete package to main module structure ([#12491](https://github.com/RocketChat/Rocket.Chat/pull/12491))
+- Convert rocketchat-otr to main module structure ([#12777](https://github.com/RocketChat/Rocket.Chat/pull/12777))
 
-- Convert meteor-accounts-saml to main module structure ([#12486](https://github.com/RocketChat/Rocket.Chat/pull/12486))
+- Convert rocketchat-oembed to main module structure ([#12775](https://github.com/RocketChat/Rocket.Chat/pull/12775))
 
-- Convert chatpal search package to modular structure ([#12485](https://github.com/RocketChat/Rocket.Chat/pull/12485))
+- Convert rocketchat-migrations to main-module structure ([#12772](https://github.com/RocketChat/Rocket.Chat/pull/12772))
 
-- Removal of TAPi18n and TAPi18next global variables ([#12467](https://github.com/RocketChat/Rocket.Chat/pull/12467))
+- Convert rocketchat-message-mark-as-unread to main module structure ([#12766](https://github.com/RocketChat/Rocket.Chat/pull/12766))
 
-- Removal of Template, Blaze, BlazeLayout, FlowRouter, DDPRateLimiter, Session, UAParser, Promise, Reload and CryptoJS global variables ([#12433](https://github.com/RocketChat/Rocket.Chat/pull/12433))
+- Remove conventional changelog cli, we are using our own cli now (Houston) ([#12798](https://github.com/RocketChat/Rocket.Chat/pull/12798))
 
-- Removal of Match, check, moment, Tracker and Mongo global variables ([#12410](https://github.com/RocketChat/Rocket.Chat/pull/12410))
+- Convert rocketchat-message-attachments to main module structure ([#12760](https://github.com/RocketChat/Rocket.Chat/pull/12760))
 
-- Removal of EJSON, Accounts, Email, HTTP, Random, ReactiveDict, ReactiveVar, SHA256 and WebApp global variables ([#12377](https://github.com/RocketChat/Rocket.Chat/pull/12377))
+- Convert rocketchat-message-action to main module structure ([#12759](https://github.com/RocketChat/Rocket.Chat/pull/12759))
 
-- Removal of Meteor global variable ([#12371](https://github.com/RocketChat/Rocket.Chat/pull/12371))
+-  Convert rocketchat-mentions-flextab to main module structure ([#12757](https://github.com/RocketChat/Rocket.Chat/pull/12757))
 
-- Fix ES translation ([#12509](https://github.com/RocketChat/Rocket.Chat/pull/12509))
+- Convert rocketchat-mentions to main module structure ([#12756](https://github.com/RocketChat/Rocket.Chat/pull/12756))
 
-- LingoHub based on develop ([#12470](https://github.com/RocketChat/Rocket.Chat/pull/12470))
+- Convert rocketchat-markdown to main module structure ([#12755](https://github.com/RocketChat/Rocket.Chat/pull/12755))
 
-- Update npm dependencies ([#12465](https://github.com/RocketChat/Rocket.Chat/pull/12465))
+- Convert rocketchat-mapview to main module structure ([#12701](https://github.com/RocketChat/Rocket.Chat/pull/12701))
 
-- Fix: Developers not being able to debug root files in VSCode ([#12440](https://github.com/RocketChat/Rocket.Chat/pull/12440) by [@mrsimpson](https://github.com/mrsimpson))
+- Add check to make sure releases was updated ([#12791](https://github.com/RocketChat/Rocket.Chat/pull/12791))
 
-- Merge master into develop & Set version to 0.72.0-develop ([#12460](https://github.com/RocketChat/Rocket.Chat/pull/12460) by [@Hudell](https://github.com/Hudell))
+- Merge master into develop & Set version to 0.73.0-develop ([#12776](https://github.com/RocketChat/Rocket.Chat/pull/12776))
 
 - Update Apps Engine to 1.3.1 ([#12741](https://github.com/RocketChat/Rocket.Chat/pull/12741))
 
@@ -5669,34 +5257,7 @@
 
 - Regression: Inherit font-family for message box ([#12729](https://github.com/RocketChat/Rocket.Chat/pull/12729))
 
-- [@AndreamApp](https://github.com/AndreamApp)
-- [@Hudell](https://github.com/Hudell)
-- [@Ismaw34](https://github.com/Ismaw34)
-- [@alexbartsch](https://github.com/alexbartsch)
-- [@cardoso](https://github.com/cardoso)
-- [@cyberb](https://github.com/cyberb)
-- [@hypery2k](https://github.com/hypery2k)
-- [@imronras](https://github.com/imronras)
-- [@karakayasemi](https://github.com/karakayasemi)
-- [@karlprieb](https://github.com/karlprieb)
-- [@localguru](https://github.com/localguru)
-- [@lvyue](https://github.com/lvyue)
-- [@mathysie](https://github.com/mathysie)
-- [@mbrodala](https://github.com/mbrodala)
-- [@mrsimpson](https://github.com/mrsimpson)
-- [@nicolasbock](https://github.com/nicolasbock)
-- [@pfuender](https://github.com/pfuender)
-- [@ph1p](https://github.com/ph1p)
-- [@piotrkochan](https://github.com/piotrkochan)
-- [@rafaelks](https://github.com/rafaelks)
-- [@ramrami](https://github.com/ramrami)
-- [@rssilva](https://github.com/rssilva)
-- [@sanketsingh24](https://github.com/sanketsingh24)
-- [@tsukiRep](https://github.com/tsukiRep)
-- [@ura14h](https://github.com/ura14h)
-- [@vinade](https://github.com/vinade)
-- [@wreiske](https://github.com/wreiske)
-- [@zdumitru](https://github.com/zdumitru)
+- Fix some Ukrainian translations ([#12712](https://github.com/RocketChat/Rocket.Chat/pull/12712) by [@zdumitru](https://github.com/zdumitru))
 
 - Improve: Add missing translation keys. ([#12708](https://github.com/RocketChat/Rocket.Chat/pull/12708) by [@ura14h](https://github.com/ura14h))
 
@@ -5720,8 +5281,7 @@
 
 - Convert rocketchat-integrations to main module structure ([#12670](https://github.com/RocketChat/Rocket.Chat/pull/12670))
 
-# 0.72.2
-`2018-12-10  ·  3 🐛  ·  1 🔍  ·  2 👩‍💻👨‍💻`
+- Convert rocketchat-irc to main module structure ([#12672](https://github.com/RocketChat/Rocket.Chat/pull/12672))
 
 - Convert rocketchat-internal-hubot to main module structure ([#12671](https://github.com/RocketChat/Rocket.Chat/pull/12671))
 
@@ -5729,9 +5289,7 @@
 
 - Convert rocketchat-importer-slack-users to main module structure ([#12669](https://github.com/RocketChat/Rocket.Chat/pull/12669))
 
-- Reset password email ([#12898](https://github.com/RocketChat/Rocket.Chat/pull/12898))
-
-- PDF view loading indicator ([#12882](https://github.com/RocketChat/Rocket.Chat/pull/12882))
+-  Convert rocketchat-importer-slack to main module structure ([#12666](https://github.com/RocketChat/Rocket.Chat/pull/12666))
 
 - Convert rocketchat-iframe-login to main module structure ([#12661](https://github.com/RocketChat/Rocket.Chat/pull/12661))
 
@@ -7398,9 +6956,6 @@
 
 ### 🐛 Bug fixes
 
-- Livechat taking inquiry leading to 404 page ([#11406](https://github.com/RocketChat/Rocket.Chat/pull/11406))
-
-- All messages notifications via email were sent as mention alert ([#11398](https://github.com/RocketChat/Rocket.Chat/pull/11398))
 
 - Livechat taking inquiry leading to 404 page ([#11406](https://github.com/RocketChat/Rocket.Chat/pull/11406))
 
@@ -9311,99 +8866,15 @@
 
 - Fix: Multiple unread indicators ([#9120](https://github.com/RocketChat/Rocket.Chat/pull/9120))
 
-- Show modal with announcement ([#9241](https://github.com/RocketChat/Rocket.Chat/pull/9241) by [@karlprieb](https://github.com/karlprieb))
-
-- "Enter usernames" placeholder is cutting in "create channel" view ([#9194](https://github.com/RocketChat/Rocket.Chat/pull/9194) by [@TheReal1604](https://github.com/TheReal1604))
-
-- File upload not working on IE and weird on Chrome ([#9206](https://github.com/RocketChat/Rocket.Chat/pull/9206) by [@karlprieb](https://github.com/karlprieb))
-
-- make the cross icon on user selection at channel creation page work ([#9176](https://github.com/RocketChat/Rocket.Chat/pull/9176) by [@karlprieb](https://github.com/karlprieb) & [@vitor-nagao](https://github.com/vitor-nagao))
-
-- Made welcome emails more readable ([#9193](https://github.com/RocketChat/Rocket.Chat/pull/9193) by [@HammyHavoc](https://github.com/HammyHavoc))
-
-- Cursor position when reply on safari ([#9185](https://github.com/RocketChat/Rocket.Chat/pull/9185) by [@karlprieb](https://github.com/karlprieb))
-
-- Emoji size on last message preview ([#9186](https://github.com/RocketChat/Rocket.Chat/pull/9186) by [@karlprieb](https://github.com/karlprieb))
-
-- Unread bar position when room have announcement ([#9188](https://github.com/RocketChat/Rocket.Chat/pull/9188) by [@karlprieb](https://github.com/karlprieb))
-
-- Error when user roles is missing or is invalid ([#9040](https://github.com/RocketChat/Rocket.Chat/pull/9040) by [@paulovitin](https://github.com/paulovitin))
-
-- Make mentions and menu icons color darker ([#8922](https://github.com/RocketChat/Rocket.Chat/pull/8922) by [@karlprieb](https://github.com/karlprieb))
-
-- "Use Emoji" preference not working ([#9182](https://github.com/RocketChat/Rocket.Chat/pull/9182) by [@karlprieb](https://github.com/karlprieb))
-
-- channel create scroll on small screens ([#9168](https://github.com/RocketChat/Rocket.Chat/pull/9168) by [@karlprieb](https://github.com/karlprieb))
-
-- go to replied message ([#9172](https://github.com/RocketChat/Rocket.Chat/pull/9172) by [@karlprieb](https://github.com/karlprieb))
-
-- modal data on enter and modal style for file preview ([#9171](https://github.com/RocketChat/Rocket.Chat/pull/9171) by [@karlprieb](https://github.com/karlprieb))
-
-- show oauth logins when adblock is used ([#9170](https://github.com/RocketChat/Rocket.Chat/pull/9170) by [@karlprieb](https://github.com/karlprieb))
-
-- Last sent message reoccurs in textbox ([#9169](https://github.com/RocketChat/Rocket.Chat/pull/9169))
-
-- Update Rocket.Chat for sandstorm ([#9062](https://github.com/RocketChat/Rocket.Chat/pull/9062) by [@peterlee0127](https://github.com/peterlee0127))
-
-- Importers not recovering when an error occurs ([#9134](https://github.com/RocketChat/Rocket.Chat/pull/9134))
-
-- Do not block room while loading history ([#9121](https://github.com/RocketChat/Rocket.Chat/pull/9121))
-
-- Channel page error ([#9091](https://github.com/RocketChat/Rocket.Chat/pull/9091) by [@ggrish](https://github.com/ggrish))
-
-- Contextual bar redesign ([#9481](https://github.com/RocketChat/Rocket.Chat/pull/9481) by [@gdelavald](https://github.com/gdelavald) & [@karlprieb](https://github.com/karlprieb))
-
-- mention-here is missing i18n text #9455 ([#9456](https://github.com/RocketChat/Rocket.Chat/pull/9456) by [@ryjones](https://github.com/ryjones))
-
-- Fix livechat visitor edit ([#9506](https://github.com/RocketChat/Rocket.Chat/pull/9506))
-
-- large names on userinfo, and admin user bug on users with no usernames ([#9493](https://github.com/RocketChat/Rocket.Chat/pull/9493) by [@gdelavald](https://github.com/gdelavald))
-
-<details>
-<summary>🔍 Minor changes</summary>
-
-
-- Release 0.61.0 ([#9533](https://github.com/RocketChat/Rocket.Chat/pull/9533) by [@karlprieb](https://github.com/karlprieb) & [@ryjones](https://github.com/ryjones))
-
-- Add community bot ([#9439](https://github.com/RocketChat/Rocket.Chat/pull/9439))
-
-- Use correct version of Mailparser module ([#9356](https://github.com/RocketChat/Rocket.Chat/pull/9356))
-
-- Update Marked dependecy to 0.3.9 ([#9346](https://github.com/RocketChat/Rocket.Chat/pull/9346))
-
-- Fix: English language improvements ([#9299](https://github.com/RocketChat/Rocket.Chat/pull/9299) by [@HammyHavoc](https://github.com/HammyHavoc))
-
-- Fix: Change 'Wordpress' to 'WordPress ([#9291](https://github.com/RocketChat/Rocket.Chat/pull/9291) by [@HammyHavoc](https://github.com/HammyHavoc))
-
-- Fix: Improved README.md ([#9290](https://github.com/RocketChat/Rocket.Chat/pull/9290) by [@HammyHavoc](https://github.com/HammyHavoc))
-
-- Fix: README typo ([#9286](https://github.com/RocketChat/Rocket.Chat/pull/9286) by [@HammyHavoc](https://github.com/HammyHavoc))
-
-- Develop sync - Bump version to 0.61.0-develop ([#9260](https://github.com/RocketChat/Rocket.Chat/pull/9260) by [@cpitman](https://github.com/cpitman) & [@karlprieb](https://github.com/karlprieb))
-
-- Do not change room icon color when room is unread ([#9257](https://github.com/RocketChat/Rocket.Chat/pull/9257))
-
-- LingoHub based on develop ([#9256](https://github.com/RocketChat/Rocket.Chat/pull/9256))
-
-- Fix: Sidebar item on rtl and small devices ([#9247](https://github.com/RocketChat/Rocket.Chat/pull/9247) by [@karlprieb](https://github.com/karlprieb))
-
-- Add curl, its missing on worker nodes so has to be explicitly added ([#9248](https://github.com/RocketChat/Rocket.Chat/pull/9248))
-
-- Fix: Unneeded warning in payload of REST API calls ([#9240](https://github.com/RocketChat/Rocket.Chat/pull/9240))
-
-- Fix: Missing option to set user's avatar from a url ([#9229](https://github.com/RocketChat/Rocket.Chat/pull/9229))
-
-- Fix: Upload access control too distributed ([#9215](https://github.com/RocketChat/Rocket.Chat/pull/9215))
-
-- Fix: Username find is matching partially ([#9217](https://github.com/RocketChat/Rocket.Chat/pull/9217))
+- [DOCS] Update the links of our Mobile Apps in Features topic ([#9469](https://github.com/RocketChat/Rocket.Chat/pull/9469) by [@rafaelks](https://github.com/rafaelks))
 
-- Fix: updating last message on message edit or delete ([#9227](https://github.com/RocketChat/Rocket.Chat/pull/9227))
+- Update license ([#9490](https://github.com/RocketChat/Rocket.Chat/pull/9490))
 
-- Fix: Rooms and users are using different avatar style ([#9196](https://github.com/RocketChat/Rocket.Chat/pull/9196))
+- Prevent NPM package-lock inside livechat ([#9504](https://github.com/RocketChat/Rocket.Chat/pull/9504))
 
-- Replace postcss-nesting with postcss-nested ([#9200](https://github.com/RocketChat/Rocket.Chat/pull/9200))
+</details>
 
-- Dependencies Update ([#9197](https://github.com/RocketChat/Rocket.Chat/pull/9197))
+### 👩‍💻👨‍💻 Contributors 😍
 
 - [@HammyHavoc](https://github.com/HammyHavoc)
 - [@TheReal1604](https://github.com/TheReal1604)
@@ -12023,4 +11494,4 @@
 - [@graywolf336](https://github.com/graywolf336)
 - [@marceloschmidt](https://github.com/marceloschmidt)
 - [@rodrigok](https://github.com/rodrigok)
-- [@sampaiodiego](https://github.com/sampaiodiego)
+- [@sampaiodiego](https://github.com/sampaiodiego)
\ No newline at end of file
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index 14168374f4e2..8d691dd7f54b 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.1.0-rc.13"
+	"version": "3.1.0"
 }
diff --git a/package.json b/package.json
index 057659f699eb..390186fce3fa 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.1.0-rc.13",
+	"version": "3.1.0",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

From 1ace4606af0d44f58822934e5401d6457d474f3e Mon Sep 17 00:00:00 2001
From: Diego Sampaio <chinello@gmail.com>
Date: Thu, 9 Apr 2020 23:28:22 -0300
Subject: [PATCH 202/223] Bump version to 3.2.0-develop

---
 .docker/Dockerfile.rhel   | 2 +-
 app/utils/rocketchat.info | 2 +-
 package.json              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index e0084ee1a1b6..d31b51dace52 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
 FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
 
-ENV RC_VERSION 3.1.0
+ENV RC_VERSION 3.2.0-develop
 
 MAINTAINER buildmaster@rocket.chat
 
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index 8d691dd7f54b..21f9e2ed028a 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "3.1.0"
+	"version": "3.2.0-develop"
 }
diff --git a/package.json b/package.json
index 390186fce3fa..cda18917ced2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "Rocket.Chat",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "3.1.0",
+	"version": "3.2.0-develop",
 	"author": {
 		"name": "Rocket.Chat",
 		"url": "https://rocket.chat/"

From 7a46c7d122bfc96977ac21b8ccddebb9d7bf630c Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Fri, 10 Apr 2020 15:52:10 -0300
Subject: [PATCH 203/223] [IMPROVE] Increase decoupling between React
 components and Blaze templates (#16642)

---
 .../client/views/Multiselect.html             |   3 -
 .../client/views/Multiselect.js               |  35 +-
 app/ui-message/client/blocks/Blocks.html      |   3 -
 app/ui-message/client/blocks/Blocks.js        |  48 --
 .../client/blocks/ButtonElement.html          |   3 -
 app/ui-message/client/blocks/MessageBlock.js  | 196 ++------
 app/ui-message/client/blocks/ModalBlock.html  |   3 -
 app/ui-message/client/blocks/ModalBlock.js    | 441 +++++++++++++-----
 app/ui-message/client/blocks/TextBlock.html   |  12 -
 app/ui-message/client/blocks/TextBlock.js     |   5 -
 app/ui-message/client/blocks/index.js         |   9 +-
 app/ui-message/client/blocks/styles.css       |  18 -
 app/ui-sidenav/client/SortList.js             |   2 +
 app/ui-sidenav/client/sidebarHeader.js        |   6 +-
 app/ui-utils/client/lib/callMethod.js         |   2 +-
 app/ui/client/index.js                        |   5 +-
 app/ui/client/views/app/RoomForeword.html     |   3 -
 app/ui/client/views/app/RoomForeword.js       |  46 +-
 .../views/app/components/Directory/index.js   |   2 +
 .../components/admin/info/InformationRoute.js |   2 +
 client/components/admin/settings/GroupPage.js |  10 +-
 .../admin/settings/NotAuthorizedPage.js       |   4 +-
 client/components/admin/settings/Section.js   |  15 +-
 .../admin/settings/SettingsRoute.js           |   9 +-
 .../inputs/MultiSelectSettingInput.js         |   2 +
 .../settings/inputs/StringSettingInput.js     |   8 +-
 .../components/pageNotFound/PageNotFound.js   |   2 +
 .../setupWizard/SetupWizardRoute.js           |   2 +
 client/createTemplateForComponent.js          |  66 ---
 client/providers/MeteorProvider.js            |   2 +
 client/reactAdapters.js                       | 183 ++++++++
 client/routes.js                              |  89 ++--
 .../components/EngagementDashboardRoute.js    |   3 +-
 ee/app/engagement-dashboard/client/routes.js  |  15 +-
 34 files changed, 651 insertions(+), 603 deletions(-)
 delete mode 100644 app/channel-settings/client/views/Multiselect.html
 delete mode 100644 app/ui-message/client/blocks/Blocks.html
 delete mode 100644 app/ui-message/client/blocks/Blocks.js
 delete mode 100644 app/ui-message/client/blocks/ButtonElement.html
 delete mode 100644 app/ui-message/client/blocks/ModalBlock.html
 delete mode 100644 app/ui-message/client/blocks/TextBlock.html
 delete mode 100644 app/ui-message/client/blocks/TextBlock.js
 delete mode 100644 app/ui-message/client/blocks/styles.css
 delete mode 100644 app/ui/client/views/app/RoomForeword.html
 delete mode 100644 client/createTemplateForComponent.js
 create mode 100644 client/reactAdapters.js

diff --git a/app/channel-settings/client/views/Multiselect.html b/app/channel-settings/client/views/Multiselect.html
deleted file mode 100644
index 15e2b1884545..000000000000
--- a/app/channel-settings/client/views/Multiselect.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<template name="Multiselect">
-	<div class="rc-multiselect" style='display: flex;'></div>
-</template>
diff --git a/app/channel-settings/client/views/Multiselect.js b/app/channel-settings/client/views/Multiselect.js
index 160901096f14..f9400fa1b776 100644
--- a/app/channel-settings/client/views/Multiselect.js
+++ b/app/channel-settings/client/views/Multiselect.js
@@ -1,23 +1,12 @@
-import './Multiselect.html';
-import { Template } from 'meteor/templating';
-
-import { MultiSelectSettingInput } from '../../../../client/components/admin/settings/inputs/MultiSelectSettingInput';
-
-
-Template.Multiselect.onRendered(async function() {
-	const { MeteorProvider } = await import('../../../../client/providers/MeteorProvider');
-	const React = await import('react');
-	const ReactDOM = await import('react-dom');
-	this.container = this.firstNode;
-	this.autorun(() => {
-		ReactDOM.render(React.createElement(MeteorProvider, {
-			children: React.createElement(MultiSelectSettingInput, Template.currentData()),
-		}), this.container);
-	});
-});
-
-
-Template.Multiselect.onDestroyed(async function() {
-	const ReactDOM = await import('react-dom');
-	this.container && ReactDOM.unmountComponentAtNode(this.container);
-});
+import { HTML } from 'meteor/htmljs';
+
+import { createTemplateForComponent } from '../../../../client/reactAdapters';
+
+createTemplateForComponent(
+	'Multiselect',
+	() => import('../../../../client/components/admin/settings/inputs/MultiSelectSettingInput'),
+	{
+		// eslint-disable-next-line new-cap
+		renderContainerView: () => HTML.DIV({ class: 'rc-multiselect', style: 'display: flex;' }),
+	},
+);
diff --git a/app/ui-message/client/blocks/Blocks.html b/app/ui-message/client/blocks/Blocks.html
deleted file mode 100644
index 0d3495e14c53..000000000000
--- a/app/ui-message/client/blocks/Blocks.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<template name="Blocks">
-	<div class="js-block-wrapper"></div>
-</template>
diff --git a/app/ui-message/client/blocks/Blocks.js b/app/ui-message/client/blocks/Blocks.js
deleted file mode 100644
index 9adf2cc61833..000000000000
--- a/app/ui-message/client/blocks/Blocks.js
+++ /dev/null
@@ -1,48 +0,0 @@
-import { UIKitIncomingInteractionContainerType } from '@rocket.chat/apps-engine/definition/uikit/UIKitIncomingInteractionContainer';
-import { ReactiveVar } from 'meteor/reactive-var';
-import { Template } from 'meteor/templating';
-
-import * as ActionManager from '../ActionManager';
-import './Blocks.html';
-import { messageBlockWithContext } from './MessageBlock';
-
-
-Template.Blocks.onRendered(async function() {
-	const React = await import('react');
-	const ReactDOM = await import('react-dom');
-	const state = new ReactiveVar();
-	this.autorun(() => {
-		state.set(Template.currentData());
-	});
-
-	ReactDOM.render(
-		React.createElement(messageBlockWithContext({
-			action: (options) => {
-				const { actionId, value, blockId, mid = this.data.mid } = options;
-				ActionManager.triggerBlockAction({
-					blockId,
-					actionId,
-					value,
-					mid,
-					rid: this.data.rid,
-					appId: this.data.blocks[0].appId,
-					container: {
-						type: UIKitIncomingInteractionContainerType.MESSAGE,
-						id: mid,
-					},
-				});
-			},
-			// state: alert,
-			appId: this.data.appId,
-			rid: this.data.rid,
-		}), { data: () => state.get() }),
-		this.firstNode,
-	);
-	const event = new Event('rendered');
-	this.firstNode.dispatchEvent(event);
-});
-
-Template.Blocks.onDestroyed(async function() {
-	const ReactDOM = await import('react-dom');
-	this.firstNode && ReactDOM.unmountComponentAtNode(this.firstNode);
-});
diff --git a/app/ui-message/client/blocks/ButtonElement.html b/app/ui-message/client/blocks/ButtonElement.html
deleted file mode 100644
index 5711982a2e6e..000000000000
--- a/app/ui-message/client/blocks/ButtonElement.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<template name="ButtonElement">
-	<button form="{{form}}" value="{{value}}" id="{{id}}" type="{{type}}" class="rc-button rc-button--primary"> {{>TextBlock text}} </button>
-</template>
diff --git a/app/ui-message/client/blocks/MessageBlock.js b/app/ui-message/client/blocks/MessageBlock.js
index 7830bafbb09e..3bd9a8739ff3 100644
--- a/app/ui-message/client/blocks/MessageBlock.js
+++ b/app/ui-message/client/blocks/MessageBlock.js
@@ -1,17 +1,11 @@
-import React, { useRef, useEffect, useCallback, useMemo } from 'react';
-import { UiKitMessage as uiKitMessage, kitContext, UiKitModal as uiKitModal, messageParser, modalParser, UiKitComponent } from '@rocket.chat/fuselage-ui-kit';
-import { uiKitText } from '@rocket.chat/ui-kit';
-import { Modal, AnimatedVisibility, ButtonGroup, Button, Box } from '@rocket.chat/fuselage';
-import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { UIKitIncomingInteractionContainerType } from '@rocket.chat/apps-engine/definition/uikit/UIKitIncomingInteractionContainer';
+import { UiKitMessage, UiKitComponent, kitContext, messageParser } from '@rocket.chat/fuselage-ui-kit';
+import React, { useRef, useEffect } from 'react';
 
 import { renderMessageBody } from '../../../ui-utils/client';
-import { getURL } from '../../../utils/lib/getURL';
-import { useReactiveValue } from '../../../../client/hooks/useReactiveValue';
-
-const focusableElementsString =	'a[href]:not([tabindex="-1"]), area[href]:not([tabindex="-1"]), input:not([disabled]):not([tabindex="-1"]), select:not([disabled]):not([tabindex="-1"]), textarea:not([disabled]):not([tabindex="-1"]), button:not([disabled]):not([tabindex="-1"]), iframe, object, embed, [tabindex]:not([tabindex="-1"]), [contenteditable]';
-
-const focusableElementsStringInvalid =	'a[href]:not([tabindex="-1"]):invalid, area[href]:not([tabindex="-1"]):invalid, input:not([disabled]):not([tabindex="-1"]):invalid, select:not([disabled]):not([tabindex="-1"]):invalid, textarea:not([disabled]):not([tabindex="-1"]):invalid, button:not([disabled]):not([tabindex="-1"]):invalid, iframe:invalid, object:invalid, embed:invalid, [tabindex]:not([tabindex="-1"]):invalid, [contenteditable]:invalid';
+import * as ActionManager from '../ActionManager';
 
+// TODO: move this to fuselage-ui-kit itself
 messageParser.text = ({ text, type } = {}) => {
 	if (type !== 'mrkdwn') {
 		return text;
@@ -20,165 +14,37 @@ messageParser.text = ({ text, type } = {}) => {
 	return <span dangerouslySetInnerHTML={{ __html: renderMessageBody({ msg: text }) }} />;
 };
 
-modalParser.text = messageParser.text;
-
-const contextDefault = {
-	action: console.log,
-	state: (data) => {
-		console.log('state', data);
-	},
-};
-export const messageBlockWithContext = (context) => (props) => {
-	const data = useReactiveValue(props.data);
-	return (
-		<kitContext.Provider value={context}>
-			{uiKitMessage(data.blocks)}
-		</kitContext.Provider>
-	);
-};
-
-const textParser = uiKitText(new class {
-	plain_text({ text }) {
-		return text;
-	}
-
-	text({ text }) {
-		return text;
-	}
-}());
+export function MessageBlock({ mid: _mid, rid, blocks, appId }) {
+	const context = {
+		action: ({ actionId, value, blockId, mid = _mid }) => {
+			ActionManager.triggerBlockAction({
+				blockId,
+				actionId,
+				value,
+				mid,
+				rid,
+				appId: blocks[0].appId,
+				container: {
+					type: UIKitIncomingInteractionContainerType.MESSAGE,
+					id: mid,
+				},
+			});
+		},
+		appId,
+		rid,
+	};
 
-// https://www.w3.org/TR/wai-aria-practices/examples/dialog-modal/dialog.html
-
-export const modalBlockWithContext = ({
-	onSubmit,
-	onClose,
-	onCancel,
-	...context
-}) => (props) => {
-	const id = `modal_id_${ useUniqueId() }`;
-
-	const { view, ...data } = useReactiveValue(props.data);
-	const values = useReactiveValue(props.values);
 	const ref = useRef();
-
-	// Auto focus
-	useEffect(() => {
-		if (!ref.current) {
-			return;
-		}
-
-		if (data.errors && Object.keys(data.errors).length) {
-			const element = ref.current.querySelector(focusableElementsStringInvalid);
-			element && element.focus();
-		} else {
-			const element = ref.current.querySelector(focusableElementsString);
-			element && element.focus();
-		}
-	}, [ref.current, data.errors]);
-	// save focus to restore after close
-	const previousFocus = useMemo(() => document.activeElement, []);
-	// restore the focus after the component unmount
-	useEffect(() => () => previousFocus && previousFocus.focus(), []);
-	// Handle Tab, Shift + Tab, Enter and Escape
-	const handleKeyDown = useCallback((event) => {
-		if (event.keyCode === 13) { // ENTER
-			return onSubmit(event);
-		}
-
-		if (event.keyCode === 27) { // ESC
-			event.stopPropagation();
-			event.preventDefault();
-			onClose();
-			return false;
-		}
-
-		if (event.keyCode === 9) { // TAB
-			const elements = Array.from(ref.current.querySelectorAll(focusableElementsString));
-			const [first] = elements;
-			const last = elements.pop();
-
-			if (!ref.current.contains(document.activeElement)) {
-				return first.focus();
-			}
-
-			if (event.shiftKey) {
-				if (!first || first === document.activeElement) {
-					last.focus();
-					event.stopPropagation();
-					event.preventDefault();
-				}
-				return;
-			}
-
-			if (!last || last === document.activeElement) {
-				first.focus();
-				event.stopPropagation();
-				event.preventDefault();
-			}
-		}
-	}, [onSubmit]);
-	// Clean the events
 	useEffect(() => {
-		const element = document.querySelector('.rc-modal-wrapper');
-		const container = element.querySelector('.rcx-modal__content');
-		const close = (e) => {
-			if (e.target !== element) {
-				return;
-			}
-			e.preventDefault();
-			e.stopPropagation();
-			onClose();
-			return false;
-		};
-
-		const ignoreIfnotContains = (e) => {
-			if (!container.contains(e.target)) {
-				return;
-			}
-			return handleKeyDown(e);
-		};
-
-		document.addEventListener('keydown', ignoreIfnotContains);
-		element.addEventListener('click', close);
-		return () => {
-			document.removeEventListener('keydown', ignoreIfnotContains);
-			element.removeEventListener('click', close);
-		};
-	}, handleKeyDown);
+		ref.current.dispatchEvent(new Event('rendered'));
+	}, []);
 
 	return (
-		<kitContext.Provider value={{ ...context, ...data, values }}>
-			<AnimatedVisibility visibility={AnimatedVisibility.UNHIDING}>
-				<Modal open id={id} ref={ref}>
-					<Modal.Header>
-						<Modal.Thumb url={getURL(`/api/apps/${ data.appId }/icon`)} />
-						<Modal.Title>{textParser([view.title])}</Modal.Title>
-						<Modal.Close tabIndex={-1} onClick={onClose} />
-					</Modal.Header>
-					<Modal.Content>
-						<Box
-							is='form'
-							method='post'
-							action='#'
-							onSubmit={onSubmit}
-						>
-							<UiKitComponent render={uiKitModal} blocks={view.blocks} />
-						</Box>
-					</Modal.Content>
-					<Modal.Footer>
-						<ButtonGroup align='end'>
-							{ view.close && <Button onClick={onCancel}>{textParser([view.close.text])}</Button>}
-							{ view.submit && <Button primary onClick={onSubmit}>{textParser([view.submit.text])}</Button>}
-						</ButtonGroup>
-					</Modal.Footer>
-				</Modal>
-			</AnimatedVisibility>
+		<kitContext.Provider value={context}>
+			<div className='js-block-wrapper' ref={ref} />
+			<UiKitComponent render={UiKitMessage} blocks={blocks} />
 		</kitContext.Provider>
 	);
-};
+}
 
-export const MessageBlock = ({ blocks }, context = contextDefault) => (
-	<kitContext.Provider value={context}>
-		{uiKitMessage(blocks)}
-	</kitContext.Provider>
-);
+export default MessageBlock;
diff --git a/app/ui-message/client/blocks/ModalBlock.html b/app/ui-message/client/blocks/ModalBlock.html
deleted file mode 100644
index 15f1f6f715f3..000000000000
--- a/app/ui-message/client/blocks/ModalBlock.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<template name="ModalBlock">
-	<div class="js-modal-block"></div>
-</template>
diff --git a/app/ui-message/client/blocks/ModalBlock.js b/app/ui-message/client/blocks/ModalBlock.js
index bb6a1e48deac..cec19b7c74d1 100644
--- a/app/ui-message/client/blocks/ModalBlock.js
+++ b/app/ui-message/client/blocks/ModalBlock.js
@@ -1,142 +1,349 @@
 import { UIKitIncomingInteractionContainerType } from '@rocket.chat/apps-engine/definition/uikit/UIKitIncomingInteractionContainer';
-import { ReactiveDict } from 'meteor/reactive-dict';
-import { ReactiveVar } from 'meteor/reactive-var';
-import { Template } from 'meteor/templating';
+import { Modal, AnimatedVisibility, ButtonGroup, Button, Box } from '@rocket.chat/fuselage';
+import { useMutableCallback, useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { kitContext, UiKitComponent, UiKitModal, modalParser } from '@rocket.chat/fuselage-ui-kit';
+import { uiKitText } from '@rocket.chat/ui-kit';
+import React, { useCallback, useEffect, useMemo, useReducer, useRef, useState } from 'react';
 
+import { renderMessageBody } from '../../../ui-utils/client';
+import { getURL } from '../../../utils/lib/getURL';
 import * as ActionManager from '../ActionManager';
-import { modalBlockWithContext } from './MessageBlock';
-import './ModalBlock.html';
 
-
-const prevent = (e) => {
-	if (e) {
-		(e.nativeEvent || e).stopImmediatePropagation();
-		e.stopPropagation();
-		e.preventDefault();
+// TODO: move this to fuselage-ui-kit itself
+modalParser.text = ({ text, type } = {}) => {
+	if (type !== 'mrkdwn') {
+		return text;
 	}
-};
 
-Template.ModalBlock.onRendered(async function() {
-	const React = await import('react');
-	const ReactDOM = await import('react-dom');
-	const state = new ReactiveVar();
+	return <span dangerouslySetInnerHTML={{ __html: renderMessageBody({ msg: text }) }} />;
+};
 
-	const { viewId, appId } = this.data;
+const textParser = uiKitText({
+	plain_text: ({ text }) => text,
+	text: ({ text }) => text,
+});
 
-	this.autorun(() => {
-		state.set(Template.currentData());
-	});
+const focusableElementsString = `
+	a[href]:not([tabindex="-1"]),
+	area[href]:not([tabindex="-1"]),
+	input:not([disabled]):not([tabindex="-1"]),
+	select:not([disabled]):not([tabindex="-1"]),
+	textarea:not([disabled]):not([tabindex="-1"]),
+	button:not([disabled]):not([tabindex="-1"]),
+	iframe,
+	object,
+	embed,
+	[tabindex]:not([tabindex="-1"]),
+	[contenteditable]`;
 
-	const handleUpdate = ({ type, ...data }) => {
-		if (type === 'errors') {
-			return state.set({ ...state.get(), errors: data.errors });
-		}
-		return state.set(data);
-	};
+const focusableElementsStringInvalid = `
+	a[href]:not([tabindex="-1"]):invalid,
+	area[href]:not([tabindex="-1"]):invalid,
+	input:not([disabled]):not([tabindex="-1"]):invalid,
+	select:not([disabled]):not([tabindex="-1"]):invalid,
+	textarea:not([disabled]):not([tabindex="-1"]):invalid,
+	button:not([disabled]):not([tabindex="-1"]):invalid,
+	iframe:invalid,
+	object:invalid,
+	embed:invalid,
+	[tabindex]:not([tabindex="-1"]):invalid,
+	[contenteditable]:invalid`;
 
-	this.cancel = () => {
-		ActionManager.off(viewId, handleUpdate);
-	};
+export function ModalBlock({
+	view,
+	errors,
+	appId,
+	onSubmit,
+	onClose,
+	onCancel,
+}) {
+	const id = `modal_id_${ useUniqueId() }`;
+	const ref = useRef();
 
-	this.node = this.find('.js-modal-block').parentElement;
-	ActionManager.on(viewId, handleUpdate);
+	// Auto focus
+	useEffect(() => {
+		if (!ref.current) {
+			return;
+		}
 
-	const filterInputFields = ({ element, elements = [] }) => {
-		if (element && element.initialValue) {
-			return true;
+		if (errors && Object.keys(errors).length) {
+			const element = ref.current.querySelector(focusableElementsStringInvalid);
+			element && element.focus();
+		} else {
+			const element = ref.current.querySelector(focusableElementsString);
+			element && element.focus();
 		}
-		if (elements.length && elements.map((element) => ({ element })).filter(filterInputFields).length) {
-			return true;
+	}, [ref.current, errors]);
+	// save focus to restore after close
+	const previousFocus = useMemo(() => document.activeElement, []);
+	// restore the focus after the component unmount
+	useEffect(() => () => previousFocus && previousFocus.focus(), []);
+	// Handle Tab, Shift + Tab, Enter and Escape
+	const handleKeyDown = useCallback((event) => {
+		if (event.keyCode === 13) { // ENTER
+			return onSubmit(event);
 		}
-	};
 
-	const mapElementToState = ({ element, blockId, elements = [] }) => {
-		if (elements.length) {
-			return elements.map((element) => ({ element, blockId })).filter(filterInputFields).map(mapElementToState);
+		if (event.keyCode === 27) { // ESC
+			event.stopPropagation();
+			event.preventDefault();
+			onClose();
+			return false;
 		}
-		return [element.actionId, { value: element.initialValue, blockId }];
-	};
 
-	this.state = new ReactiveDict(this.data.view.blocks.filter(filterInputFields).map(mapElementToState).reduce((obj, el) => {
-		if (Array.isArray(el[0])) {
-			return { ...obj, ...Object.fromEntries(el) };
+		if (event.keyCode === 9) { // TAB
+			const elements = Array.from(ref.current.querySelectorAll(focusableElementsString));
+			const [first] = elements;
+			const last = elements.pop();
+
+			if (!ref.current.contains(document.activeElement)) {
+				return first.focus();
+			}
+
+			if (event.shiftKey) {
+				if (!first || first === document.activeElement) {
+					last.focus();
+					event.stopPropagation();
+					event.preventDefault();
+				}
+				return;
+			}
+
+			if (!last || last === document.activeElement) {
+				first.focus();
+				event.stopPropagation();
+				event.preventDefault();
+			}
 		}
-		return { ...obj, [el[0]]: el[1] };
-	}, {}));
+	}, [onSubmit]);
+	// Clean the events
+	useEffect(() => {
+		const element = document.querySelector('.rc-modal-wrapper');
+		const container = element.querySelector('.rcx-modal__content');
+		const close = (e) => {
+			if (e.target !== element) {
+				return;
+			}
+			e.preventDefault();
+			e.stopPropagation();
+			onClose();
+			return false;
+		};
+
+		const ignoreIfnotContains = (e) => {
+			if (!container.contains(e.target)) {
+				return;
+			}
+			return handleKeyDown(e);
+		};
+
+		document.addEventListener('keydown', ignoreIfnotContains);
+		element.addEventListener('click', close);
+		return () => {
+			document.removeEventListener('keydown', ignoreIfnotContains);
+			element.removeEventListener('click', close);
+		};
+	}, handleKeyDown);
+
+	return (
+		<AnimatedVisibility visibility={AnimatedVisibility.UNHIDING}>
+			<Modal open id={id} ref={ref}>
+				<Modal.Header>
+					<Modal.Thumb url={getURL(`/api/apps/${ appId }/icon`)} />
+					<Modal.Title>{textParser([view.title])}</Modal.Title>
+					<Modal.Close tabIndex={-1} onClick={onClose} />
+				</Modal.Header>
+				<Modal.Content>
+					<Box
+						is='form'
+						method='post'
+						action='#'
+						onSubmit={onSubmit}
+					>
+						<UiKitComponent render={UiKitModal} blocks={view.blocks} />
+					</Box>
+				</Modal.Content>
+				<Modal.Footer>
+					<ButtonGroup align='end'>
+						{view.close && <Button onClick={onCancel}>{textParser([view.close.text])}</Button>}
+						{view.submit && <Button primary onClick={onSubmit}>{textParser([view.submit.text])}</Button>}
+					</ButtonGroup>
+				</Modal.Footer>
+			</Modal>
+		</AnimatedVisibility>
+	);
+}
+
+const useActionManagerState = (initialState) => {
+	const [state, setState] = useState(initialState);
+
+	const { viewId } = state;
+
+	useEffect(() => {
+		const handleUpdate = ({ type, ...data }) => {
+			if (type === 'errors') {
+				const { errors } = data;
+				setState({ ...state, errors });
+				return;
+			}
+
+			setState(data);
+		};
+
+		ActionManager.on(viewId, handleUpdate);
+
+		return () => {
+			ActionManager.off(viewId, handleUpdate);
+		};
+	}, [viewId]);
+
+	return state;
+};
+
+const useValues = (view) => {
+	const reducer = useMutableCallback((values, { actionId, payload }) => ({
+		...values,
+		[actionId]: payload,
+	}));
+
+	const initializer = useMutableCallback(() => {
+		const filterInputFields = ({ element, elements = [] }) => {
+			if (element && element.initialValue) {
+				return true;
+			}
+
+			if (elements.length && elements.map((element) => ({ element })).filter(filterInputFields).length) {
+				return true;
+			}
+		};
+
+		const mapElementToState = ({ element, blockId, elements = [] }) => {
+			if (elements.length) {
+				return elements.map((element) => ({ element, blockId })).filter(filterInputFields).map(mapElementToState);
+			}
+			return [element.actionId, { value: element.initialValue, blockId }];
+		};
 
-	const groupStateByBlockIdMap = (obj, [key, { blockId, value }]) => {
+		return view.blocks
+			.filter(filterInputFields)
+			.map(mapElementToState)
+			.reduce((obj, el) => {
+				if (Array.isArray(el[0])) {
+					return { ...obj, ...Object.fromEntries(el) };
+				}
+
+				const [key, value] = el;
+				return { ...obj, [key]: value };
+			}, {});
+	});
+
+	return useReducer(reducer, null, initializer);
+};
+
+function ConnectedModalBlock(props) {
+	const state = useActionManagerState(props);
+
+	const {
+		appId,
+		viewId,
+		mid: _mid,
+		errors,
+		view,
+	} = state;
+
+	const [values, updateValues] = useValues(view);
+
+	const groupStateByBlockId = (obj) => Object.entries(obj).reduce((obj, [key, { blockId, value }]) => {
 		obj[blockId] = obj[blockId] || {};
 		obj[blockId][key] = value;
 		return obj;
+	}, {});
+
+	const prevent = (e) => {
+		if (e) {
+			(e.nativeEvent || e).stopImmediatePropagation();
+			e.stopPropagation();
+			e.preventDefault();
+		}
 	};
-	const groupStateByBlockId = (obj) => Object.entries(obj).reduce(groupStateByBlockIdMap, {});
-	ReactDOM.render(
-		React.createElement(
-			modalBlockWithContext({
-				onCancel: (e) => {
-					prevent(e);
-					return ActionManager.triggerCancel({
-						appId,
-						viewId,
-						view: {
-							...state.get().view,
-							id: viewId,
-							state: groupStateByBlockId(this.state.all()),
-						},
-					});
-				},
-				onClose: (e) => {
-					prevent(e);
-					return ActionManager.triggerCancel({
-						appId,
-						viewId,
-						view: {
-							...state.get().view,
-							id: viewId,
-							state: groupStateByBlockId(this.state.all()),
-						},
-						isCleared: true,
-					});
-				},
-				onSubmit: (e) => {
-					prevent(e);
-					ActionManager.triggerSubmitView({
-						viewId,
-						appId,
-						payload: {
-							view: {
-								...state.get().view,
-								id: viewId,
-								state: groupStateByBlockId(this.state.all()),
-							},
-						},
-					});
-				},
-				action: ({ actionId, appId, value, blockId, mid = this.data.mid }) => ActionManager.triggerBlockAction({
-					container: {
-						type: UIKitIncomingInteractionContainerType.VIEW,
-						id: viewId,
-					},
-					actionId,
-					appId,
-					value,
+
+	const context = {
+		action: ({ actionId, appId, value, blockId, mid = _mid }) => ActionManager.triggerBlockAction({
+			container: {
+				type: UIKitIncomingInteractionContainerType.VIEW,
+				id: viewId,
+			},
+			actionId,
+			appId,
+			value,
+			blockId,
+			mid,
+		}),
+		state: ({ actionId, value, /* ,appId, */ blockId = 'default' }) => {
+			updateValues({
+				actionId,
+				payload: {
 					blockId,
-					mid,
-				}),
-				state: ({ actionId, value, /* ,appId, */ blockId = 'default' }) => {
-					this.state.set(actionId, {
-						blockId,
-						value,
-					});
+					value,
 				},
-				...this.data,
-			}),
-			{ data: () => state.get(), values: () => this.state.all() },
-		),
-		this.node,
-	);
-});
-Template.ModalBlock.onDestroyed(async function() {
-	const ReactDOM = await import('react-dom');
-	this.node && ReactDOM.unmountComponentAtNode(this.node);
-});
+			});
+		},
+		...state,
+		values,
+	};
+
+	const handleSubmit = useMutableCallback((e) => {
+		prevent(e);
+		ActionManager.triggerSubmitView({
+			viewId,
+			appId,
+			payload: {
+				view: {
+					...view,
+					id: viewId,
+					state: groupStateByBlockId(values),
+				},
+			},
+		});
+	});
+
+	const handleCancel = useMutableCallback((e) => {
+		prevent(e);
+		return ActionManager.triggerCancel({
+			appId,
+			viewId,
+			view: {
+				...view,
+				id: viewId,
+				state: groupStateByBlockId(values),
+			},
+		});
+	});
+
+	const handleClose = useMutableCallback((e) => {
+		prevent(e);
+		return ActionManager.triggerCancel({
+			appId,
+			viewId,
+			view: {
+				...view,
+				id: viewId,
+				state: groupStateByBlockId(values),
+			},
+			isCleared: true,
+		});
+	});
+
+	return <kitContext.Provider value={context}>
+		<ModalBlock
+			view={view}
+			errors={errors}
+			appId={appId}
+			onSubmit={handleSubmit}
+			onCancel={handleCancel}
+			onClose={handleClose}
+		/>
+	</kitContext.Provider>;
+}
+
+export default ConnectedModalBlock;
diff --git a/app/ui-message/client/blocks/TextBlock.html b/app/ui-message/client/blocks/TextBlock.html
deleted file mode 100644
index 9ede6447c0b5..000000000000
--- a/app/ui-message/client/blocks/TextBlock.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- {
-	"type": "button",
-	"text": {
-		"type": "plain_text",
-		"text": "Button",
-		"emoji": true
-	}
-},
--->
-<template name="TextBlock" arguments="type text emoji">
-	{{text.text}}
-</template>
diff --git a/app/ui-message/client/blocks/TextBlock.js b/app/ui-message/client/blocks/TextBlock.js
deleted file mode 100644
index e71c590301ee..000000000000
--- a/app/ui-message/client/blocks/TextBlock.js
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-// import { Template } from 'meteor/templating';
-
-import './TextBlock.html';
diff --git a/app/ui-message/client/blocks/index.js b/app/ui-message/client/blocks/index.js
index 2b64c4de523c..5e332705c1d4 100644
--- a/app/ui-message/client/blocks/index.js
+++ b/app/ui-message/client/blocks/index.js
@@ -1,5 +1,4 @@
-import './styles.css';
-import './Blocks.js';
-import './ModalBlock';
-import './TextBlock';
-import './ButtonElement.html';
+import { createTemplateForComponent } from '../../../../client/reactAdapters';
+
+createTemplateForComponent('ModalBlock', () => import('./ModalBlock'));
+createTemplateForComponent('Blocks', () => import('./MessageBlock'));
diff --git a/app/ui-message/client/blocks/styles.css b/app/ui-message/client/blocks/styles.css
deleted file mode 100644
index 2f990fc2f045..000000000000
--- a/app/ui-message/client/blocks/styles.css
+++ /dev/null
@@ -1,18 +0,0 @@
-.block-kit-debug.debug {
-	padding: 1rem;
-
-	border: 1px solid;
-}
-
-.block-kit-debug legend {
-	display: none;
-}
-
-.block-kit-debug.debug legend {
-	display: initial;
-}
-
-.rc-modal--uikit {
-	width: 680px;
-	max-width: 100%;
-}
diff --git a/app/ui-sidenav/client/SortList.js b/app/ui-sidenav/client/SortList.js
index 75fbc3221115..b0add853e97a 100644
--- a/app/ui-sidenav/client/SortList.js
+++ b/app/ui-sidenav/client/SortList.js
@@ -129,3 +129,5 @@ function GroupingList() {
 		</ul>
 	</>;
 }
+
+export default SortList;
diff --git a/app/ui-sidenav/client/sidebarHeader.js b/app/ui-sidenav/client/sidebarHeader.js
index 306872c0a456..b748f0367835 100644
--- a/app/ui-sidenav/client/sidebarHeader.js
+++ b/app/ui-sidenav/client/sidebarHeader.js
@@ -10,7 +10,7 @@ import { settings } from '../../settings';
 import { hasAtLeastOnePermission } from '../../authorization';
 import { userStatus } from '../../user-status';
 import { hasPermission } from '../../authorization/client';
-import { createTemplateForComponent } from '../../../client/createTemplateForComponent';
+import { createTemplateForComponent } from '../../../client/reactAdapters';
 
 
 const setStatus = (status, statusText) => {
@@ -66,15 +66,13 @@ const toolbarButtons = (/* user */) => [{
 	action: async (e) => {
 		const options = [];
 		const config = {
-			template: 'SortList',
+			template: createTemplateForComponent('SortList', () => import('./SortList')),
 			currentTarget: e.currentTarget,
 			data: {
 				options,
 			},
 			offsetVertical: e.currentTarget.clientHeight + 10,
 		};
-		const { SortList } = await import('./SortList');
-		await createTemplateForComponent(SortList);
 		popover.open(config);
 	},
 },
diff --git a/app/ui-utils/client/lib/callMethod.js b/app/ui-utils/client/lib/callMethod.js
index 390c1ea21bc8..c1b05108ad80 100644
--- a/app/ui-utils/client/lib/callMethod.js
+++ b/app/ui-utils/client/lib/callMethod.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 
-import { handleError } from '../../../utils';
+import { handleError } from '../../../utils/client/lib/handleError';
 
 /**
  * Wraps a Meteor method into a Promise.
diff --git a/app/ui/client/index.js b/app/ui/client/index.js
index 4867309779f8..5d70fb1747b9 100644
--- a/app/ui/client/index.js
+++ b/app/ui/client/index.js
@@ -1,3 +1,5 @@
+import { createTemplateForComponent } from '../../../client/reactAdapters';
+
 import './lib/accounts';
 import './lib/collections';
 import './lib/customEventPolyfill';
@@ -43,7 +45,6 @@ import './views/app/invite';
 import './views/app/videoCall/videoButtons';
 import './views/app/videoCall/videoCall';
 import './views/app/photoswipe';
-import './views/app/RoomForeword';
 import './components/icon';
 import './components/status';
 import './components/table.html';
@@ -67,3 +68,5 @@ export { Login, animationSupport, animeBack, Button, preLoadImgs } from './lib/r
 export { AudioRecorder } from './lib/recorderjs/audioRecorder';
 export { VideoRecorder } from './lib/recorderjs/videoRecorder';
 export { chatMessages } from './views/app/room';
+
+createTemplateForComponent('RoomForeword', () => import('./views/app/RoomForeword'));
diff --git a/app/ui/client/views/app/RoomForeword.html b/app/ui/client/views/app/RoomForeword.html
deleted file mode 100644
index 72b2b7734c0e..000000000000
--- a/app/ui/client/views/app/RoomForeword.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<template name="RoomForeword">
-	<div style='display: flex; flex-direction: column;'></div>
-</template>
diff --git a/app/ui/client/views/app/RoomForeword.js b/app/ui/client/views/app/RoomForeword.js
index ef068e3b3219..e9aee84793f1 100644
--- a/app/ui/client/views/app/RoomForeword.js
+++ b/app/ui/client/views/app/RoomForeword.js
@@ -1,16 +1,17 @@
 import React from 'react';
-import { Meteor } from 'meteor/meteor';
 import { Avatar, Margins, Flex, Box, Tag } from '@rocket.chat/fuselage';
-import { Template } from 'meteor/templating';
 
-import './RoomForeword.html';
-import { Rooms, Users } from '../../../../models';
+import { Rooms } from '../../../../models';
 import { useTranslation } from '../../../../../client/contexts/TranslationContext';
+import { useReactiveValue } from '../../../../../client/hooks/useReactiveValue';
+import { useUser } from '../../../../../client/contexts/UserContext';
 
-
-const RoomForeword = ({ room, user }) => {
+const RoomForeword = ({ _id: rid }) => {
 	const t = useTranslation();
 
+	const user = useUser();
+	const room = useReactiveValue(() => Rooms.findOne({ _id: rid }));
+
 	if (room.t !== 'd') {
 		return t('Start_of_conversation');
 	}
@@ -39,7 +40,15 @@ const RoomForeword = ({ room, user }) => {
 					<Flex.Item grow={1}>
 						<Margins block='x8'>
 							<Box is='div'>
-								{users.map((username, index) => <Margins inline='x4' key={index}><Tag textStyle='p2' is='a' href={ `/direct/${ username }` } data-username={username} className='mention-link mention-link--user'>{username}</Tag></Margins>)}
+								{users.map((username, index) => <Margins inline='x4' key={index}>
+									<Tag
+										is='a'
+										textStyle='p2'
+										href={ `/direct/${ username }` }
+										data-username={username}
+										className='mention-link mention-link--user'
+									>{username}</Tag>
+								</Margins>)}
 							</Box>
 						</Margins>
 					</Flex.Item>
@@ -49,25 +58,4 @@ const RoomForeword = ({ room, user }) => {
 	</Avatar.Context.Provider>;
 };
 
-Template.RoomForeword.onRendered(async function() {
-	const { MeteorProvider } = await import('../../../../../client/providers/MeteorProvider');
-	const ReactDOM = await import('react-dom');
-	this.container = this.firstNode;
-	this.autorun(() => {
-		const data = Template.currentData();
-		const { _id: rid } = data;
-
-		const user = Users.findOne(Meteor.userId(), { username: 1 });
-
-		const room = Rooms.findOne({ _id: rid });
-		ReactDOM.render(React.createElement(MeteorProvider, {
-			children: React.createElement(RoomForeword, { ...data, room, user }),
-		}), this.container);
-	});
-});
-
-
-Template.RoomForeword.onDestroyed(async function() {
-	const ReactDOM = await import('react-dom');
-	this.container && ReactDOM.unmountComponentAtNode(this.container);
-});
+export default RoomForeword;
diff --git a/app/ui/client/views/app/components/Directory/index.js b/app/ui/client/views/app/components/Directory/index.js
index 5d56e61265a5..9788b7fb11e3 100644
--- a/app/ui/client/views/app/components/Directory/index.js
+++ b/app/ui/client/views/app/components/Directory/index.js
@@ -49,3 +49,5 @@ export function DirectoryPage() {
 
 
 DirectoryPage.displayName = 'DirectoryPage';
+
+export default DirectoryPage;
diff --git a/client/components/admin/info/InformationRoute.js b/client/components/admin/info/InformationRoute.js
index 455b7c1fd826..b3c2d7f7097b 100644
--- a/client/components/admin/info/InformationRoute.js
+++ b/client/components/admin/info/InformationRoute.js
@@ -82,3 +82,5 @@ export function InformationRoute() {
 		onClickDownloadInfo={handleClickDownloadInfo}
 	/>;
 }
+
+export default InformationRoute;
diff --git a/client/components/admin/settings/GroupPage.js b/client/components/admin/settings/GroupPage.js
index 75ff9f5213da..dbe85bdb5def 100644
--- a/client/components/admin/settings/GroupPage.js
+++ b/client/components/admin/settings/GroupPage.js
@@ -1,4 +1,4 @@
-import { Accordion, Box, Button, ButtonGroup, Paragraph, Skeleton } from '@rocket.chat/fuselage';
+import { Accordion, Box, Button, ButtonGroup, Skeleton } from '@rocket.chat/fuselage';
 import React, { useMemo } from 'react';
 
 import { useTranslation } from '../../../contexts/TranslationContext';
@@ -48,7 +48,7 @@ export function GroupPage({ children, headerButtons, save, cancel, _id, i18nLabe
 
 		<Page.ContentShadowScroll>
 			<Box style={useMemo(() => ({ margin: '0 auto', width: '100%', maxWidth: '590px' }), [])}>
-				{t.has(i18nDescription) && <Paragraph hintColor>{t(i18nDescription)}</Paragraph>}
+				{t.has(i18nDescription) && <Box is='p' textColor='hint' textStyle='p1'>{t(i18nDescription)}</Box>}
 
 				<Accordion className='page-settings'>
 					{children}
@@ -74,7 +74,11 @@ export function GroupPageSkeleton() {
 
 		<Page.Content>
 			<Box style={useMemo(() => ({ margin: '0 auto', width: '100%', maxWidth: '590px' }), [])}>
-				<Paragraph.Skeleton />
+				<Box is='p' textColor='hint' textStyle='p1'>
+					<Skeleton />
+					<Skeleton />
+					<Skeleton width='75%' />
+				</Box>
 
 				<Accordion className='page-settings'>
 					<Section.Skeleton />
diff --git a/client/components/admin/settings/NotAuthorizedPage.js b/client/components/admin/settings/NotAuthorizedPage.js
index cf62068ed555..bfdc64581ff7 100644
--- a/client/components/admin/settings/NotAuthorizedPage.js
+++ b/client/components/admin/settings/NotAuthorizedPage.js
@@ -1,4 +1,4 @@
-import { Paragraph } from '@rocket.chat/fuselage';
+import { Box } from '@rocket.chat/fuselage';
 import React from 'react';
 
 import { useTranslation } from '../../../contexts/TranslationContext';
@@ -9,7 +9,7 @@ export function NotAuthorizedPage() {
 
 	return <Page>
 		<Page.Content>
-			<Paragraph>{t('You_are_not_authorized_to_view_this_page')}</Paragraph>
+			<Box is='p' textColor='default' textStyle='p1'>{t('You_are_not_authorized_to_view_this_page')}</Box>
 		</Page.Content>
 	</Page>;
 }
diff --git a/client/components/admin/settings/Section.js b/client/components/admin/settings/Section.js
index 68a8ef5cc88a..9eb91677bfc6 100644
--- a/client/components/admin/settings/Section.js
+++ b/client/components/admin/settings/Section.js
@@ -1,4 +1,4 @@
-import { Accordion, Box, Button, FieldGroup, Paragraph, Skeleton } from '@rocket.chat/fuselage';
+import { Accordion, Box, Button, FieldGroup, Skeleton } from '@rocket.chat/fuselage';
 import React from 'react';
 
 import { useTranslation } from '../../../contexts/TranslationContext';
@@ -20,9 +20,7 @@ export function Section({ children, groupId, hasReset = true, help, sectionName,
 		noncollapsible={solo || !section.name}
 		title={section.name && t(section.name)}
 	>
-		{help && <Paragraph>
-			<Box is='span' textColor='hint'>{help}</Box>
-		</Paragraph>}
+		{help && <Box is='p' textColor='hint' textStyle='p1'>{help}</Box>}
 
 		<FieldGroup>
 			{section.settings.map((settingId) => <Setting key={settingId} settingId={settingId} sectionChanged={changed} />)}
@@ -41,13 +39,10 @@ export function Section({ children, groupId, hasReset = true, help, sectionName,
 }
 
 export function SectionSkeleton() {
-	return <Accordion.Item
-		noncollapsible
-		title={<Skeleton />}
-	>
-		<Paragraph>
+	return <Accordion.Item noncollapsible title={<Skeleton />}>
+		<Box is='p' textColor='hint' textStyle='p1'>
 			<Skeleton />
-		</Paragraph>
+		</Box>
 
 		<FieldGroup>
 			{Array.from({ length: 10 }).map((_, i) => <Setting.Skeleton key={i} />)}
diff --git a/client/components/admin/settings/SettingsRoute.js b/client/components/admin/settings/SettingsRoute.js
index d53e3a1792ca..831d620abb9b 100644
--- a/client/components/admin/settings/SettingsRoute.js
+++ b/client/components/admin/settings/SettingsRoute.js
@@ -5,10 +5,9 @@ import { useAdminSideNav } from '../../../hooks/useAdminSideNav';
 import { GroupSelector } from './GroupSelector';
 import { NotAuthorizedPage } from './NotAuthorizedPage';
 import { SettingsState } from './SettingsState';
+import { useRouteParameter } from '../../../contexts/RouterContext';
 
-export function SettingsRoute({
-	group: groupId,
-}) {
+export function SettingsRoute() {
 	useAdminSideNav();
 
 	const hasPermission = useAtLeastOnePermission([
@@ -17,6 +16,8 @@ export function SettingsRoute({
 		'manage-selected-settings',
 	]);
 
+	const groupId = useRouteParameter('group');
+
 	if (!hasPermission) {
 		return <NotAuthorizedPage />;
 	}
@@ -25,3 +26,5 @@ export function SettingsRoute({
 		<GroupSelector groupId={groupId} />
 	</SettingsState>;
 }
+
+export default SettingsRoute;
diff --git a/client/components/admin/settings/inputs/MultiSelectSettingInput.js b/client/components/admin/settings/inputs/MultiSelectSettingInput.js
index 538b4a74c4c2..8c7e88738080 100644
--- a/client/components/admin/settings/inputs/MultiSelectSettingInput.js
+++ b/client/components/admin/settings/inputs/MultiSelectSettingInput.js
@@ -56,3 +56,5 @@ export function MultiSelectSettingInput({
 		</>
 	);
 }
+
+export default MultiSelectSettingInput;
diff --git a/client/components/admin/settings/inputs/StringSettingInput.js b/client/components/admin/settings/inputs/StringSettingInput.js
index 8c3ec25306df..e20a3c8d482d 100644
--- a/client/components/admin/settings/inputs/StringSettingInput.js
+++ b/client/components/admin/settings/inputs/StringSettingInput.js
@@ -1,4 +1,4 @@
-import { Box, Field, Flex, TextAreaInput, TextInput, Icon, Callout, Margins } from '@rocket.chat/fuselage';
+import { Box, Field, Flex, TextAreaInput, TextInput, Callout, Margins } from '@rocket.chat/fuselage';
 import React from 'react';
 
 import { ResetSettingButton } from '../ResetSettingButton';
@@ -24,8 +24,6 @@ export function StringSettingInput({
 	hasResetButton,
 	onChangeValue,
 	onResetButtonClick,
-	addon,
-	...props
 }) {
 	const handleChange = (event) => {
 		onChangeValue(event.currentTarget.value);
@@ -50,8 +48,6 @@ export function StringSettingInput({
 					readOnly={readonly}
 					autoComplete={autocomplete === false ? 'off' : undefined}
 					onChange={handleChange}
-					{ ...addon && { addon: <Icon name={addon} size='20' /> }}
-					{ ...props }
 				/>
 				: <TextInput
 					data-qa-setting-id={_id}
@@ -62,8 +58,6 @@ export function StringSettingInput({
 					readOnly={readonly}
 					autoComplete={autocomplete === false ? 'off' : undefined}
 					onChange={handleChange}
-					{ ...addon && { addon: <Icon name={addon} size='20' /> }}
-					{ ...props }
 				/> }
 		</Field.Row>
 	</>;
diff --git a/client/components/pageNotFound/PageNotFound.js b/client/components/pageNotFound/PageNotFound.js
index bd7b2f948751..d3daa7b64415 100644
--- a/client/components/pageNotFound/PageNotFound.js
+++ b/client/components/pageNotFound/PageNotFound.js
@@ -51,3 +51,5 @@ export function PageNotFound() {
 		</Flex.Container>
 	</>;
 }
+
+export default PageNotFound;
diff --git a/client/components/setupWizard/SetupWizardRoute.js b/client/components/setupWizard/SetupWizardRoute.js
index 273300195ef5..60958e5385d5 100644
--- a/client/components/setupWizard/SetupWizardRoute.js
+++ b/client/components/setupWizard/SetupWizardRoute.js
@@ -49,3 +49,5 @@ export function SetupWizardRoute() {
 
 	return <SetupWizardState />;
 }
+
+export default SetupWizardRoute;
diff --git a/client/createTemplateForComponent.js b/client/createTemplateForComponent.js
deleted file mode 100644
index 423964471174..000000000000
--- a/client/createTemplateForComponent.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import { Blaze } from 'meteor/blaze';
-import { HTML } from 'meteor/htmljs';
-import { FlowRouter } from 'meteor/kadira:flow-router';
-import { ReactiveVar } from 'meteor/reactive-var';
-import { Template } from 'meteor/templating';
-
-
-export const createTemplateForComponent = async (
-	component,
-	props = {},
-	// eslint-disable-next-line new-cap
-	renderContainerView = () => HTML.DIV(),
-	url,
-
-) => {
-	const name = component.displayName || component.name;
-
-	if (!name) {
-		throw new Error('the component must have a name');
-	}
-
-	if (Template[name]) {
-		Template[name].props.set(props);
-		return name;
-	}
-
-	Template[name] = new Blaze.Template(name, renderContainerView);
-
-	Template[name].props = new ReactiveVar(props);
-
-	const React = await import('react');
-	const ReactDOM = await import('react-dom');
-	const { MeteorProvider } = await import('./providers/MeteorProvider');
-
-	function TemplateComponent() {
-		return React.createElement(component, Template[name].props.get());
-	}
-
-	Template[name].onRendered(() => {
-		Template.instance().autorun((computation) => {
-			if (computation.firstRun) {
-				Template.instance().container = Template.instance().firstNode;
-			}
-
-			ReactDOM.render(
-				React.createElement(MeteorProvider, {
-					children: React.createElement(TemplateComponent),
-				}), Template.instance().firstNode);
-		});
-
-		url && Template.instance().autorun(() => {
-			const routeName = FlowRouter.getRouteName();
-			if (routeName !== url) {
-				ReactDOM.unmountComponentAtNode(Template.instance().container);
-			}
-		});
-	});
-
-	Template[name].onDestroyed(() => {
-		if (Template.instance().container) {
-			ReactDOM.unmountComponentAtNode(Template.instance().container);
-		}
-	});
-
-	return name;
-};
diff --git a/client/providers/MeteorProvider.js b/client/providers/MeteorProvider.js
index 0471a1c427e3..2b4056bff0a6 100644
--- a/client/providers/MeteorProvider.js
+++ b/client/providers/MeteorProvider.js
@@ -34,3 +34,5 @@ export function MeteorProvider({ children }) {
 		</ServerProvider>
 	</ConnectionStatusProvider>;
 }
+
+export default MeteorProvider;
diff --git a/client/reactAdapters.js b/client/reactAdapters.js
new file mode 100644
index 000000000000..54703f2b95ca
--- /dev/null
+++ b/client/reactAdapters.js
@@ -0,0 +1,183 @@
+import { Blaze } from 'meteor/blaze';
+import { HTML } from 'meteor/htmljs';
+import { BlazeLayout } from 'meteor/kadira:blaze-layout';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { ReactiveVar } from 'meteor/reactive-var';
+import { Template } from 'meteor/templating';
+import { Tracker } from 'meteor/tracker';
+
+let rootNode;
+let invalidatePortals = () => {};
+const portalsMap = new Map();
+
+const mountRoot = async () => {
+	rootNode = document.getElementById('react-root');
+
+	if (!rootNode) {
+		rootNode = document.createElement('div');
+		rootNode.id = 'react-root';
+		document.body.appendChild(rootNode);
+	}
+
+	const [
+		{ Suspense, createElement, lazy, useState },
+		{ render },
+	] = await Promise.all([
+		import('react'),
+		import('react-dom'),
+	]);
+
+	const LazyMeteorProvider = lazy(() => import('./providers/MeteorProvider'));
+
+	function AppRoot() {
+		const [portals, setPortals] = useState(() => Tracker.nonreactive(() => Array.from(portalsMap.values())));
+		invalidatePortals = () => {
+			setPortals(Array.from(portalsMap.values()));
+		};
+
+		return createElement(Suspense, { fallback: null },
+			createElement(LazyMeteorProvider, {}, ...portals),
+		);
+	}
+
+	render(createElement(AppRoot), rootNode);
+};
+
+export const registerPortal = (key, portal) => {
+	if (!rootNode) {
+		mountRoot();
+	}
+
+	portalsMap.set(key, portal);
+	invalidatePortals();
+};
+
+export const unregisterPortal = (key) => {
+	portalsMap.delete(key);
+	invalidatePortals();
+};
+
+const createLazyElement = async (importFn, propsFn) => {
+	const { createElement, lazy, useEffect, useState } = await import('react');
+	const LazyComponent = lazy(importFn);
+
+	if (!propsFn) {
+		return createElement(LazyComponent);
+	}
+
+	const WrappedComponent = () => {
+		const [props, setProps] = useState(() => Tracker.nonreactive(propsFn));
+
+		useEffect(() => {
+			const computation = Tracker.autorun(() => {
+				setProps(propsFn);
+			});
+
+			return () => {
+				computation.stop();
+			};
+		}, []);
+
+		return createElement(LazyComponent, props);
+	};
+
+	return createElement(WrappedComponent);
+};
+
+const createLazyPortal = async (importFn, propsFn, node) => {
+	const { createPortal } = await import('react-dom');
+	return createPortal(await createLazyElement(importFn, propsFn), node);
+};
+
+export const createTemplateForComponent = (
+	name,
+	importFn,
+	{
+		renderContainerView = () => HTML.DIV(), // eslint-disable-line new-cap
+	} = {},
+) => {
+	if (Template[name]) {
+		return name;
+	}
+
+	const template = new Blaze.Template(name, renderContainerView);
+
+	template.onRendered(async function() {
+		const props = new ReactiveVar(this.data);
+		this.autorun(() => {
+			props.set(Template.currentData());
+		});
+
+		const portal = await createLazyPortal(importFn, () => props.get(), this.firstNode);
+
+		if (!this.firstNode) {
+			return;
+		}
+
+		registerPortal(this, portal);
+	});
+
+	template.onDestroyed(function() {
+		unregisterPortal(this);
+	});
+
+	Template[name] = template;
+
+	return name;
+};
+
+export const renderRouteComponent = (importFn, {
+	template,
+	region,
+	renderContainerView = () => HTML.DIV(), // eslint-disable-line new-cap
+} = {}) => {
+	const routeName = FlowRouter.getRouteName();
+
+	Tracker.autorun(async (computation) => {
+		if (routeName !== FlowRouter.getRouteName()) {
+			unregisterPortal(routeName);
+			computation.stop();
+			return;
+		}
+
+		if (!computation.firstRun) {
+			return;
+		}
+
+		if (!template || !region) {
+			BlazeLayout.reset();
+
+			const element = await createLazyElement(importFn);
+
+			if (routeName !== FlowRouter.getRouteName()) {
+				return;
+			}
+
+			registerPortal(routeName, element);
+			return;
+		}
+
+		if (!Template[routeName]) {
+			const blazeTemplate = new Blaze.Template(routeName, renderContainerView);
+
+			blazeTemplate.onRendered(async function() {
+				const props = new ReactiveVar(this.data);
+				this.autorun(() => {
+					props.set(Template.currentData());
+				});
+
+				const portal = await createLazyPortal(importFn, () => props.get(), this.firstNode);
+
+				if (routeName !== FlowRouter.getRouteName()) {
+					return;
+				}
+
+				registerPortal(routeName, portal);
+			});
+
+			Template[routeName] = blazeTemplate;
+		}
+
+		BlazeLayout.render(template, { [region]: routeName });
+	});
+};
diff --git a/client/routes.js b/client/routes.js
index d616b5deb29f..5e29798f30b4 100644
--- a/client/routes.js
+++ b/client/routes.js
@@ -1,9 +1,9 @@
 import mem from 'mem';
 import s from 'underscore.string';
+import { HTML } from 'meteor/htmljs';
 import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
 import { Tracker } from 'meteor/tracker';
-import { HTML } from 'meteor/htmljs';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 import { Session } from 'meteor/session';
@@ -13,7 +13,7 @@ import { KonchatNotification } from '../app/ui';
 import { ChatSubscription } from '../app/models';
 import { roomTypes, handleError } from '../app/utils';
 import { call } from '../app/ui-utils';
-import { createTemplateForComponent } from './createTemplateForComponent';
+import { renderRouteComponent } from './reactAdapters';
 
 const getRoomById = mem((rid) => call('getRoomById', rid));
 
@@ -95,10 +95,8 @@ FlowRouter.route('/home', {
 
 FlowRouter.route('/directory/:tab?', {
 	name: 'directory',
-
-	async action() {
-		const { DirectoryPage } = await require('../app/ui/client/views/app/components/Directory');
-		BlazeLayout.render('main', { center: await createTemplateForComponent(DirectoryPage, { }, () => HTML.DIV({ style }), 'directory')}); // eslint-disable-line
+	action: () => {
+		renderRouteComponent(() => import('../app/ui/client/views/app/components/Directory'), { template: 'main', region: 'center' });
 	},
 	triggersExit: [function() {
 		$('.main-content').addClass('rc-old');
@@ -107,13 +105,10 @@ FlowRouter.route('/directory/:tab?', {
 
 FlowRouter.route('/account/:group?', {
 	name: 'account',
-
-	async action(params) {
+	action: (params) => {
 		if (!params.group) {
 			params.group = 'Profile';
 		}
-		const { Input } = await require('../client/components/admin/settings/inputs/StringSettingInput');
-		console.log(await createTemplateForComponent(Input, { }, () => HTML.DIV({ style }))); // eslint-disable-line
 		params.group = s.capitalize(params.group, true);
 		BlazeLayout.render('main', { center: `account${ params.group }` });
 	},
@@ -124,8 +119,7 @@ FlowRouter.route('/account/:group?', {
 
 FlowRouter.route('/terms-of-service', {
 	name: 'terms-of-service',
-
-	action() {
+	action: () => {
 		Session.set('cmsPage', 'Layout_Terms_of_Service');
 		BlazeLayout.render('cmsPage');
 	},
@@ -133,8 +127,7 @@ FlowRouter.route('/terms-of-service', {
 
 FlowRouter.route('/privacy-policy', {
 	name: 'privacy-policy',
-
-	action() {
+	action: () => {
 		Session.set('cmsPage', 'Layout_Privacy_Policy');
 		BlazeLayout.render('cmsPage');
 	},
@@ -142,8 +135,7 @@ FlowRouter.route('/privacy-policy', {
 
 FlowRouter.route('/legal-notice', {
 	name: 'legal-notice',
-
-	action() {
+	action: () => {
 		Session.set('cmsPage', 'Layout_Legal_Notice');
 		BlazeLayout.render('cmsPage');
 	},
@@ -151,72 +143,59 @@ FlowRouter.route('/legal-notice', {
 
 FlowRouter.route('/room-not-found/:type/:name', {
 	name: 'room-not-found',
-
-	action(params) {
-		Session.set('roomNotFound', { type: params.type, name: params.name });
+	action: ({ type, name }) => {
+		Session.set('roomNotFound', { type, name });
 		BlazeLayout.render('main', { center: 'roomNotFound' });
 	},
 });
 
 FlowRouter.route('/register/:hash', {
 	name: 'register-secret-url',
-
-	action(/* params*/) {
+	action: () => {
 		BlazeLayout.render('secretURL');
-
-		// if RocketChat.settings.get('Accounts_RegistrationForm') is 'Secret URL'
-		// 	Meteor.call 'checkRegistrationSecretURL', params.hash, (err, success) ->
-		// 		if success
-		// 			Session.set 'loginDefaultState', 'register'
-		// 			BlazeLayout.render 'main', {center: 'home'}
-		// 			KonchatNotification.getDesktopPermission()
-		// 		else
-		// 			BlazeLayout.render 'logoLayout', { render: 'invalidSecretURL' }
-		// else
-		// 	BlazeLayout.render 'logoLayout', { render: 'invalidSecretURL' }
 	},
 });
 
 FlowRouter.route('/invite/:hash', {
 	name: 'invite',
-
-	action(/* params */) {
+	action: () => {
 		BlazeLayout.render('invite');
 	},
 });
 
 FlowRouter.route('/setup-wizard/:step?', {
 	name: 'setup-wizard',
-	action: async () => {
-		const { SetupWizardRoute } = await import('./components/setupWizard/SetupWizardRoute');
-		BlazeLayout.render(await createTemplateForComponent(SetupWizardRoute));
+	action: () => {
+		renderRouteComponent(() => import('./components/setupWizard/SetupWizardRoute'));
 	},
 });
 
-const style = 'overflow: hidden; flex: 1 1 auto; height: 1%;';
+FlowRouter.route('/admin/info', {
+	name: 'admin-info',
+	action: () => {
+		renderRouteComponent(() => import('./components/admin/info/InformationRoute'), {
+			template: 'main',
+			region: 'center',
+			// eslint-disable-next-line new-cap
+			renderContainerView: () => HTML.DIV({ style: 'overflow: hidden; flex: 1 1 auto; height: 1%;' }),
+		});
+	},
+});
 
 FlowRouter.route('/admin/:group?', {
 	name: 'admin',
-	action: async ({ group = 'info' } = {}) => {
-		switch (group) {
-			case 'info': {
-				const { InformationRoute } = await import('./components/admin/info/InformationRoute');
-				BlazeLayout.render('main', { center: await createTemplateForComponent(InformationRoute, { }, () => HTML.DIV({ style })) }); // eslint-disable-line
-				break;
-			}
-
-			default: {
-				const { SettingsRoute } = await import('./components/admin/settings/SettingsRoute');
-				BlazeLayout.render('main', { center: await createTemplateForComponent(SettingsRoute, { group }, () => HTML.DIV({ style })) }); // eslint-disable-line
-				// BlazeLayout.render('main', { center: 'admin' });
-			}
-		}
+	action: () => {
+		renderRouteComponent(() => import('./components/admin/settings/SettingsRoute'), {
+			template: 'main',
+			region: 'center',
+			// eslint-disable-next-line new-cap
+			renderContainerView: () => HTML.DIV({ style: 'overflow: hidden; flex: 1 1 auto; height: 1%;' }),
+		});
 	},
 });
 
 FlowRouter.notFound = {
-	action: async () => {
-		const { PageNotFound } = await import('./components/pageNotFound/PageNotFound');
-		BlazeLayout.render(await createTemplateForComponent(PageNotFound));
+	action: () => {
+		renderRouteComponent(() => import('./components/pageNotFound/PageNotFound'));
 	},
 };
diff --git a/ee/app/engagement-dashboard/client/components/EngagementDashboardRoute.js b/ee/app/engagement-dashboard/client/components/EngagementDashboardRoute.js
index 1761ddfdd81c..c9a85ce40f46 100644
--- a/ee/app/engagement-dashboard/client/components/EngagementDashboardRoute.js
+++ b/ee/app/engagement-dashboard/client/components/EngagementDashboardRoute.js
@@ -22,4 +22,5 @@ export function EngagementDashboardRoute() {
 		onSelectTab={(tab) => goToEngagementDashboard({ tab })}
 	/>;
 }
-EngagementDashboardRoute.displayName = 'EngagementDashboardRoute';
+
+export default EngagementDashboardRoute;
diff --git a/ee/app/engagement-dashboard/client/routes.js b/ee/app/engagement-dashboard/client/routes.js
index f8735786bbaf..f99bd92afc6c 100644
--- a/ee/app/engagement-dashboard/client/routes.js
+++ b/ee/app/engagement-dashboard/client/routes.js
@@ -1,13 +1,9 @@
-import { HTML } from 'meteor/htmljs';
 import { FlowRouter } from 'meteor/kadira:flow-router';
-import { BlazeLayout } from 'meteor/kadira:blaze-layout';
-
 
 import { hasAllPermission } from '../../../../app/authorization';
 import { AdminBox } from '../../../../app/ui-utils';
+import { renderRouteComponent } from '../../../../client/reactAdapters';
 import { hasLicense } from '../../license/client';
-import { createTemplateForComponent } from '../../../../client/createTemplateForComponent';
-
 
 FlowRouter.route('/admin/engagement-dashboard/:tab?', {
 	name: 'engagement-dashboard',
@@ -17,14 +13,7 @@ FlowRouter.route('/admin/engagement-dashboard/:tab?', {
 			return;
 		}
 
-		const { EngagementDashboardRoute } = await import('./components/EngagementDashboardRoute');
-
-		BlazeLayout.render('main', { center: await createTemplateForComponent(EngagementDashboardRoute,
-			{},
-			// eslint-disable-next-line new-cap
-			() => HTML.DIV.call(null, { style: 'overflow: hidden; flex: 1 1 auto; height: 1%;' }),
-			'engagement-dashboard'),
-		});
+		renderRouteComponent(() => import('./components/EngagementDashboardRoute'), { template: 'main', region: 'center' });
 	},
 });
 

From 5f9a14336f32f6175f7135176242d2686066d7c1 Mon Sep 17 00:00:00 2001
From: Tasso Evangelista <tasso.evangelista@rocket.chat>
Date: Fri, 10 Apr 2020 16:36:57 -0300
Subject: [PATCH 204/223] [IMPROVE] Administration Pages root rewritten
 (#17209)

---
 app/apps/client/orchestrator.js               |  6 +--
 app/apps/client/routes.js                     | 15 +++---
 app/authorization/client/route.js             |  8 +--
 app/authorization/client/startup.js           |  4 +-
 .../client/views/Multiselect.js               |  2 +-
 app/chatpal-search/client/route.js            |  4 +-
 app/cloud/client/index.js                     |  9 ++--
 app/custom-sounds/client/admin/route.js       |  5 +-
 app/custom-sounds/client/admin/startup.js     |  4 +-
 app/emoji-custom/client/admin/route.js        |  5 +-
 app/emoji-custom/client/admin/startup.js      |  4 +-
 app/federation/client/admin/dashboard.js      |  7 ++-
 app/importer/client/index.js                  | 12 ++---
 app/integrations/client/route.js              | 14 ++---
 app/integrations/client/startup.js            |  4 +-
 app/invites/client/admin/route.js             |  5 +-
 app/invites/client/admin/startup.js           |  4 +-
 app/logger/client/viewLogs.js                 |  9 ++--
 app/mail-messages/client/router.js            |  4 +-
 app/mail-messages/client/startup.js           |  4 +-
 .../client/admin/route.js                     |  6 +--
 .../client/admin/startup.js                   |  4 +-
 app/ui-admin/client/adminFlex.js              |  5 +-
 .../client/components/AdministrationRouter.js | 16 ++++++
 .../client/components/PageSkeleton.js         | 30 +++++++++++
 .../info/BuildEnvironmentSection.js           |  2 +-
 .../info/BuildEnvironmentSection.stories.js   |  2 +-
 .../client/components}/info/CommitSection.js  |  2 +-
 .../components}/info/CommitSection.stories.js |  0
 .../components}/info/DescriptionList.js       |  0
 .../info/DescriptionList.stories.js           |  2 +-
 .../components}/info/InformationPage.js       |  6 +--
 .../info/InformationPage.stories.js           |  2 +-
 .../components}/info/InformationRoute.js      |  9 ++--
 .../components}/info/InstancesSection.js      |  2 +-
 .../info/InstancesSection.stories.js          |  2 +-
 .../components}/info/RocketChatSection.js     |  2 +-
 .../info/RocketChatSection.stories.js         |  2 +-
 .../info/RuntimeEnvironmentSection.js         |  2 +-
 .../info/RuntimeEnvironmentSection.stories.js |  0
 .../client/components}/info/UsageSection.js   |  2 +-
 .../components}/info/UsageSection.stories.js  |  0
 .../client/components}/info/formatters.js     |  0
 .../client/components}/settings/GroupPage.js  |  4 +-
 .../components}/settings/GroupPage.stories.js |  0
 .../components}/settings/GroupSelector.js     |  0
 .../settings/GroupSelector.stories.js         |  0
 .../components}/settings/NotAuthorizedPage.js |  4 +-
 .../settings/NotAuthorizedPage.stories.js     |  0
 .../settings/ResetSettingButton.js            |  2 +-
 .../settings/ResetSettingButton.stories.js    |  0
 .../client/components}/settings/Section.js    |  2 +-
 .../components}/settings/Section.stories.js   |  0
 .../client/components}/settings/Setting.js    |  6 +--
 .../components}/settings/Setting.stories.js   |  0
 .../components}/settings/SettingsRoute.js     |  7 +--
 .../components}/settings/SettingsState.js     | 14 ++---
 .../settings/groups/AssetsGroupPage.js        |  6 +--
 .../settings/groups/GenericGroupPage.js       |  0
 .../settings/groups/OAuthGroupPage.js         | 10 ++--
 .../settings/inputs/ActionSettingInput.js     |  6 +--
 .../inputs/ActionSettingInput.stories.js      |  0
 .../settings/inputs/AssetSettingInput.css     |  0
 .../settings/inputs/AssetSettingInput.js      |  6 +--
 .../inputs/AssetSettingInput.stories.js       |  0
 .../settings/inputs/BooleanSettingInput.js    |  0
 .../inputs/BooleanSettingInput.stories.js     |  0
 .../settings/inputs/CodeSettingInput.js       |  4 +-
 .../inputs/CodeSettingInput.stories.js        |  0
 .../settings/inputs/ColorSettingInput.js      |  2 +-
 .../inputs/ColorSettingInput.stories.js       |  0
 .../settings/inputs/FontSettingInput.js       |  0
 .../inputs/FontSettingInput.stories.js        |  0
 .../settings/inputs/GenericSettingInput.js    |  0
 .../inputs/GenericSettingInput.stories.js     |  0
 .../settings/inputs/IntSettingInput.js        |  0
 .../inputs/IntSettingInput.stories.js         |  0
 .../settings/inputs/LanguageSettingInput.js   |  2 +-
 .../inputs/LanguageSettingInput.stories.js    |  0
 .../inputs/MultiSelectSettingInput.js         |  2 +-
 .../inputs/MultiSelectSettingInput.stories.js |  0
 .../settings/inputs/PasswordSettingInput.js   |  0
 .../inputs/PasswordSettingInput.stories.js    |  0
 .../inputs/RelativeUrlSettingInput.js         |  2 +-
 .../inputs/RelativeUrlSettingInput.stories.js |  0
 .../settings/inputs/RoomPickSettingInput.js   |  0
 .../settings/inputs/SelectSettingInput.js     |  2 +-
 .../inputs/SelectSettingInput.stories.js      |  0
 .../settings/inputs/StringSettingInput.js     |  0
 .../inputs/StringSettingInput.stories.js      |  0
 .../ui-admin/client}/hooks/useAdminSideNav.js |  2 +-
 app/ui-admin/client/index.js                  |  4 +-
 app/ui-admin/client/routes.js                 | 53 +++++++++++++++++--
 app/ui-admin/client/sidebarItems.js           | 10 ++++
 app/ui-utils/client/index.js                  |  1 -
 app/ui-utils/client/lib/AdminBox.js           | 25 ---------
 app/user-status/client/admin/route.js         |  7 +--
 app/user-status/client/admin/startup.js       |  4 +-
 client/components/basic/Page.js               |  2 +-
 client/reactAdapters.js                       | 15 +++---
 client/routes.js                              | 31 +++--------
 .../components/EngagementDashboardRoute.js    |  2 +-
 ee/app/engagement-dashboard/client/routes.js  |  8 ++-
 package-lock.json                             | 10 ++--
 104 files changed, 266 insertions(+), 216 deletions(-)
 create mode 100644 app/ui-admin/client/components/AdministrationRouter.js
 create mode 100644 app/ui-admin/client/components/PageSkeleton.js
 rename {client/components/admin => app/ui-admin/client/components}/info/BuildEnvironmentSection.js (91%)
 rename {client/components/admin => app/ui-admin/client/components}/info/BuildEnvironmentSection.stories.js (89%)
 rename {client/components/admin => app/ui-admin/client/components}/info/CommitSection.js (91%)
 rename {client/components/admin => app/ui-admin/client/components}/info/CommitSection.stories.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/info/DescriptionList.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/info/DescriptionList.stories.js (86%)
 rename {client/components/admin => app/ui-admin/client/components}/info/InformationPage.js (91%)
 rename {client/components/admin => app/ui-admin/client/components}/info/InformationPage.stories.js (98%)
 rename {client/components/admin => app/ui-admin/client/components}/info/InformationRoute.js (87%)
 rename {client/components/admin => app/ui-admin/client/components}/info/InstancesSection.js (95%)
 rename {client/components/admin => app/ui-admin/client/components}/info/InstancesSection.stories.js (92%)
 rename {client/components/admin => app/ui-admin/client/components}/info/RocketChatSection.js (95%)
 rename {client/components/admin => app/ui-admin/client/components}/info/RocketChatSection.stories.js (92%)
 rename {client/components/admin => app/ui-admin/client/components}/info/RuntimeEnvironmentSection.js (95%)
 rename {client/components/admin => app/ui-admin/client/components}/info/RuntimeEnvironmentSection.stories.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/info/UsageSection.js (98%)
 rename {client/components/admin => app/ui-admin/client/components}/info/UsageSection.stories.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/info/formatters.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/GroupPage.js (93%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/GroupPage.stories.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/GroupSelector.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/GroupSelector.stories.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/NotAuthorizedPage.js (66%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/NotAuthorizedPage.stories.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/ResetSettingButton.js (79%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/ResetSettingButton.stories.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/Section.js (94%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/Section.stories.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/Setting.js (94%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/Setting.stories.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/SettingsRoute.js (70%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/SettingsState.js (95%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/groups/AssetsGroupPage.js (79%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/groups/GenericGroupPage.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/groups/OAuthGroupPage.js (88%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/ActionSettingInput.js (77%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/ActionSettingInput.stories.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/AssetSettingInput.css (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/AssetSettingInput.js (89%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/AssetSettingInput.stories.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/BooleanSettingInput.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/BooleanSettingInput.stories.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/CodeSettingInput.js (95%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/CodeSettingInput.stories.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/ColorSettingInput.js (96%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/ColorSettingInput.stories.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/FontSettingInput.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/FontSettingInput.stories.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/GenericSettingInput.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/GenericSettingInput.stories.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/IntSettingInput.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/IntSettingInput.stories.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/LanguageSettingInput.js (92%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/LanguageSettingInput.stories.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/MultiSelectSettingInput.js (94%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/MultiSelectSettingInput.stories.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/PasswordSettingInput.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/PasswordSettingInput.stories.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/RelativeUrlSettingInput.js (92%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/RelativeUrlSettingInput.stories.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/RoomPickSettingInput.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/SelectSettingInput.js (93%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/SelectSettingInput.stories.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/StringSettingInput.js (100%)
 rename {client/components/admin => app/ui-admin/client/components}/settings/inputs/StringSettingInput.stories.js (100%)
 rename {client => app/ui-admin/client}/hooks/useAdminSideNav.js (71%)
 create mode 100644 app/ui-admin/client/sidebarItems.js
 delete mode 100644 app/ui-utils/client/lib/AdminBox.js

diff --git a/app/apps/client/orchestrator.js b/app/apps/client/orchestrator.js
index 2252c886ce9d..54c614044fe0 100644
--- a/app/apps/client/orchestrator.js
+++ b/app/apps/client/orchestrator.js
@@ -4,7 +4,7 @@ import toastr from 'toastr';
 
 import { AppWebsocketReceiver } from './communication';
 import { APIClient } from '../../utils';
-import { AdminBox } from '../../ui-utils';
+import { registerAdminSidebarItem } from '../../ui-admin/client';
 import { CachedCollectionManager } from '../../ui-cached-collection';
 import { hasAtLeastOnePermission } from '../../authorization';
 import { handleI18nResources } from './i18n';
@@ -51,14 +51,14 @@ class AppClientOrchestrator {
 	getAppClientManager = () => this._manager;
 
 	registerAdminMenuItems = () => {
-		AdminBox.addOption({
+		registerAdminSidebarItem({
 			icon: 'cube',
 			href: 'apps',
 			i18nLabel: 'Apps',
 			permissionGranted: () => hasAtLeastOnePermission(['manage-apps']),
 		});
 
-		AdminBox.addOption({
+		registerAdminSidebarItem({
 			icon: 'cube',
 			href: 'marketplace',
 			i18nLabel: 'Marketplace',
diff --git a/app/apps/client/routes.js b/app/apps/client/routes.js
index 914137e5f72f..66005d26b875 100644
--- a/app/apps/client/routes.js
+++ b/app/apps/client/routes.js
@@ -1,9 +1,10 @@
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 
+import { registerAdminRoute } from '../../ui-admin/client';
 import { Apps } from './orchestrator';
 
-FlowRouter.route('/admin/apps/what-is-it', {
+registerAdminRoute('/apps/what-is-it', {
 	name: 'apps-what-is-it',
 	action: async () => {
 		// TODO: render loading indicator
@@ -26,32 +27,32 @@ const createAppsRouteAction = (centerTemplate) => async () => {
 	}
 };
 
-FlowRouter.route('/admin/apps', {
+registerAdminRoute('/apps', {
 	name: 'apps',
 	action: createAppsRouteAction('apps'),
 });
 
-FlowRouter.route('/admin/apps/install', {
+registerAdminRoute('/apps/install', {
 	name: 'app-install',
 	action: createAppsRouteAction('appInstall'),
 });
 
-FlowRouter.route('/admin/apps/:appId', {
+registerAdminRoute('/apps/:appId', {
 	name: 'app-manage',
 	action: createAppsRouteAction('appManage'),
 });
 
-FlowRouter.route('/admin/apps/:appId/logs', {
+registerAdminRoute('/apps/:appId/logs', {
 	name: 'app-logs',
 	action: createAppsRouteAction('appLogs'),
 });
 
-FlowRouter.route('/admin/marketplace', {
+registerAdminRoute('/marketplace', {
 	name: 'marketplace',
 	action: createAppsRouteAction('marketplace'),
 });
 
-FlowRouter.route('/admin/marketplace/:appId', {
+registerAdminRoute('/marketplace/:appId', {
 	name: 'marketplace-app',
 	action: createAppsRouteAction('appManage'),
 });
diff --git a/app/authorization/client/route.js b/app/authorization/client/route.js
index 2415242d6eb9..95ccd464cc48 100644
--- a/app/authorization/client/route.js
+++ b/app/authorization/client/route.js
@@ -1,9 +1,9 @@
-import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 
+import { registerAdminRoute } from '../../ui-admin/client';
 import { t } from '../../utils/client';
 
-FlowRouter.route('/admin/permissions', {
+registerAdminRoute('/permissions', {
 	name: 'admin-permissions',
 	async action(/* params*/) {
 		await import('./views');
@@ -14,7 +14,7 @@ FlowRouter.route('/admin/permissions', {
 	},
 });
 
-FlowRouter.route('/admin/permissions/:name?/edit', {
+registerAdminRoute('/permissions/:name?/edit', {
 	name: 'admin-permissions-edit',
 	async action(/* params*/) {
 		await import('./views');
@@ -26,7 +26,7 @@ FlowRouter.route('/admin/permissions/:name?/edit', {
 	},
 });
 
-FlowRouter.route('/admin/permissions/new', {
+registerAdminRoute('/permissions/new', {
 	name: 'admin-permissions-new',
 	async action(/* params*/) {
 		await import('./views');
diff --git a/app/authorization/client/startup.js b/app/authorization/client/startup.js
index 2edf696d2856..9e437c26c050 100644
--- a/app/authorization/client/startup.js
+++ b/app/authorization/client/startup.js
@@ -2,8 +2,8 @@ import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 
 import { hasAtLeastOnePermission } from './hasPermission';
+import { registerAdminSidebarItem } from '../../ui-admin/client';
 import { CachedCollectionManager } from '../../ui-cached-collection';
-import { AdminBox } from '../../ui-utils/client/lib/AdminBox';
 import { APIClient } from '../../utils/client';
 import { Roles } from '../../models/client';
 import { rolesStreamer } from './lib/streamer';
@@ -14,7 +14,7 @@ Meteor.startup(() => {
 		roles.forEach((role) => Roles.insert(role));
 	});
 
-	AdminBox.addOption({
+	registerAdminSidebarItem({
 		href: 'admin-permissions',
 		i18nLabel: 'Permissions',
 		icon: 'lock',
diff --git a/app/channel-settings/client/views/Multiselect.js b/app/channel-settings/client/views/Multiselect.js
index f9400fa1b776..a63fa1981cd2 100644
--- a/app/channel-settings/client/views/Multiselect.js
+++ b/app/channel-settings/client/views/Multiselect.js
@@ -4,7 +4,7 @@ import { createTemplateForComponent } from '../../../../client/reactAdapters';
 
 createTemplateForComponent(
 	'Multiselect',
-	() => import('../../../../client/components/admin/settings/inputs/MultiSelectSettingInput'),
+	() => import('../../../ui-admin/client/components/settings/inputs/MultiSelectSettingInput'),
 	{
 		// eslint-disable-next-line new-cap
 		renderContainerView: () => HTML.DIV({ class: 'rc-multiselect', style: 'display: flex;' }),
diff --git a/app/chatpal-search/client/route.js b/app/chatpal-search/client/route.js
index cb0281953064..86c6ad276c49 100644
--- a/app/chatpal-search/client/route.js
+++ b/app/chatpal-search/client/route.js
@@ -1,9 +1,9 @@
-import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 
+import { registerAdminRoute } from '../../ui-admin/client';
 import { t } from '../../utils';
 
-FlowRouter.route('/admin/chatpal', {
+registerAdminRoute('/chatpal', {
 	name: 'chatpal-admin',
 	action() {
 		return BlazeLayout.render('main', {
diff --git a/app/cloud/client/index.js b/app/cloud/client/index.js
index 0165b0a25011..6504dcc0e8e7 100644
--- a/app/cloud/client/index.js
+++ b/app/cloud/client/index.js
@@ -3,12 +3,11 @@ import './admin/cloud';
 import './admin/cloudRegisterManually';
 
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
-import { FlowRouter } from 'meteor/kadira:flow-router';
 
-import { AdminBox } from '../../ui-utils';
+import { registerAdminRoute, registerAdminSidebarItem } from '../../ui-admin/client';
 import { hasAtLeastOnePermission } from '../../authorization';
 
-FlowRouter.route('/admin/cloud', {
+registerAdminRoute('/cloud', {
 	name: 'cloud-config',
 	async action() {
 		await import('./admin');
@@ -16,7 +15,7 @@ FlowRouter.route('/admin/cloud', {
 	},
 });
 
-FlowRouter.route('/admin/cloud/oauth-callback', {
+registerAdminRoute('/cloud/oauth-callback', {
 	name: 'cloud-oauth-callback',
 	async action() {
 		await import('./admin');
@@ -24,7 +23,7 @@ FlowRouter.route('/admin/cloud/oauth-callback', {
 	},
 });
 
-AdminBox.addOption({
+registerAdminSidebarItem({
 	icon: 'cloud-plus',
 	href: 'admin/cloud',
 	i18nLabel: 'Connectivity_Services',
diff --git a/app/custom-sounds/client/admin/route.js b/app/custom-sounds/client/admin/route.js
index 0150bef09169..0f181fda5787 100644
--- a/app/custom-sounds/client/admin/route.js
+++ b/app/custom-sounds/client/admin/route.js
@@ -1,7 +1,8 @@
-import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 
-FlowRouter.route('/admin/custom-sounds', {
+import { registerAdminRoute } from '../../../ui-admin/client';
+
+registerAdminRoute('/custom-sounds', {
 	name: 'custom-sounds',
 	async action(/* params*/) {
 		await import('./views');
diff --git a/app/custom-sounds/client/admin/startup.js b/app/custom-sounds/client/admin/startup.js
index 5d469ce5d457..2647b17ea42d 100644
--- a/app/custom-sounds/client/admin/startup.js
+++ b/app/custom-sounds/client/admin/startup.js
@@ -1,7 +1,7 @@
-import { AdminBox } from '../../../ui-utils';
 import { hasAtLeastOnePermission } from '../../../authorization';
+import { registerAdminSidebarItem } from '../../../ui-admin/client';
 
-AdminBox.addOption({
+registerAdminSidebarItem({
 	href: 'custom-sounds',
 	i18nLabel: 'Custom_Sounds',
 	icon: 'volume',
diff --git a/app/emoji-custom/client/admin/route.js b/app/emoji-custom/client/admin/route.js
index 169ff2bb637a..575e47831756 100644
--- a/app/emoji-custom/client/admin/route.js
+++ b/app/emoji-custom/client/admin/route.js
@@ -1,7 +1,8 @@
-import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 
-FlowRouter.route('/admin/emoji-custom', {
+import { registerAdminRoute } from '../../../ui-admin/client';
+
+registerAdminRoute('/emoji-custom', {
 	name: 'emoji-custom',
 	async action(/* params*/) {
 		await import('./views');
diff --git a/app/emoji-custom/client/admin/startup.js b/app/emoji-custom/client/admin/startup.js
index 2845727615d4..851786b584f8 100644
--- a/app/emoji-custom/client/admin/startup.js
+++ b/app/emoji-custom/client/admin/startup.js
@@ -1,7 +1,7 @@
-import { AdminBox } from '../../../ui-utils';
 import { hasPermission } from '../../../authorization';
+import { registerAdminSidebarItem } from '../../../ui-admin/client';
 
-AdminBox.addOption({
+registerAdminSidebarItem({
 	href: 'emoji-custom',
 	i18nLabel: 'Custom_Emoji',
 	icon: 'emoji',
diff --git a/app/federation/client/admin/dashboard.js b/app/federation/client/admin/dashboard.js
index e53325264d23..a675b11e2d68 100644
--- a/app/federation/client/admin/dashboard.js
+++ b/app/federation/client/admin/dashboard.js
@@ -3,10 +3,9 @@ import { Tracker } from 'meteor/tracker';
 import { Template } from 'meteor/templating';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
-import { FlowRouter } from 'meteor/kadira:flow-router';
 
-import { AdminBox } from '../../../ui-utils';
 import { hasRole } from '../../../authorization';
+import { registerAdminRoute, registerAdminSidebarItem } from '../../../ui-admin/client';
 
 import './dashboard.html';
 import './dashboard.css';
@@ -69,14 +68,14 @@ Template.dashboard.onRendered(() => {
 
 // Route setup
 
-FlowRouter.route('/admin/federation-dashboard', {
+registerAdminRoute('/federation-dashboard', {
 	name: 'federation-dashboard',
 	action() {
 		BlazeLayout.render('main', { center: 'dashboard', old: true });
 	},
 });
 
-AdminBox.addOption({
+registerAdminSidebarItem({
 	icon: 'discover',
 	href: 'admin/federation-dashboard',
 	i18nLabel: 'Federation Dashboard',
diff --git a/app/importer/client/index.js b/app/importer/client/index.js
index 1ae15dfc877f..0b5b15ef294b 100644
--- a/app/importer/client/index.js
+++ b/app/importer/client/index.js
@@ -1,12 +1,12 @@
-import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 
-import { ImporterWebsocketReceiver } from './ImporterWebsocketReceiver';
+import { registerAdminRoute } from '../../ui-admin/client';
 import { Importers } from '../lib/Importers';
 import { ImporterInfo } from '../lib/ImporterInfo';
 import { ProgressStep } from '../lib/ImporterProgressStep';
+import { ImporterWebsocketReceiver } from './ImporterWebsocketReceiver';
 
-FlowRouter.route('/admin/import', {
+registerAdminRoute('/import', {
 	name: 'admin-import',
 	async action() {
 		await import('./admin/adminImport');
@@ -14,7 +14,7 @@ FlowRouter.route('/admin/import', {
 	},
 });
 
-FlowRouter.route('/admin/import/new', {
+registerAdminRoute('/import/new', {
 	name: 'admin-import-new',
 	async action() {
 		await import('./admin/adminImportNew');
@@ -22,7 +22,7 @@ FlowRouter.route('/admin/import/new', {
 	},
 });
 
-FlowRouter.route('/admin/import/prepare', {
+registerAdminRoute('/import/prepare', {
 	name: 'admin-import-prepare',
 	async action() {
 		await import('./admin/adminImportPrepare');
@@ -30,7 +30,7 @@ FlowRouter.route('/admin/import/prepare', {
 	},
 });
 
-FlowRouter.route('/admin/import/progress', {
+registerAdminRoute('/import/progress', {
 	name: 'admin-import-progress',
 	async action() {
 		await import('./admin/adminImportProgress');
diff --git a/app/integrations/client/route.js b/app/integrations/client/route.js
index 18cd9743bfe6..fa97cf739741 100644
--- a/app/integrations/client/route.js
+++ b/app/integrations/client/route.js
@@ -1,11 +1,11 @@
-import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 
+import { registerAdminRoute } from '../../ui-admin/client';
 import { t } from '../../utils';
 
 const dynamic = () => import('./views');
 
-FlowRouter.route('/admin/integrations', {
+registerAdminRoute('/integrations', {
 	name: 'admin-integrations',
 	async action() {
 		await dynamic();
@@ -16,7 +16,7 @@ FlowRouter.route('/admin/integrations', {
 	},
 });
 
-FlowRouter.route('/admin/integrations/new', {
+registerAdminRoute('/integrations/new', {
 	name: 'admin-integrations-new',
 	async action() {
 		await dynamic();
@@ -27,7 +27,7 @@ FlowRouter.route('/admin/integrations/new', {
 	},
 });
 
-FlowRouter.route('/admin/integrations/incoming/:id?', {
+registerAdminRoute('/integrations/incoming/:id?', {
 	name: 'admin-integrations-incoming',
 	async action(params) {
 		await dynamic();
@@ -40,7 +40,7 @@ FlowRouter.route('/admin/integrations/incoming/:id?', {
 	},
 });
 
-FlowRouter.route('/admin/integrations/outgoing/:id?', {
+registerAdminRoute('/integrations/outgoing/:id?', {
 	name: 'admin-integrations-outgoing',
 	async action(params) {
 		await dynamic();
@@ -52,7 +52,7 @@ FlowRouter.route('/admin/integrations/outgoing/:id?', {
 	},
 });
 
-FlowRouter.route('/admin/integrations/outgoing/:id?/history', {
+registerAdminRoute('/integrations/outgoing/:id?/history', {
 	name: 'admin-integrations-outgoing-history',
 	async action(params) {
 		await dynamic();
@@ -64,7 +64,7 @@ FlowRouter.route('/admin/integrations/outgoing/:id?/history', {
 	},
 });
 
-FlowRouter.route('/admin/integrations/additional/zapier', {
+registerAdminRoute('/integrations/additional/zapier', {
 	name: 'admin-integrations-additional-zapier',
 	async action() {
 		await dynamic();
diff --git a/app/integrations/client/startup.js b/app/integrations/client/startup.js
index b4cb14574775..7ed84fba42f0 100644
--- a/app/integrations/client/startup.js
+++ b/app/integrations/client/startup.js
@@ -1,7 +1,7 @@
-import { AdminBox } from '../../ui-utils';
 import { hasAtLeastOnePermission } from '../../authorization';
+import { registerAdminSidebarItem } from '../../ui-admin/client';
 
-AdminBox.addOption({
+registerAdminSidebarItem({
 	href: 'admin-integrations',
 	i18nLabel: 'Integrations',
 	icon: 'code',
diff --git a/app/invites/client/admin/route.js b/app/invites/client/admin/route.js
index f945611cced7..cb5dcb190f6a 100644
--- a/app/invites/client/admin/route.js
+++ b/app/invites/client/admin/route.js
@@ -1,7 +1,8 @@
-import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 
-FlowRouter.route('/admin/invites', {
+import { registerAdminRoute } from '../../../ui-admin/client';
+
+registerAdminRoute('/invites', {
 	name: 'invites',
 	async action(/* params */) {
 		await import('./adminInvites');
diff --git a/app/invites/client/admin/startup.js b/app/invites/client/admin/startup.js
index b1fca12fb61b..a402aea6d144 100644
--- a/app/invites/client/admin/startup.js
+++ b/app/invites/client/admin/startup.js
@@ -1,7 +1,7 @@
-import { AdminBox } from '../../../ui-utils';
 import { hasAtLeastOnePermission } from '../../../authorization';
+import { registerAdminSidebarItem } from '../../../ui-admin/client';
 
-AdminBox.addOption({
+registerAdminSidebarItem({
 	href: 'invites',
 	i18nLabel: 'Invites',
 	icon: 'user-plus',
diff --git a/app/logger/client/viewLogs.js b/app/logger/client/viewLogs.js
index e498f0ba6b73..7683f9d1d292 100644
--- a/app/logger/client/viewLogs.js
+++ b/app/logger/client/viewLogs.js
@@ -1,16 +1,15 @@
+import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 import { Meteor } from 'meteor/meteor';
 import { Mongo } from 'meteor/mongo';
-import { FlowRouter } from 'meteor/kadira:flow-router';
-import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 
-import { AdminBox } from '../../ui-utils';
 import { hasAllPermission } from '../../authorization';
+import { registerAdminRoute, registerAdminSidebarItem } from '../../ui-admin/client';
 import { t } from '../../utils';
 
 export const stdout = new Mongo.Collection(null);
 
 Meteor.startup(function() {
-	AdminBox.addOption({
+	registerAdminSidebarItem({
 		href: 'admin-view-logs',
 		i18nLabel: 'View_Logs',
 		icon: 'post',
@@ -20,7 +19,7 @@ Meteor.startup(function() {
 	});
 });
 
-FlowRouter.route('/admin/view-logs', {
+registerAdminRoute('/view-logs', {
 	name: 'admin-view-logs',
 	async action() {
 		await import('./views/viewLogs');
diff --git a/app/mail-messages/client/router.js b/app/mail-messages/client/router.js
index fd738b632d8b..93e982b4ea59 100644
--- a/app/mail-messages/client/router.js
+++ b/app/mail-messages/client/router.js
@@ -2,7 +2,9 @@ import { Meteor } from 'meteor/meteor';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 
-FlowRouter.route('/admin/mailer', {
+import { registerAdminRoute } from '../../ui-admin/client';
+
+registerAdminRoute('/mailer', {
 	name: 'admin-mailer',
 	async action() {
 		await import('./views');
diff --git a/app/mail-messages/client/startup.js b/app/mail-messages/client/startup.js
index 35f55d75cbbe..5148b91bd57c 100644
--- a/app/mail-messages/client/startup.js
+++ b/app/mail-messages/client/startup.js
@@ -1,7 +1,7 @@
-import { AdminBox } from '../../ui-utils';
 import { hasAllPermission } from '../../authorization';
+import { registerAdminSidebarItem } from '../../ui-admin/client';
 
-AdminBox.addOption({
+registerAdminSidebarItem({
 	href: 'admin-mailer',
 	i18nLabel: 'Mailer',
 	icon: 'mail',
diff --git a/app/oauth2-server-config/client/admin/route.js b/app/oauth2-server-config/client/admin/route.js
index 340f403b9351..4ba33c35c658 100644
--- a/app/oauth2-server-config/client/admin/route.js
+++ b/app/oauth2-server-config/client/admin/route.js
@@ -1,9 +1,9 @@
-import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 
+import { registerAdminRoute } from '../../../ui-admin/client';
 import { t } from '../../../utils';
 
-FlowRouter.route('/admin/oauth-apps', {
+registerAdminRoute('/oauth-apps', {
 	name: 'admin-oauth-apps',
 	async action() {
 		await import('./views');
@@ -14,7 +14,7 @@ FlowRouter.route('/admin/oauth-apps', {
 	},
 });
 
-FlowRouter.route('/admin/oauth-app/:id?', {
+registerAdminRoute('/oauth-app/:id?', {
 	name: 'admin-oauth-app',
 	async action(params) {
 		await import('./views');
diff --git a/app/oauth2-server-config/client/admin/startup.js b/app/oauth2-server-config/client/admin/startup.js
index cf3e4fb08663..8ebe8aaf8b1f 100644
--- a/app/oauth2-server-config/client/admin/startup.js
+++ b/app/oauth2-server-config/client/admin/startup.js
@@ -1,7 +1,7 @@
-import { AdminBox } from '../../../ui-utils';
 import { hasAllPermission } from '../../../authorization';
+import { registerAdminSidebarItem } from '../../../ui-admin/client';
 
-AdminBox.addOption({
+registerAdminSidebarItem({
 	href: 'admin-oauth-apps',
 	i18nLabel: 'OAuth Apps',
 	icon: 'discover',
diff --git a/app/ui-admin/client/adminFlex.js b/app/ui-admin/client/adminFlex.js
index ce744b2c63ad..6571d708d47c 100644
--- a/app/ui-admin/client/adminFlex.js
+++ b/app/ui-admin/client/adminFlex.js
@@ -5,10 +5,11 @@ import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { settings } from '../../settings';
-import { menu, SideNav, AdminBox, Layout } from '../../ui-utils/client';
+import { menu, SideNav, Layout } from '../../ui-utils/client';
 import { t } from '../../utils';
 import { PrivateSettingsCachedCollection } from './SettingsCachedCollection';
 import { hasAtLeastOnePermission } from '../../authorization/client';
+import { getSidebarItems } from './sidebarItems';
 
 Template.adminFlex.onCreated(function() {
 	this.isEmbedded = Layout.isEmbedded();
@@ -65,7 +66,7 @@ Template.adminFlex.helpers({
 	},
 	label,
 	adminBoxOptions() {
-		return AdminBox.getOptions();
+		return getSidebarItems();
 	},
 	menuItem(name, icon, section, group) {
 		return {
diff --git a/app/ui-admin/client/components/AdministrationRouter.js b/app/ui-admin/client/components/AdministrationRouter.js
new file mode 100644
index 000000000000..8fc0486cd444
--- /dev/null
+++ b/app/ui-admin/client/components/AdministrationRouter.js
@@ -0,0 +1,16 @@
+import React, { lazy, useMemo, Suspense } from 'react';
+
+import { useAdminSideNav } from '../hooks/useAdminSideNav';
+import PageSkeleton from './PageSkeleton';
+
+function AdministrationRouter({ lazyRouteComponent }) {
+	useAdminSideNav();
+
+	const LazyRouteComponent = useMemo(() => lazy(lazyRouteComponent), [lazyRouteComponent]);
+
+	return <Suspense fallback={<PageSkeleton />}>
+		<LazyRouteComponent />
+	</Suspense>;
+}
+
+export default AdministrationRouter;
diff --git a/app/ui-admin/client/components/PageSkeleton.js b/app/ui-admin/client/components/PageSkeleton.js
new file mode 100644
index 000000000000..8960697eecce
--- /dev/null
+++ b/app/ui-admin/client/components/PageSkeleton.js
@@ -0,0 +1,30 @@
+import { Box, Button, ButtonGroup, Skeleton } from '@rocket.chat/fuselage';
+import React from 'react';
+
+import { Page } from '../../../../client/components/basic/Page';
+
+function PageSkeleton() {
+	return <Page>
+		<Page.Header title={<Skeleton width='20rem' />}>
+			<ButtonGroup>
+				<Button
+					children={<Skeleton width='5rem' />}
+					disabled
+					primary
+				/>
+			</ButtonGroup>
+		</Page.Header>
+
+		<Page.Content>
+			<Box mb='0' mi='auto' width='full' maxWidth='590px'>
+				<Box is='p' textColor='hint' textStyle='p1'>
+					<Skeleton />
+					<Skeleton />
+					<Skeleton width='75%' />
+				</Box>
+			</Box>
+		</Page.Content>
+	</Page>;
+}
+
+export default PageSkeleton;
diff --git a/client/components/admin/info/BuildEnvironmentSection.js b/app/ui-admin/client/components/info/BuildEnvironmentSection.js
similarity index 91%
rename from client/components/admin/info/BuildEnvironmentSection.js
rename to app/ui-admin/client/components/info/BuildEnvironmentSection.js
index a93ef7a24a75..25e0a702284c 100644
--- a/client/components/admin/info/BuildEnvironmentSection.js
+++ b/app/ui-admin/client/components/info/BuildEnvironmentSection.js
@@ -1,7 +1,7 @@
 import { Subtitle } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { useTranslation } from '../../../contexts/TranslationContext';
+import { useTranslation } from '../../../../../client/contexts/TranslationContext';
 import { DescriptionList } from './DescriptionList';
 import { formatDate } from './formatters';
 
diff --git a/client/components/admin/info/BuildEnvironmentSection.stories.js b/app/ui-admin/client/components/info/BuildEnvironmentSection.stories.js
similarity index 89%
rename from client/components/admin/info/BuildEnvironmentSection.stories.js
rename to app/ui-admin/client/components/info/BuildEnvironmentSection.stories.js
index b825ffd1751f..9985ea06de52 100644
--- a/client/components/admin/info/BuildEnvironmentSection.stories.js
+++ b/app/ui-admin/client/components/info/BuildEnvironmentSection.stories.js
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { dummyDate } from '../../../../.storybook/helpers';
+import { dummyDate } from '../../../../../.storybook/helpers';
 import { BuildEnvironmentSection } from './BuildEnvironmentSection';
 
 export default {
diff --git a/client/components/admin/info/CommitSection.js b/app/ui-admin/client/components/info/CommitSection.js
similarity index 91%
rename from client/components/admin/info/CommitSection.js
rename to app/ui-admin/client/components/info/CommitSection.js
index fd70822fd00d..90ea501c17fe 100644
--- a/client/components/admin/info/CommitSection.js
+++ b/app/ui-admin/client/components/info/CommitSection.js
@@ -1,7 +1,7 @@
 import { Subtitle } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { useTranslation } from '../../../contexts/TranslationContext';
+import { useTranslation } from '../../../../../client/contexts/TranslationContext';
 import { DescriptionList } from './DescriptionList';
 
 export function CommitSection({ info }) {
diff --git a/client/components/admin/info/CommitSection.stories.js b/app/ui-admin/client/components/info/CommitSection.stories.js
similarity index 100%
rename from client/components/admin/info/CommitSection.stories.js
rename to app/ui-admin/client/components/info/CommitSection.stories.js
diff --git a/client/components/admin/info/DescriptionList.js b/app/ui-admin/client/components/info/DescriptionList.js
similarity index 100%
rename from client/components/admin/info/DescriptionList.js
rename to app/ui-admin/client/components/info/DescriptionList.js
diff --git a/client/components/admin/info/DescriptionList.stories.js b/app/ui-admin/client/components/info/DescriptionList.stories.js
similarity index 86%
rename from client/components/admin/info/DescriptionList.stories.js
rename to app/ui-admin/client/components/info/DescriptionList.stories.js
index 64ed094fd682..c53baaf5dd17 100644
--- a/client/components/admin/info/DescriptionList.stories.js
+++ b/app/ui-admin/client/components/info/DescriptionList.stories.js
@@ -1,7 +1,7 @@
 import React from 'react';
 
 import { DescriptionList } from './DescriptionList';
-import { Page } from '../../basic/Page';
+import { Page } from '../../../../../client/components/basic/Page';
 
 export default {
 	title: 'admin/info/DescriptionList',
diff --git a/client/components/admin/info/InformationPage.js b/app/ui-admin/client/components/info/InformationPage.js
similarity index 91%
rename from client/components/admin/info/InformationPage.js
rename to app/ui-admin/client/components/info/InformationPage.js
index e5d7a85794e1..055f3d5299cb 100644
--- a/client/components/admin/info/InformationPage.js
+++ b/app/ui-admin/client/components/info/InformationPage.js
@@ -1,9 +1,9 @@
 import { Button, ButtonGroup, Callout, Icon, Margins } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { Link } from '../../basic/Link';
-import { Page } from '../../basic/Page';
-import { useTranslation } from '../../../contexts/TranslationContext';
+import { Link } from '../../../../../client/components/basic/Link';
+import { Page } from '../../../../../client/components/basic/Page';
+import { useTranslation } from '../../../../../client/contexts/TranslationContext';
 import { RocketChatSection } from './RocketChatSection';
 import { CommitSection } from './CommitSection';
 import { RuntimeEnvironmentSection } from './RuntimeEnvironmentSection';
diff --git a/client/components/admin/info/InformationPage.stories.js b/app/ui-admin/client/components/info/InformationPage.stories.js
similarity index 98%
rename from client/components/admin/info/InformationPage.stories.js
rename to app/ui-admin/client/components/info/InformationPage.stories.js
index 8064962cf98d..f337ee71aa6d 100644
--- a/client/components/admin/info/InformationPage.stories.js
+++ b/app/ui-admin/client/components/info/InformationPage.stories.js
@@ -2,7 +2,7 @@ import { action } from '@storybook/addon-actions';
 import { boolean, object } from '@storybook/addon-knobs/react';
 import React from 'react';
 
-import { dummyDate } from '../../../../.storybook/helpers';
+import { dummyDate } from '../../../../../.storybook/helpers';
 import { InformationPage } from './InformationPage';
 
 export default {
diff --git a/client/components/admin/info/InformationRoute.js b/app/ui-admin/client/components/info/InformationRoute.js
similarity index 87%
rename from client/components/admin/info/InformationRoute.js
rename to app/ui-admin/client/components/info/InformationRoute.js
index b3c2d7f7097b..5ac48677b18a 100644
--- a/client/components/admin/info/InformationRoute.js
+++ b/app/ui-admin/client/components/info/InformationRoute.js
@@ -1,14 +1,11 @@
 import React, { useState, useEffect } from 'react';
 
-import { usePermission } from '../../../contexts/AuthorizationContext';
-import { useMethod, useServerInformation, useEndpoint } from '../../../contexts/ServerContext';
-import { useAdminSideNav } from '../../../hooks/useAdminSideNav';
+import { usePermission } from '../../../../../client/contexts/AuthorizationContext';
+import { useMethod, useServerInformation, useEndpoint } from '../../../../../client/contexts/ServerContext';
+import { downloadJsonAsAFile } from '../../../../../client/helpers/download';
 import { InformationPage } from './InformationPage';
-import { downloadJsonAsAFile } from '../../../helpers/download';
 
 export function InformationRoute() {
-	useAdminSideNav();
-
 	const canViewStatistics = usePermission('view-statistics');
 
 	const [isLoading, setLoading] = useState(true);
diff --git a/client/components/admin/info/InstancesSection.js b/app/ui-admin/client/components/info/InstancesSection.js
similarity index 95%
rename from client/components/admin/info/InstancesSection.js
rename to app/ui-admin/client/components/info/InstancesSection.js
index cf593ee2f2c9..c2643c97c1c6 100644
--- a/client/components/admin/info/InstancesSection.js
+++ b/app/ui-admin/client/components/info/InstancesSection.js
@@ -1,7 +1,7 @@
 import { Subtitle } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { useTranslation } from '../../../contexts/TranslationContext';
+import { useTranslation } from '../../../../../client/contexts/TranslationContext';
 import { DescriptionList } from './DescriptionList';
 import { formatDate } from './formatters';
 
diff --git a/client/components/admin/info/InstancesSection.stories.js b/app/ui-admin/client/components/info/InstancesSection.stories.js
similarity index 92%
rename from client/components/admin/info/InstancesSection.stories.js
rename to app/ui-admin/client/components/info/InstancesSection.stories.js
index 8f0f8729765f..4b93772d893c 100644
--- a/client/components/admin/info/InstancesSection.stories.js
+++ b/app/ui-admin/client/components/info/InstancesSection.stories.js
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { dummyDate } from '../../../../.storybook/helpers';
+import { dummyDate } from '../../../../../.storybook/helpers';
 import { InstancesSection } from './InstancesSection';
 
 export default {
diff --git a/client/components/admin/info/RocketChatSection.js b/app/ui-admin/client/components/info/RocketChatSection.js
similarity index 95%
rename from client/components/admin/info/RocketChatSection.js
rename to app/ui-admin/client/components/info/RocketChatSection.js
index e21dd1ddfd0f..bf618db5997b 100644
--- a/client/components/admin/info/RocketChatSection.js
+++ b/app/ui-admin/client/components/info/RocketChatSection.js
@@ -1,7 +1,7 @@
 import { Skeleton, Subtitle } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { useTranslation } from '../../../contexts/TranslationContext';
+import { useTranslation } from '../../../../../client/contexts/TranslationContext';
 import { formatDate, formatHumanReadableTime } from './formatters';
 import { DescriptionList } from './DescriptionList';
 
diff --git a/client/components/admin/info/RocketChatSection.stories.js b/app/ui-admin/client/components/info/RocketChatSection.stories.js
similarity index 92%
rename from client/components/admin/info/RocketChatSection.stories.js
rename to app/ui-admin/client/components/info/RocketChatSection.stories.js
index e859eee72b5a..ec1d148d6827 100644
--- a/client/components/admin/info/RocketChatSection.stories.js
+++ b/app/ui-admin/client/components/info/RocketChatSection.stories.js
@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { dummyDate } from '../../../../.storybook/helpers';
+import { dummyDate } from '../../../../../.storybook/helpers';
 import { RocketChatSection } from './RocketChatSection';
 
 export default {
diff --git a/client/components/admin/info/RuntimeEnvironmentSection.js b/app/ui-admin/client/components/info/RuntimeEnvironmentSection.js
similarity index 95%
rename from client/components/admin/info/RuntimeEnvironmentSection.js
rename to app/ui-admin/client/components/info/RuntimeEnvironmentSection.js
index c3ccb97113f5..4a416f57872a 100644
--- a/client/components/admin/info/RuntimeEnvironmentSection.js
+++ b/app/ui-admin/client/components/info/RuntimeEnvironmentSection.js
@@ -1,7 +1,7 @@
 import { Skeleton, Subtitle } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { useTranslation } from '../../../contexts/TranslationContext';
+import { useTranslation } from '../../../../../client/contexts/TranslationContext';
 import { DescriptionList } from './DescriptionList';
 import { formatMemorySize, formatHumanReadableTime, formatCPULoad } from './formatters';
 
diff --git a/client/components/admin/info/RuntimeEnvironmentSection.stories.js b/app/ui-admin/client/components/info/RuntimeEnvironmentSection.stories.js
similarity index 100%
rename from client/components/admin/info/RuntimeEnvironmentSection.stories.js
rename to app/ui-admin/client/components/info/RuntimeEnvironmentSection.stories.js
diff --git a/client/components/admin/info/UsageSection.js b/app/ui-admin/client/components/info/UsageSection.js
similarity index 98%
rename from client/components/admin/info/UsageSection.js
rename to app/ui-admin/client/components/info/UsageSection.js
index 743ed83073bf..7ea4e60377af 100644
--- a/client/components/admin/info/UsageSection.js
+++ b/app/ui-admin/client/components/info/UsageSection.js
@@ -1,7 +1,7 @@
 import { Subtitle, Skeleton } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { useTranslation } from '../../../contexts/TranslationContext';
+import { useTranslation } from '../../../../../client/contexts/TranslationContext';
 import { DescriptionList } from './DescriptionList';
 import { formatMemorySize } from './formatters';
 
diff --git a/client/components/admin/info/UsageSection.stories.js b/app/ui-admin/client/components/info/UsageSection.stories.js
similarity index 100%
rename from client/components/admin/info/UsageSection.stories.js
rename to app/ui-admin/client/components/info/UsageSection.stories.js
diff --git a/client/components/admin/info/formatters.js b/app/ui-admin/client/components/info/formatters.js
similarity index 100%
rename from client/components/admin/info/formatters.js
rename to app/ui-admin/client/components/info/formatters.js
diff --git a/client/components/admin/settings/GroupPage.js b/app/ui-admin/client/components/settings/GroupPage.js
similarity index 93%
rename from client/components/admin/settings/GroupPage.js
rename to app/ui-admin/client/components/settings/GroupPage.js
index dbe85bdb5def..27ed3906079a 100644
--- a/client/components/admin/settings/GroupPage.js
+++ b/app/ui-admin/client/components/settings/GroupPage.js
@@ -1,9 +1,9 @@
 import { Accordion, Box, Button, ButtonGroup, Skeleton } from '@rocket.chat/fuselage';
 import React, { useMemo } from 'react';
 
-import { useTranslation } from '../../../contexts/TranslationContext';
+import { useTranslation } from '../../../../../client/contexts/TranslationContext';
 import { Section } from './Section';
-import { Page } from '../../basic/Page';
+import { Page } from '../../../../../client/components/basic/Page';
 
 export function GroupPage({ children, headerButtons, save, cancel, _id, i18nLabel, i18nDescription, changed }) {
 	const t = useTranslation();
diff --git a/client/components/admin/settings/GroupPage.stories.js b/app/ui-admin/client/components/settings/GroupPage.stories.js
similarity index 100%
rename from client/components/admin/settings/GroupPage.stories.js
rename to app/ui-admin/client/components/settings/GroupPage.stories.js
diff --git a/client/components/admin/settings/GroupSelector.js b/app/ui-admin/client/components/settings/GroupSelector.js
similarity index 100%
rename from client/components/admin/settings/GroupSelector.js
rename to app/ui-admin/client/components/settings/GroupSelector.js
diff --git a/client/components/admin/settings/GroupSelector.stories.js b/app/ui-admin/client/components/settings/GroupSelector.stories.js
similarity index 100%
rename from client/components/admin/settings/GroupSelector.stories.js
rename to app/ui-admin/client/components/settings/GroupSelector.stories.js
diff --git a/client/components/admin/settings/NotAuthorizedPage.js b/app/ui-admin/client/components/settings/NotAuthorizedPage.js
similarity index 66%
rename from client/components/admin/settings/NotAuthorizedPage.js
rename to app/ui-admin/client/components/settings/NotAuthorizedPage.js
index bfdc64581ff7..3d42b11d7104 100644
--- a/client/components/admin/settings/NotAuthorizedPage.js
+++ b/app/ui-admin/client/components/settings/NotAuthorizedPage.js
@@ -1,8 +1,8 @@
 import { Box } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { useTranslation } from '../../../contexts/TranslationContext';
-import { Page } from '../../basic/Page';
+import { useTranslation } from '../../../../../client/contexts/TranslationContext';
+import { Page } from '../../../../../client/components/basic/Page';
 
 export function NotAuthorizedPage() {
 	const t = useTranslation();
diff --git a/client/components/admin/settings/NotAuthorizedPage.stories.js b/app/ui-admin/client/components/settings/NotAuthorizedPage.stories.js
similarity index 100%
rename from client/components/admin/settings/NotAuthorizedPage.stories.js
rename to app/ui-admin/client/components/settings/NotAuthorizedPage.stories.js
diff --git a/client/components/admin/settings/ResetSettingButton.js b/app/ui-admin/client/components/settings/ResetSettingButton.js
similarity index 79%
rename from client/components/admin/settings/ResetSettingButton.js
rename to app/ui-admin/client/components/settings/ResetSettingButton.js
index 58f96cffa887..f968defb601a 100644
--- a/client/components/admin/settings/ResetSettingButton.js
+++ b/app/ui-admin/client/components/settings/ResetSettingButton.js
@@ -1,7 +1,7 @@
 import { Button, Icon } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { useTranslation } from '../../../contexts/TranslationContext';
+import { useTranslation } from '../../../../../client/contexts/TranslationContext';
 
 export function ResetSettingButton(props) {
 	const t = useTranslation();
diff --git a/client/components/admin/settings/ResetSettingButton.stories.js b/app/ui-admin/client/components/settings/ResetSettingButton.stories.js
similarity index 100%
rename from client/components/admin/settings/ResetSettingButton.stories.js
rename to app/ui-admin/client/components/settings/ResetSettingButton.stories.js
diff --git a/client/components/admin/settings/Section.js b/app/ui-admin/client/components/settings/Section.js
similarity index 94%
rename from client/components/admin/settings/Section.js
rename to app/ui-admin/client/components/settings/Section.js
index 9eb91677bfc6..d658359f518a 100644
--- a/client/components/admin/settings/Section.js
+++ b/app/ui-admin/client/components/settings/Section.js
@@ -1,7 +1,7 @@
 import { Accordion, Box, Button, FieldGroup, Skeleton } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { useTranslation } from '../../../contexts/TranslationContext';
+import { useTranslation } from '../../../../../client/contexts/TranslationContext';
 import { Setting } from './Setting';
 import { useSection, useSectionChangedState } from './SettingsState';
 
diff --git a/client/components/admin/settings/Section.stories.js b/app/ui-admin/client/components/settings/Section.stories.js
similarity index 100%
rename from client/components/admin/settings/Section.stories.js
rename to app/ui-admin/client/components/settings/Section.stories.js
diff --git a/client/components/admin/settings/Setting.js b/app/ui-admin/client/components/settings/Setting.js
similarity index 94%
rename from client/components/admin/settings/Setting.js
rename to app/ui-admin/client/components/settings/Setting.js
index cbbc3b66a0fb..223ae37437c4 100644
--- a/client/components/admin/settings/Setting.js
+++ b/app/ui-admin/client/components/settings/Setting.js
@@ -1,9 +1,9 @@
 import { Callout, Field, Flex, InputBox, Margins, Skeleton } from '@rocket.chat/fuselage';
 import React, { memo, useEffect, useMemo, useState, useCallback } from 'react';
 
-import { MarkdownText } from '../../basic/MarkdownText';
-import { RawText } from '../../basic/RawText';
-import { useTranslation } from '../../../contexts/TranslationContext';
+import { MarkdownText } from '../../../../../client/components/basic/MarkdownText';
+import { RawText } from '../../../../../client/components/basic/RawText';
+import { useTranslation } from '../../../../../client/contexts/TranslationContext';
 import { GenericSettingInput } from './inputs/GenericSettingInput';
 import { BooleanSettingInput } from './inputs/BooleanSettingInput';
 import { StringSettingInput } from './inputs/StringSettingInput';
diff --git a/client/components/admin/settings/Setting.stories.js b/app/ui-admin/client/components/settings/Setting.stories.js
similarity index 100%
rename from client/components/admin/settings/Setting.stories.js
rename to app/ui-admin/client/components/settings/Setting.stories.js
diff --git a/client/components/admin/settings/SettingsRoute.js b/app/ui-admin/client/components/settings/SettingsRoute.js
similarity index 70%
rename from client/components/admin/settings/SettingsRoute.js
rename to app/ui-admin/client/components/settings/SettingsRoute.js
index 831d620abb9b..48535f2e88dd 100644
--- a/client/components/admin/settings/SettingsRoute.js
+++ b/app/ui-admin/client/components/settings/SettingsRoute.js
@@ -1,15 +1,12 @@
 import React from 'react';
 
-import { useAtLeastOnePermission } from '../../../contexts/AuthorizationContext';
-import { useAdminSideNav } from '../../../hooks/useAdminSideNav';
+import { useAtLeastOnePermission } from '../../../../../client/contexts/AuthorizationContext';
+import { useRouteParameter } from '../../../../../client/contexts/RouterContext';
 import { GroupSelector } from './GroupSelector';
 import { NotAuthorizedPage } from './NotAuthorizedPage';
 import { SettingsState } from './SettingsState';
-import { useRouteParameter } from '../../../contexts/RouterContext';
 
 export function SettingsRoute() {
-	useAdminSideNav();
-
 	const hasPermission = useAtLeastOnePermission([
 		'view-privileged-setting',
 		'edit-privileged-setting',
diff --git a/client/components/admin/settings/SettingsState.js b/app/ui-admin/client/components/settings/SettingsState.js
similarity index 95%
rename from client/components/admin/settings/SettingsState.js
rename to app/ui-admin/client/components/settings/SettingsState.js
index 32ff629092b9..acf8c60a5a5f 100644
--- a/client/components/admin/settings/SettingsState.js
+++ b/app/ui-admin/client/components/settings/SettingsState.js
@@ -3,13 +3,13 @@ import { Mongo } from 'meteor/mongo';
 import { Tracker } from 'meteor/tracker';
 import React, { createContext, useCallback, useContext, useEffect, useLayoutEffect, useMemo, useReducer, useRef, useState } from 'react';
 
-import { PrivateSettingsCachedCollection } from '../../../../app/ui-admin/client/SettingsCachedCollection';
-import { useBatchSettingsDispatch } from '../../../contexts/SettingsContext';
-import { useToastMessageDispatch } from '../../../contexts/ToastMessagesContext';
-import { useEventCallback } from '../../../hooks/useEventCallback';
-import { useReactiveValue } from '../../../hooks/useReactiveValue';
-import { useTranslation, useLoadLanguage } from '../../../contexts/TranslationContext';
-import { useUser } from '../../../contexts/UserContext';
+import { PrivateSettingsCachedCollection } from '../../SettingsCachedCollection';
+import { useBatchSettingsDispatch } from '../../../../../client/contexts/SettingsContext';
+import { useToastMessageDispatch } from '../../../../../client/contexts/ToastMessagesContext';
+import { useEventCallback } from '../../../../../client/hooks/useEventCallback';
+import { useReactiveValue } from '../../../../../client/hooks/useReactiveValue';
+import { useTranslation, useLoadLanguage } from '../../../../../client/contexts/TranslationContext';
+import { useUser } from '../../../../../client/contexts/UserContext';
 
 const SettingsContext = createContext({});
 
diff --git a/client/components/admin/settings/groups/AssetsGroupPage.js b/app/ui-admin/client/components/settings/groups/AssetsGroupPage.js
similarity index 79%
rename from client/components/admin/settings/groups/AssetsGroupPage.js
rename to app/ui-admin/client/components/settings/groups/AssetsGroupPage.js
index 7405b9301b05..b0379dc4d62b 100644
--- a/client/components/admin/settings/groups/AssetsGroupPage.js
+++ b/app/ui-admin/client/components/settings/groups/AssetsGroupPage.js
@@ -1,9 +1,9 @@
 import { Button } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { useMethod } from '../../../../contexts/ServerContext';
-import { useToastMessageDispatch } from '../../../../contexts/ToastMessagesContext';
-import { useTranslation } from '../../../../contexts/TranslationContext';
+import { useMethod } from '../../../../../../client/contexts/ServerContext';
+import { useToastMessageDispatch } from '../../../../../../client/contexts/ToastMessagesContext';
+import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
 import { GroupPage } from '../GroupPage';
 import { Section } from '../Section';
 
diff --git a/client/components/admin/settings/groups/GenericGroupPage.js b/app/ui-admin/client/components/settings/groups/GenericGroupPage.js
similarity index 100%
rename from client/components/admin/settings/groups/GenericGroupPage.js
rename to app/ui-admin/client/components/settings/groups/GenericGroupPage.js
diff --git a/client/components/admin/settings/groups/OAuthGroupPage.js b/app/ui-admin/client/components/settings/groups/OAuthGroupPage.js
similarity index 88%
rename from client/components/admin/settings/groups/OAuthGroupPage.js
rename to app/ui-admin/client/components/settings/groups/OAuthGroupPage.js
index d64e9a296f25..f0b21b533130 100644
--- a/client/components/admin/settings/groups/OAuthGroupPage.js
+++ b/app/ui-admin/client/components/settings/groups/OAuthGroupPage.js
@@ -2,11 +2,11 @@ import { Button } from '@rocket.chat/fuselage';
 import React from 'react';
 import s from 'underscore.string';
 
-import { RawText } from '../../../basic/RawText';
-import { useAbsoluteUrl, useMethod } from '../../../../contexts/ServerContext';
-import { useToastMessageDispatch } from '../../../../contexts/ToastMessagesContext';
-import { useTranslation } from '../../../../contexts/TranslationContext';
-import { useModal } from '../../../../hooks/useModal';
+import { RawText } from '../../../../../../client/components/basic/RawText';
+import { useAbsoluteUrl, useMethod } from '../../../../../../client/contexts/ServerContext';
+import { useToastMessageDispatch } from '../../../../../../client/contexts/ToastMessagesContext';
+import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
+import { useModal } from '../../../../../../client/hooks/useModal';
 import { GroupPage } from '../GroupPage';
 import { Section } from '../Section';
 
diff --git a/client/components/admin/settings/inputs/ActionSettingInput.js b/app/ui-admin/client/components/settings/inputs/ActionSettingInput.js
similarity index 77%
rename from client/components/admin/settings/inputs/ActionSettingInput.js
rename to app/ui-admin/client/components/settings/inputs/ActionSettingInput.js
index 6e35e6397bab..3d55c9429f26 100644
--- a/client/components/admin/settings/inputs/ActionSettingInput.js
+++ b/app/ui-admin/client/components/settings/inputs/ActionSettingInput.js
@@ -1,9 +1,9 @@
 import { Button, Field } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { useMethod } from '../../../../contexts/ServerContext';
-import { useToastMessageDispatch } from '../../../../contexts/ToastMessagesContext';
-import { useTranslation } from '../../../../contexts/TranslationContext';
+import { useMethod } from '../../../../../../client/contexts/ServerContext';
+import { useToastMessageDispatch } from '../../../../../../client/contexts/ToastMessagesContext';
+import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
 
 export function ActionSettingInput({
 	_id,
diff --git a/client/components/admin/settings/inputs/ActionSettingInput.stories.js b/app/ui-admin/client/components/settings/inputs/ActionSettingInput.stories.js
similarity index 100%
rename from client/components/admin/settings/inputs/ActionSettingInput.stories.js
rename to app/ui-admin/client/components/settings/inputs/ActionSettingInput.stories.js
diff --git a/client/components/admin/settings/inputs/AssetSettingInput.css b/app/ui-admin/client/components/settings/inputs/AssetSettingInput.css
similarity index 100%
rename from client/components/admin/settings/inputs/AssetSettingInput.css
rename to app/ui-admin/client/components/settings/inputs/AssetSettingInput.css
diff --git a/client/components/admin/settings/inputs/AssetSettingInput.js b/app/ui-admin/client/components/settings/inputs/AssetSettingInput.js
similarity index 89%
rename from client/components/admin/settings/inputs/AssetSettingInput.js
rename to app/ui-admin/client/components/settings/inputs/AssetSettingInput.js
index 24ca1d146d19..6986f903f21e 100644
--- a/client/components/admin/settings/inputs/AssetSettingInput.js
+++ b/app/ui-admin/client/components/settings/inputs/AssetSettingInput.js
@@ -2,9 +2,9 @@ import { Button, Field, Icon } from '@rocket.chat/fuselage';
 import { Random } from 'meteor/random';
 import React from 'react';
 
-import { useMethod } from '../../../../contexts/ServerContext';
-import { useToastMessageDispatch } from '../../../../contexts/ToastMessagesContext';
-import { useTranslation } from '../../../../contexts/TranslationContext';
+import { useMethod } from '../../../../../../client/contexts/ServerContext';
+import { useToastMessageDispatch } from '../../../../../../client/contexts/ToastMessagesContext';
+import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
 import './AssetSettingInput.css';
 
 export function AssetSettingInput({
diff --git a/client/components/admin/settings/inputs/AssetSettingInput.stories.js b/app/ui-admin/client/components/settings/inputs/AssetSettingInput.stories.js
similarity index 100%
rename from client/components/admin/settings/inputs/AssetSettingInput.stories.js
rename to app/ui-admin/client/components/settings/inputs/AssetSettingInput.stories.js
diff --git a/client/components/admin/settings/inputs/BooleanSettingInput.js b/app/ui-admin/client/components/settings/inputs/BooleanSettingInput.js
similarity index 100%
rename from client/components/admin/settings/inputs/BooleanSettingInput.js
rename to app/ui-admin/client/components/settings/inputs/BooleanSettingInput.js
diff --git a/client/components/admin/settings/inputs/BooleanSettingInput.stories.js b/app/ui-admin/client/components/settings/inputs/BooleanSettingInput.stories.js
similarity index 100%
rename from client/components/admin/settings/inputs/BooleanSettingInput.stories.js
rename to app/ui-admin/client/components/settings/inputs/BooleanSettingInput.stories.js
diff --git a/client/components/admin/settings/inputs/CodeSettingInput.js b/app/ui-admin/client/components/settings/inputs/CodeSettingInput.js
similarity index 95%
rename from client/components/admin/settings/inputs/CodeSettingInput.js
rename to app/ui-admin/client/components/settings/inputs/CodeSettingInput.js
index 2685ac71a2e4..dbfb863f6c49 100644
--- a/client/components/admin/settings/inputs/CodeSettingInput.js
+++ b/app/ui-admin/client/components/settings/inputs/CodeSettingInput.js
@@ -2,7 +2,7 @@ import { Box, Button, Field, Flex } from '@rocket.chat/fuselage';
 import { useToggle } from '@rocket.chat/fuselage-hooks';
 import React, { useEffect, useRef, useState } from 'react';
 
-import { useTranslation } from '../../../../contexts/TranslationContext';
+import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
 import { ResetSettingButton } from '../ResetSettingButton';
 
 function CodeMirror({
@@ -31,7 +31,7 @@ function CodeMirror({
 
 		const setupCodeMirror = async () => {
 			const CodeMirror = await import('codemirror/lib/codemirror.js');
-			await import('../../../../../app/ui/client/lib/codeMirror/codeMirror');
+			await import('../../../../../ui/client/lib/codeMirror/codeMirror');
 			await import('codemirror/lib/codemirror.css');
 
 			const { current: textarea } = ref;
diff --git a/client/components/admin/settings/inputs/CodeSettingInput.stories.js b/app/ui-admin/client/components/settings/inputs/CodeSettingInput.stories.js
similarity index 100%
rename from client/components/admin/settings/inputs/CodeSettingInput.stories.js
rename to app/ui-admin/client/components/settings/inputs/CodeSettingInput.stories.js
diff --git a/client/components/admin/settings/inputs/ColorSettingInput.js b/app/ui-admin/client/components/settings/inputs/ColorSettingInput.js
similarity index 96%
rename from client/components/admin/settings/inputs/ColorSettingInput.js
rename to app/ui-admin/client/components/settings/inputs/ColorSettingInput.js
index 410d20ada91a..4fcc3740cabf 100644
--- a/client/components/admin/settings/inputs/ColorSettingInput.js
+++ b/app/ui-admin/client/components/settings/inputs/ColorSettingInput.js
@@ -9,7 +9,7 @@ import {
 } from '@rocket.chat/fuselage';
 import React, { useCallback } from 'react';
 
-import { useTranslation } from '../../../../contexts/TranslationContext';
+import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
 import { ResetSettingButton } from '../ResetSettingButton';
 
 export function ColorSettingInput({
diff --git a/client/components/admin/settings/inputs/ColorSettingInput.stories.js b/app/ui-admin/client/components/settings/inputs/ColorSettingInput.stories.js
similarity index 100%
rename from client/components/admin/settings/inputs/ColorSettingInput.stories.js
rename to app/ui-admin/client/components/settings/inputs/ColorSettingInput.stories.js
diff --git a/client/components/admin/settings/inputs/FontSettingInput.js b/app/ui-admin/client/components/settings/inputs/FontSettingInput.js
similarity index 100%
rename from client/components/admin/settings/inputs/FontSettingInput.js
rename to app/ui-admin/client/components/settings/inputs/FontSettingInput.js
diff --git a/client/components/admin/settings/inputs/FontSettingInput.stories.js b/app/ui-admin/client/components/settings/inputs/FontSettingInput.stories.js
similarity index 100%
rename from client/components/admin/settings/inputs/FontSettingInput.stories.js
rename to app/ui-admin/client/components/settings/inputs/FontSettingInput.stories.js
diff --git a/client/components/admin/settings/inputs/GenericSettingInput.js b/app/ui-admin/client/components/settings/inputs/GenericSettingInput.js
similarity index 100%
rename from client/components/admin/settings/inputs/GenericSettingInput.js
rename to app/ui-admin/client/components/settings/inputs/GenericSettingInput.js
diff --git a/client/components/admin/settings/inputs/GenericSettingInput.stories.js b/app/ui-admin/client/components/settings/inputs/GenericSettingInput.stories.js
similarity index 100%
rename from client/components/admin/settings/inputs/GenericSettingInput.stories.js
rename to app/ui-admin/client/components/settings/inputs/GenericSettingInput.stories.js
diff --git a/client/components/admin/settings/inputs/IntSettingInput.js b/app/ui-admin/client/components/settings/inputs/IntSettingInput.js
similarity index 100%
rename from client/components/admin/settings/inputs/IntSettingInput.js
rename to app/ui-admin/client/components/settings/inputs/IntSettingInput.js
diff --git a/client/components/admin/settings/inputs/IntSettingInput.stories.js b/app/ui-admin/client/components/settings/inputs/IntSettingInput.stories.js
similarity index 100%
rename from client/components/admin/settings/inputs/IntSettingInput.stories.js
rename to app/ui-admin/client/components/settings/inputs/IntSettingInput.stories.js
diff --git a/client/components/admin/settings/inputs/LanguageSettingInput.js b/app/ui-admin/client/components/settings/inputs/LanguageSettingInput.js
similarity index 92%
rename from client/components/admin/settings/inputs/LanguageSettingInput.js
rename to app/ui-admin/client/components/settings/inputs/LanguageSettingInput.js
index 59d84711f7ff..d80d459f7da7 100644
--- a/client/components/admin/settings/inputs/LanguageSettingInput.js
+++ b/app/ui-admin/client/components/settings/inputs/LanguageSettingInput.js
@@ -1,7 +1,7 @@
 import { Box, Field, Flex, Select } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { useLanguages } from '../../../../contexts/TranslationContext';
+import { useLanguages } from '../../../../../../client/contexts/TranslationContext';
 import { ResetSettingButton } from '../ResetSettingButton';
 
 export function LanguageSettingInput({
diff --git a/client/components/admin/settings/inputs/LanguageSettingInput.stories.js b/app/ui-admin/client/components/settings/inputs/LanguageSettingInput.stories.js
similarity index 100%
rename from client/components/admin/settings/inputs/LanguageSettingInput.stories.js
rename to app/ui-admin/client/components/settings/inputs/LanguageSettingInput.stories.js
diff --git a/client/components/admin/settings/inputs/MultiSelectSettingInput.js b/app/ui-admin/client/components/settings/inputs/MultiSelectSettingInput.js
similarity index 94%
rename from client/components/admin/settings/inputs/MultiSelectSettingInput.js
rename to app/ui-admin/client/components/settings/inputs/MultiSelectSettingInput.js
index 8c7e88738080..e3228d3cbbac 100644
--- a/client/components/admin/settings/inputs/MultiSelectSettingInput.js
+++ b/app/ui-admin/client/components/settings/inputs/MultiSelectSettingInput.js
@@ -1,7 +1,7 @@
 import { Field, Flex, Box, MultiSelectFiltered, MultiSelect } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { useTranslation } from '../../../../contexts/TranslationContext';
+import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
 import { ResetSettingButton } from '../ResetSettingButton';
 
 export function MultiSelectSettingInput({
diff --git a/client/components/admin/settings/inputs/MultiSelectSettingInput.stories.js b/app/ui-admin/client/components/settings/inputs/MultiSelectSettingInput.stories.js
similarity index 100%
rename from client/components/admin/settings/inputs/MultiSelectSettingInput.stories.js
rename to app/ui-admin/client/components/settings/inputs/MultiSelectSettingInput.stories.js
diff --git a/client/components/admin/settings/inputs/PasswordSettingInput.js b/app/ui-admin/client/components/settings/inputs/PasswordSettingInput.js
similarity index 100%
rename from client/components/admin/settings/inputs/PasswordSettingInput.js
rename to app/ui-admin/client/components/settings/inputs/PasswordSettingInput.js
diff --git a/client/components/admin/settings/inputs/PasswordSettingInput.stories.js b/app/ui-admin/client/components/settings/inputs/PasswordSettingInput.stories.js
similarity index 100%
rename from client/components/admin/settings/inputs/PasswordSettingInput.stories.js
rename to app/ui-admin/client/components/settings/inputs/PasswordSettingInput.stories.js
diff --git a/client/components/admin/settings/inputs/RelativeUrlSettingInput.js b/app/ui-admin/client/components/settings/inputs/RelativeUrlSettingInput.js
similarity index 92%
rename from client/components/admin/settings/inputs/RelativeUrlSettingInput.js
rename to app/ui-admin/client/components/settings/inputs/RelativeUrlSettingInput.js
index 173c55cb8a22..e0d761bd94aa 100644
--- a/client/components/admin/settings/inputs/RelativeUrlSettingInput.js
+++ b/app/ui-admin/client/components/settings/inputs/RelativeUrlSettingInput.js
@@ -1,7 +1,7 @@
 import { Box, Field, Flex, UrlInput } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { useAbsoluteUrl } from '../../../../contexts/ServerContext';
+import { useAbsoluteUrl } from '../../../../../../client/contexts/ServerContext';
 import { ResetSettingButton } from '../ResetSettingButton';
 
 export function RelativeUrlSettingInput({
diff --git a/client/components/admin/settings/inputs/RelativeUrlSettingInput.stories.js b/app/ui-admin/client/components/settings/inputs/RelativeUrlSettingInput.stories.js
similarity index 100%
rename from client/components/admin/settings/inputs/RelativeUrlSettingInput.stories.js
rename to app/ui-admin/client/components/settings/inputs/RelativeUrlSettingInput.stories.js
diff --git a/client/components/admin/settings/inputs/RoomPickSettingInput.js b/app/ui-admin/client/components/settings/inputs/RoomPickSettingInput.js
similarity index 100%
rename from client/components/admin/settings/inputs/RoomPickSettingInput.js
rename to app/ui-admin/client/components/settings/inputs/RoomPickSettingInput.js
diff --git a/client/components/admin/settings/inputs/SelectSettingInput.js b/app/ui-admin/client/components/settings/inputs/SelectSettingInput.js
similarity index 93%
rename from client/components/admin/settings/inputs/SelectSettingInput.js
rename to app/ui-admin/client/components/settings/inputs/SelectSettingInput.js
index 7fa5f3b5395c..061eacc9ab44 100644
--- a/client/components/admin/settings/inputs/SelectSettingInput.js
+++ b/app/ui-admin/client/components/settings/inputs/SelectSettingInput.js
@@ -6,7 +6,7 @@ import {
 } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { useTranslation } from '../../../../contexts/TranslationContext';
+import { useTranslation } from '../../../../../../client/contexts/TranslationContext';
 import { ResetSettingButton } from '../ResetSettingButton';
 
 export function SelectSettingInput({
diff --git a/client/components/admin/settings/inputs/SelectSettingInput.stories.js b/app/ui-admin/client/components/settings/inputs/SelectSettingInput.stories.js
similarity index 100%
rename from client/components/admin/settings/inputs/SelectSettingInput.stories.js
rename to app/ui-admin/client/components/settings/inputs/SelectSettingInput.stories.js
diff --git a/client/components/admin/settings/inputs/StringSettingInput.js b/app/ui-admin/client/components/settings/inputs/StringSettingInput.js
similarity index 100%
rename from client/components/admin/settings/inputs/StringSettingInput.js
rename to app/ui-admin/client/components/settings/inputs/StringSettingInput.js
diff --git a/client/components/admin/settings/inputs/StringSettingInput.stories.js b/app/ui-admin/client/components/settings/inputs/StringSettingInput.stories.js
similarity index 100%
rename from client/components/admin/settings/inputs/StringSettingInput.stories.js
rename to app/ui-admin/client/components/settings/inputs/StringSettingInput.stories.js
diff --git a/client/hooks/useAdminSideNav.js b/app/ui-admin/client/hooks/useAdminSideNav.js
similarity index 71%
rename from client/hooks/useAdminSideNav.js
rename to app/ui-admin/client/hooks/useAdminSideNav.js
index a38299f0b8cf..25d3f293dc74 100644
--- a/client/hooks/useAdminSideNav.js
+++ b/app/ui-admin/client/hooks/useAdminSideNav.js
@@ -1,6 +1,6 @@
 import { useEffect } from 'react';
 
-import { SideNav } from '../../app/ui-utils/client/lib/SideNav';
+import { SideNav } from '../../../ui-utils/client/lib/SideNav';
 
 export const useAdminSideNav = () => {
 	useEffect(() => {
diff --git a/app/ui-admin/client/index.js b/app/ui-admin/client/index.js
index 93eca42775ae..891abf1781d1 100644
--- a/app/ui-admin/client/index.js
+++ b/app/ui-admin/client/index.js
@@ -1,3 +1,5 @@
 import './adminFlex.html';
 import './adminFlex';
-import './routes';
+
+export { registerAdminRoute } from './routes';
+export { registerAdminSidebarItem } from './sidebarItems';
diff --git a/app/ui-admin/client/routes.js b/app/ui-admin/client/routes.js
index cf87a26258f5..0cf97ff76672 100644
--- a/app/ui-admin/client/routes.js
+++ b/app/ui-admin/client/routes.js
@@ -1,19 +1,62 @@
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
+import { Meteor } from 'meteor/meteor';
 
-FlowRouter.route('/admin/users', {
+import { renderRouteComponent } from '../../../client/reactAdapters';
+
+const routeGroup = FlowRouter.group({
+	name: 'admin',
+	prefix: '/admin',
+});
+
+export const registerAdminRoute = (path, { lazyRouteComponent, action, ...options } = {}) => {
+	routeGroup.route(path, {
+		...options,
+		action: (params, queryParams) => {
+			if (action) {
+				action(params, queryParams);
+				return;
+			}
+
+			renderRouteComponent(() => import('./components/AdministrationRouter'), {
+				template: 'main',
+				region: 'center',
+				propsFn: () => ({ lazyRouteComponent, ...options, params, queryParams }),
+			});
+		},
+	});
+};
+
+registerAdminRoute('/', {
+	triggersEnter: [(context, redirect) => {
+		redirect('admin-info');
+	}],
+});
+
+registerAdminRoute('/info', {
+	name: 'admin-info',
+	lazyRouteComponent: () => import('./components/info/InformationRoute'),
+});
+
+registerAdminRoute('/users', {
 	name: 'admin-users',
-	async action() {
+	action: async () => {
 		await import('./users/views');
 		BlazeLayout.render('main', { center: 'adminUsers' });
 	},
 });
 
-
-FlowRouter.route('/admin/rooms', {
+registerAdminRoute('/rooms', {
 	name: 'admin-rooms',
-	async action() {
+	action: async () => {
 		await import('./rooms/views');
 		BlazeLayout.render('main', { center: 'adminRooms' });
 	},
 });
+
+Meteor.startup(() => {
+	registerAdminRoute('/:group+', {
+		name: 'admin',
+		lazyRouteComponent: () => import('./components/settings/SettingsRoute'),
+	});
+});
diff --git a/app/ui-admin/client/sidebarItems.js b/app/ui-admin/client/sidebarItems.js
new file mode 100644
index 000000000000..f060c00e21d3
--- /dev/null
+++ b/app/ui-admin/client/sidebarItems.js
@@ -0,0 +1,10 @@
+import { ReactiveVar } from 'meteor/reactive-var';
+import { Tracker } from 'meteor/tracker';
+
+const items = new ReactiveVar([]);
+
+export const registerAdminSidebarItem = (itemOptions) => {
+	Tracker.nonreactive(() => items.set([...items.get(), itemOptions]));
+};
+
+export const getSidebarItems = () => items.get().filter((option) => !option.permissionGranted || option.permissionGranted());
diff --git a/app/ui-utils/client/index.js b/app/ui-utils/client/index.js
index 163a9fa6e0bb..5dbb840cc4f9 100644
--- a/app/ui-utils/client/index.js
+++ b/app/ui-utils/client/index.js
@@ -1,4 +1,3 @@
-export { AdminBox } from './lib/AdminBox';
 export { modal } from './lib/modal';
 export { SideNav } from './lib/SideNav';
 export { AccountBox } from './lib/AccountBox';
diff --git a/app/ui-utils/client/lib/AdminBox.js b/app/ui-utils/client/lib/AdminBox.js
deleted file mode 100644
index f6f1856ffa5a..000000000000
--- a/app/ui-utils/client/lib/AdminBox.js
+++ /dev/null
@@ -1,25 +0,0 @@
-import { ReactiveVar } from 'meteor/reactive-var';
-import { Tracker } from 'meteor/tracker';
-import _ from 'underscore';
-
-export const AdminBox = new class {
-	constructor() {
-		this.options = new ReactiveVar([]);
-	}
-
-	addOption(option) {
-		return Tracker.nonreactive(() => {
-			const actual = this.options.get();
-			actual.push(option);
-			return this.options.set(actual);
-		});
-	}
-
-	getOptions() {
-		return _.filter(this.options.get(), function(option) {
-			if ((option.permissionGranted == null) || option.permissionGranted()) {
-				return true;
-			}
-		});
-	}
-}();
diff --git a/app/user-status/client/admin/route.js b/app/user-status/client/admin/route.js
index fec4bab8d92c..5363f68141ac 100644
--- a/app/user-status/client/admin/route.js
+++ b/app/user-status/client/admin/route.js
@@ -1,9 +1,10 @@
-import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 
-FlowRouter.route('/admin/user-status-custom', {
+import { registerAdminRoute } from '../../../ui-admin/client';
+
+registerAdminRoute('/user-status-custom', {
 	name: 'user-status-custom',
-	async action(/* params */) {
+	async action() {
 		await import('./views');
 		BlazeLayout.render('main', { center: 'adminUserStatus' });
 	},
diff --git a/app/user-status/client/admin/startup.js b/app/user-status/client/admin/startup.js
index d9e33bbf5beb..0075e4413702 100644
--- a/app/user-status/client/admin/startup.js
+++ b/app/user-status/client/admin/startup.js
@@ -1,7 +1,7 @@
-import { AdminBox } from '../../../ui-utils';
 import { hasAtLeastOnePermission } from '../../../authorization';
+import { registerAdminSidebarItem } from '../../../ui-admin/client';
 
-AdminBox.addOption({
+registerAdminSidebarItem({
 	href: 'user-status-custom',
 	i18nLabel: 'Custom_User_Status',
 	icon: 'user',
diff --git a/client/components/basic/Page.js b/client/components/basic/Page.js
index afa756eb2f99..49111df7bd08 100644
--- a/client/components/basic/Page.js
+++ b/client/components/basic/Page.js
@@ -8,7 +8,7 @@ export function Page(props) {
 	const [border, setBorder] = useState(false);
 	return <PageContext.Provider value={[border, setBorder]}>
 		<Flex.Container direction='column'>
-			<Box is='section' style={useMemo(() => ({ height: '100%' }), [])} {...props} />
+			<Box is='section' style={useMemo(() => ({ overflow: 'hidden', flex: '1 1 auto', height: '100%' }), [])} {...props} />
 		</Flex.Container>
 	</PageContext.Provider>;
 }
diff --git a/client/reactAdapters.js b/client/reactAdapters.js
index 54703f2b95ca..7471cb9e2930 100644
--- a/client/reactAdapters.js
+++ b/client/reactAdapters.js
@@ -129,7 +129,7 @@ export const createTemplateForComponent = (
 export const renderRouteComponent = (importFn, {
 	template,
 	region,
-	renderContainerView = () => HTML.DIV(), // eslint-disable-line new-cap
+	propsFn = () => ({}),
 } = {}) => {
 	const routeName = FlowRouter.getRouteName();
 
@@ -147,7 +147,7 @@ export const renderRouteComponent = (importFn, {
 		if (!template || !region) {
 			BlazeLayout.reset();
 
-			const element = await createLazyElement(importFn);
+			const element = await createLazyElement(importFn, propsFn);
 
 			if (routeName !== FlowRouter.getRouteName()) {
 				return;
@@ -158,15 +158,12 @@ export const renderRouteComponent = (importFn, {
 		}
 
 		if (!Template[routeName]) {
-			const blazeTemplate = new Blaze.Template(routeName, renderContainerView);
+			const blazeTemplate = new Blaze.Template(routeName, () => HTML.DIV()); // eslint-disable-line new-cap
 
 			blazeTemplate.onRendered(async function() {
-				const props = new ReactiveVar(this.data);
-				this.autorun(() => {
-					props.set(Template.currentData());
-				});
-
-				const portal = await createLazyPortal(importFn, () => props.get(), this.firstNode);
+				const node = this.firstNode.parentElement;
+				this.firstNode.remove();
+				const portal = await createLazyPortal(importFn, propsFn, node);
 
 				if (routeName !== FlowRouter.getRouteName()) {
 					return;
diff --git a/client/routes.js b/client/routes.js
index 5e29798f30b4..6c8a7d5c6f1f 100644
--- a/client/routes.js
+++ b/client/routes.js
@@ -1,6 +1,5 @@
 import mem from 'mem';
 import s from 'underscore.string';
-import { HTML } from 'meteor/htmljs';
 import { Meteor } from 'meteor/meteor';
 import { Accounts } from 'meteor/accounts-base';
 import { Tracker } from 'meteor/tracker';
@@ -33,6 +32,8 @@ FlowRouter.goToRoomById = async (rid) => {
 
 BlazeLayout.setRoot('body');
 
+FlowRouter.wait();
+
 FlowRouter.route('/', {
 	name: 'index',
 	action() {
@@ -170,32 +171,12 @@ FlowRouter.route('/setup-wizard/:step?', {
 	},
 });
 
-FlowRouter.route('/admin/info', {
-	name: 'admin-info',
-	action: () => {
-		renderRouteComponent(() => import('./components/admin/info/InformationRoute'), {
-			template: 'main',
-			region: 'center',
-			// eslint-disable-next-line new-cap
-			renderContainerView: () => HTML.DIV({ style: 'overflow: hidden; flex: 1 1 auto; height: 1%;' }),
-		});
-	},
-});
-
-FlowRouter.route('/admin/:group?', {
-	name: 'admin',
-	action: () => {
-		renderRouteComponent(() => import('./components/admin/settings/SettingsRoute'), {
-			template: 'main',
-			region: 'center',
-			// eslint-disable-next-line new-cap
-			renderContainerView: () => HTML.DIV({ style: 'overflow: hidden; flex: 1 1 auto; height: 1%;' }),
-		});
-	},
-});
-
 FlowRouter.notFound = {
 	action: () => {
 		renderRouteComponent(() => import('./components/pageNotFound/PageNotFound'));
 	},
 };
+
+Meteor.startup(() => {
+	FlowRouter.initialize();
+});
diff --git a/ee/app/engagement-dashboard/client/components/EngagementDashboardRoute.js b/ee/app/engagement-dashboard/client/components/EngagementDashboardRoute.js
index c9a85ce40f46..78a023b61fec 100644
--- a/ee/app/engagement-dashboard/client/components/EngagementDashboardRoute.js
+++ b/ee/app/engagement-dashboard/client/components/EngagementDashboardRoute.js
@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 
 import { useRoute, useRouteParameter } from '../../../../../client/contexts/RouterContext';
-import { useAdminSideNav } from '../../../../../client/hooks/useAdminSideNav';
+import { useAdminSideNav } from '../../../../../app/ui-admin/client/hooks/useAdminSideNav';
 import { EngagementDashboardPage } from './EngagementDashboardPage';
 
 export function EngagementDashboardRoute() {
diff --git a/ee/app/engagement-dashboard/client/routes.js b/ee/app/engagement-dashboard/client/routes.js
index f99bd92afc6c..36ee55bbd158 100644
--- a/ee/app/engagement-dashboard/client/routes.js
+++ b/ee/app/engagement-dashboard/client/routes.js
@@ -1,11 +1,9 @@
-import { FlowRouter } from 'meteor/kadira:flow-router';
-
 import { hasAllPermission } from '../../../../app/authorization';
-import { AdminBox } from '../../../../app/ui-utils';
+import { registerAdminRoute, registerAdminSidebarItem } from '../../../../app/ui-admin/client';
 import { renderRouteComponent } from '../../../../client/reactAdapters';
 import { hasLicense } from '../../license/client';
 
-FlowRouter.route('/admin/engagement-dashboard/:tab?', {
+registerAdminRoute('/engagement-dashboard/:tab?', {
 	name: 'engagement-dashboard',
 	action: async () => {
 		const licensed = await hasLicense('engagement-dashboard');
@@ -22,7 +20,7 @@ hasLicense('engagement-dashboard').then((enabled) => {
 		return;
 	}
 
-	AdminBox.addOption({
+	registerAdminSidebarItem({
 		href: 'engagement-dashboard',
 		i18nLabel: 'Engagement Dashboard',
 		icon: 'file-keynote',
diff --git a/package-lock.json b/package-lock.json
index 54b8e0fd8dae..b873b3375689 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15618,7 +15618,7 @@
 				},
 				"minimist": {
 					"version": "0.0.8",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+					"resolved": false,
 					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
 					"dev": true,
 					"optional": true
@@ -15646,7 +15646,7 @@
 				},
 				"mkdirp": {
 					"version": "0.5.1",
-					"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
 					"dev": true,
 					"optional": true,
@@ -15701,7 +15701,7 @@
 				},
 				"nopt": {
 					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+					"resolved": false,
 					"integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
 					"dev": true,
 					"optional": true,
@@ -15819,7 +15819,7 @@
 					"dependencies": {
 						"minimist": {
 							"version": "1.2.0",
-							"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+							"resolved": false,
 							"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
 							"dev": true,
 							"optional": true
@@ -15828,7 +15828,7 @@
 				},
 				"readable-stream": {
 					"version": "2.3.6",
-					"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+					"resolved": false,
 					"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
 					"dev": true,
 					"optional": true,

From 3cb54f227a67263a3d5209df4e1f3a19b1f9f302 Mon Sep 17 00:00:00 2001
From: shubhsherl <shubham.singh094@yahoo.com>
Date: Sat, 11 Apr 2020 22:21:21 +0530
Subject: [PATCH 205/223] fix quote message redirect in pwa

---
 .../client/messageAttachment.html                    | 12 ++++++------
 .../client/stylesheets/messageAttachments.css        |  8 +++++++-
 app/ui/client/views/app/room.js                      |  8 +++++---
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/app/message-attachments/client/messageAttachment.html b/app/message-attachments/client/messageAttachment.html
index e1d5930c4634..371089c2e242 100644
--- a/app/message-attachments/client/messageAttachment.html
+++ b/app/message-attachments/client/messageAttachment.html
@@ -18,9 +18,9 @@
 						<a href="{{author_link}}" target="_blank" rel="noopener noreferrer">{{author_name}}</a>
 						{{#if ts}}
 							{{#if message_link}}
-								<span class="time-link">
-									<a href="{{message_link}}" rel="noopener noreferrer">{{time}}</a>
-								</span>
+								<button type="button" class="time">
+									<span class="time-link">{{time}}</span>
+								</button>
 							{{else}}
 								{{#unless time}}
 									<span class="time">
@@ -38,9 +38,9 @@
 						{{author_name}}
 					{{#if ts}}
 						{{#if message_link}}
-							<span class="time-link">
-								<a href="{{message_link}}" rel="noopener noreferrer">{{time}}</a>
-							</span>
+							<button type="button" class="time">
+								<span class="time-link">{{time}}</span>
+							</button>
 						{{else}}
 							{{#unless time}}
 								<span class="time">
diff --git a/app/message-attachments/client/stylesheets/messageAttachments.css b/app/message-attachments/client/stylesheets/messageAttachments.css
index 32b9e1c3d1f9..c861675d7f5c 100644
--- a/app/message-attachments/client/stylesheets/messageAttachments.css
+++ b/app/message-attachments/client/stylesheets/messageAttachments.css
@@ -57,8 +57,14 @@ html.rtl .attachment {
 			margin-bottom: -2px;
 		}
 
-		& .time,
+		& .time {
+			font-size: 0.8em;
+			font-weight: normal;
+		}
+
 		& .time-link {
+			color: #1d74f5;
+
 			font-size: 0.8em;
 			font-weight: normal;
 		}
diff --git a/app/ui/client/views/app/room.js b/app/ui/client/views/app/room.js
index 3a0011fc92e8..c3db892b56a3 100644
--- a/app/ui/client/views/app/room.js
+++ b/app/ui/client/views/app/room.js
@@ -878,11 +878,13 @@ Template.room.events({
 
 		popover.open(config);
 	},
-	'click .time a'(e) {
+	'click .time-link'(e) {
 		e.preventDefault();
 		const { msg } = messageArgs(this);
-		const repliedMessageId = msg.attachments[0].message_link.split('?msg=')[1];
-		FlowRouter.go(FlowRouter.current().context.pathname, null, { msg: repliedMessageId, hash: Random.id() });
+		const link = msg.attachments ? msg.attachments[0].message_link : this.message_link;
+		const repliedMessageId = link.split('?msg=')[1];
+		const pathname = `/${ link.split('?msg=')[0].split('/').slice(-2)[0] }/${ link.split('?msg=')[0].split('/').slice(-1)[0] }`;
+		FlowRouter.go(pathname, null, { msg: repliedMessageId, hash: Random.id() });
 	},
 	'click .mention-link'(e, instance) {
 		if (!Meteor.userId()) {

From 34130988abb1872614525644470da40e9737be21 Mon Sep 17 00:00:00 2001
From: Shailesh Baldaniya <shaileshbaldaniya351@gmail.com>
Date: Tue, 14 Apr 2020 04:53:13 +0000
Subject: [PATCH 206/223] Fix Favorite Icon In Room

---
 app/ui/client/components/header/headerRoom.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/ui/client/components/header/headerRoom.html b/app/ui/client/components/header/headerRoom.html
index a7cd325f30ef..ac9f0ebee980 100644
--- a/app/ui/client/components/header/headerRoom.html
+++ b/app/ui/client/components/header/headerRoom.html
@@ -17,7 +17,7 @@
 
 				{{#if isToggleFavoriteButtonVisible}}
 					<div class="rc-header__block rc-header__favorite rc-header__block--action">
-						<button aria-label="{{toggleFavoriteButtonIconLabel}}" type="button" class="rc-header__toggle-favorite rc-header__first-icon js-favorite">
+						<button aria-label="{{toggleFavoriteButtonIconLabel}}" type="button" class="rc-header__toggle-favorite {{#if isToggleFavoriteButtonChecked}}rc-header__toggle-favorite--checked{{/if}} rc-header__first-icon rc-tooltip rc-tooltip--down rc-tooltip--start js-favorite">
 							{{> icon block="rc-header__icon" icon=toggleFavoriteButtonIcon}}
 						</button>
 					</div>

From 20abfde394b07ee1ffee6692e437b08cb430a1ec Mon Sep 17 00:00:00 2001
From: Shailesh Baldaniya <shaileshbaldaniya351@gmail.com>
Date: Tue, 14 Apr 2020 14:27:58 +0000
Subject: [PATCH 207/223] Set ViewMode to Extended for Mobile

---
 app/ui-sidenav/client/sideNav.js       | 5 ++++-
 app/ui-sidenav/client/sidebarHeader.js | 2 +-
 app/ui-sidenav/client/sidebarItem.js   | 9 +++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/ui-sidenav/client/sideNav.js b/app/ui-sidenav/client/sideNav.js
index ea7330a98ccc..370725144ceb 100644
--- a/app/ui-sidenav/client/sideNav.js
+++ b/app/ui-sidenav/client/sideNav.js
@@ -6,7 +6,7 @@ import { Tracker } from 'meteor/tracker';
 
 import { SideNav, menu } from '../../ui-utils';
 import { settings } from '../../settings';
-import { roomTypes, getUserPreference } from '../../utils';
+import { roomTypes, getUserPreference, isMobile } from '../../utils';
 import { Users } from '../../models';
 
 Template.sideNav.helpers({
@@ -39,6 +39,9 @@ Template.sideNav.helpers({
 	},
 
 	sidebarViewMode() {
+		if (isMobile()) {
+			return 'extended';
+		}
 		const viewMode = getUserPreference(Meteor.userId(), 'sidebarViewMode');
 		return viewMode || 'extended';
 	},
diff --git a/app/ui-sidenav/client/sidebarHeader.js b/app/ui-sidenav/client/sidebarHeader.js
index f247d02f80e6..f424be3139cf 100644
--- a/app/ui-sidenav/client/sidebarHeader.js
+++ b/app/ui-sidenav/client/sidebarHeader.js
@@ -330,7 +330,7 @@ const toolbarButtons = (user) => [{
 			offsetVertical: e.currentTarget.clientHeight + 10,
 		};
 		if (isMobile()) {
-			config.columns[0].groups[0].items = config.columns[0].groups[0].items.concat([viewModeOption, sortOption]);
+			config.columns[0].groups[0].items = config.columns[0].groups[0].items.concat([sortOption]);
 		}
 		config.columns[0].groups[0].items = config.columns[0].groups[0].items.concat([shareOption]);
 
diff --git a/app/ui-sidenav/client/sidebarItem.js b/app/ui-sidenav/client/sidebarItem.js
index 0a9ec8434d66..bd3929825b0f 100644
--- a/app/ui-sidenav/client/sidebarItem.js
+++ b/app/ui-sidenav/client/sidebarItem.js
@@ -3,7 +3,7 @@ import { ReactiveVar } from 'meteor/reactive-var';
 import { Session } from 'meteor/session';
 import { Template } from 'meteor/templating';
 
-import { t, getUserPreference, roomTypes } from '../../utils';
+import { t, getUserPreference, roomTypes, isMobile } from '../../utils';
 import { popover, renderMessageBody, menu } from '../../ui-utils';
 import { Users, ChatSubscription } from '../../models';
 import { settings } from '../../settings';
@@ -18,6 +18,9 @@ Template.sidebarItem.helpers({
 		return this.rid || this._id;
 	},
 	isExtendedViewMode() {
+		if (isMobile()) {
+			return 'extended';
+		}
 		return getUserPreference(Meteor.userId(), 'sidebarViewMode') === 'extended';
 	},
 	lastMessage() {
@@ -169,7 +172,9 @@ Template.sidebarItem.onCreated(function() {
 		const currentData = Template.currentData();
 
 		if (!currentData.lastMessage || getUserPreference(Meteor.userId(), 'sidebarViewMode') !== 'extended') {
-			return clearInterval(this.timeAgoInterval);
+			if (!isMobile()) {
+				return clearInterval(this.timeAgoInterval);
+			}
 		}
 
 		if (currentData.lastMessage && !currentData.lastMessage._id) {

From 6eec0f409d2df341f0f3b76159f99e9f2f11b689 Mon Sep 17 00:00:00 2001
From: Shailesh Baldaniya <shaileshbaldaniya351@gmail.com>
Date: Tue, 14 Apr 2020 14:38:41 +0000
Subject: [PATCH 208/223] Fix Lint

---
 app/ui-sidenav/client/sidebarHeader.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/ui-sidenav/client/sidebarHeader.js b/app/ui-sidenav/client/sidebarHeader.js
index f424be3139cf..0267911a4831 100644
--- a/app/ui-sidenav/client/sidebarHeader.js
+++ b/app/ui-sidenav/client/sidebarHeader.js
@@ -276,12 +276,6 @@ const toolbarButtons = (user) => [{
 			type: 'sort-action',
 		};
 
-		const viewModeOption = {
-			name: t('View_mode'),
-			icon: () => viewModeIcon[getUserPreference(user, 'sidebarViewMode') || 'extended'],
-			type: 'view-mode-action',
-		};
-
 		const shareOption = {
 			name: t('Share'),
 			icon: 'share',

From 9b4fd0c202f2c40a5e740028c00d19b743cfd290 Mon Sep 17 00:00:00 2001
From: shubhsherl <shubham.singh094@yahoo.com>
Date: Tue, 14 Apr 2020 22:09:52 +0530
Subject: [PATCH 209/223] use URL function to extract pathname

---
 app/ui/client/views/app/room.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/ui/client/views/app/room.js b/app/ui/client/views/app/room.js
index c3db892b56a3..5273884a5043 100644
--- a/app/ui/client/views/app/room.js
+++ b/app/ui/client/views/app/room.js
@@ -883,7 +883,7 @@ Template.room.events({
 		const { msg } = messageArgs(this);
 		const link = msg.attachments ? msg.attachments[0].message_link : this.message_link;
 		const repliedMessageId = link.split('?msg=')[1];
-		const pathname = `/${ link.split('?msg=')[0].split('/').slice(-2)[0] }/${ link.split('?msg=')[0].split('/').slice(-1)[0] }`;
+		const { pathname } = new URL(link);
 		FlowRouter.go(pathname, null, { msg: repliedMessageId, hash: Random.id() });
 	},
 	'click .mention-link'(e, instance) {

From 5b4da23ee92222e7a650ad50e9a38833516f60ee Mon Sep 17 00:00:00 2001
From: Aditya <aditya.1998bhardwaj@gmail.com>
Date: Wed, 15 Apr 2020 00:49:31 +0530
Subject: [PATCH 210/223] Lint errors  fixed

---
 app/api/server/v1/users.js                    |  2 +-
 app/ui-admin/client/adminFlex.js              |  2 +-
 .../messageBox/messageBoxAudioMessage.js      |  5 ++-
 app/ui/client/lib/fileUpload.js               | 40 +++++++++++--------
 4 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/app/api/server/v1/users.js b/app/api/server/v1/users.js
index 31605f11b77a..4b861eb11407 100644
--- a/app/api/server/v1/users.js
+++ b/app/api/server/v1/users.js
@@ -7,7 +7,7 @@ import Busboy from 'busboy';
 import { Users, Subscriptions } from '../../../models/server';
 import { hasPermission } from '../../../authorization';
 import { settings } from '../../../settings';
-import { getURL, getUserPreference } from '../../../utils';
+import { getURL } from '../../../utils';
 import {
 	validateCustomFields,
 	saveUser,
diff --git a/app/ui-admin/client/adminFlex.js b/app/ui-admin/client/adminFlex.js
index e07f0d3c0744..02098cb94f46 100644
--- a/app/ui-admin/client/adminFlex.js
+++ b/app/ui-admin/client/adminFlex.js
@@ -5,7 +5,7 @@ import { Template } from 'meteor/templating';
 import { TAPi18n } from 'meteor/rocketchat:tap-i18n';
 
 import { settings } from '../../settings';
-import { menu, SideNav, AdminBox, Layout, offlineAction } from '../../ui-utils/client';
+import { menu, SideNav, Layout, offlineAction } from '../../ui-utils/client';
 import { t } from '../../utils';
 import { PrivateSettingsCachedCollection } from './SettingsCachedCollection';
 import { hasAtLeastOnePermission } from '../../authorization/client';
diff --git a/app/ui-message/client/messageBox/messageBoxAudioMessage.js b/app/ui-message/client/messageBox/messageBoxAudioMessage.js
index e7c88ebcb68b..ffac0cf0dac7 100644
--- a/app/ui-message/client/messageBox/messageBoxAudioMessage.js
+++ b/app/ui-message/client/messageBox/messageBoxAudioMessage.js
@@ -4,7 +4,8 @@ import { Random } from 'meteor/random';
 import { Tracker } from 'meteor/tracker';
 import { Template } from 'meteor/templating';
 
-import { uploadFileWithMessage } from '../../../ui/client/lib/fileUpload';
+import { fileUploadHandler } from '../../../file-upload';
+// import { uploadFileWithMessage } from '../../../ui/client/lib/fileUpload';
 import { settings } from '../../../settings';
 import { AudioRecorder, sendOfflineFileMessage } from '../../../ui';
 import { call } from '../../../ui-utils';
@@ -233,6 +234,6 @@ Template.messageBoxAudioMessage.events({
 
 		const { rid, tmid } = this;
 
-		await uploadFileWithMessage(rid, tmid, { file: { file: blob }, fileName: `${ t('Audio record') }.mp3` });
+		await uploadRecord({ rid, tmid, blob });
 	},
 });
diff --git a/app/ui/client/lib/fileUpload.js b/app/ui/client/lib/fileUpload.js
index 8038a5ae66ae..4f402516f6e0 100644
--- a/app/ui/client/lib/fileUpload.js
+++ b/app/ui/client/lib/fileUpload.js
@@ -285,6 +285,14 @@ export const fileUpload = async (files, input, { rid, tmid }) => {
 				return;
 			}
 
+			const record = {
+				name: document.getElementById('file-name').value || file.name || file.file.name,
+				size: file.file.size,
+				type: file.file.type,
+				rid,
+				description: document.getElementById('file-description').value,
+			};
+
 			const fileName = document.getElementById('file-name').value || file.name || file.file.name;
 
 			const data = new FormData();
@@ -337,29 +345,21 @@ export const fileUpload = async (files, input, { rid, tmid }) => {
 
 			const { xhr, promise } = APIClient.upload(`v1/rooms.upload/${ rid }`, {}, data, {
 				progress(progress) {
-					const uploads = Session.get('uploading') || [];
-
 					if (progress === 100) {
 						return;
 					}
-					uploads.filter((u) => u.id === upload.id).forEach((u) => {
-						u.percentage = Math.round(progress) || 0;
-					});
-					Session.set('uploading', uploads);
+
+					const uploads = upload;
+					uploads.percentage = Math.round(progress * 100) || 0;
+					ChatMessage.setProgress(msgData.id, uploads);
 				},
-				error(error) {
-					const uploads = Session.get('uploading') || [];
-					uploads.filter((u) => u.id === upload.id).forEach((u) => {
-						u.error = error.message;
-						u.percentage = 0;
-					});
-					Session.set('uploading', uploads);
+				error() {
+					ChatMessage.setProgress(msgData.id, upload);
 				},
 			});
 
 			Tracker.autorun((computation) => {
 				const isCanceling = Session.get(`uploading-cancel-${ upload.id }`);
-
 				if (!isCanceling) {
 					return;
 				}
@@ -367,11 +367,17 @@ export const fileUpload = async (files, input, { rid, tmid }) => {
 				Session.delete(`uploading-cancel-${ upload.id }`);
 
 				xhr.abort();
-
-				ChatMessage.setProgress(msgData.id, uploading);
 			});
 
-			uploadNextFile();
+			try {
+				await promise;
+				offlineFile && SWCache.removeFromCache(offlineFile);
+			} catch (error) {
+				const uploads = upload;
+				uploads.error = (error.xhr && error.xhr.responseJSON && error.xhr.responseJSON.error) || error.message;
+				uploads.percentage = 0;
+				ChatMessage.setProgress(msgData.id, uploads);
+			}
 		}));
 	};
 

From f6226950c5896fb2296a2a519a13451b4669f08a Mon Sep 17 00:00:00 2001
From: Aditya <aditya.1998bhardwaj@gmail.com>
Date: Wed, 15 Apr 2020 01:01:32 +0530
Subject: [PATCH 211/223] updated package-lock

---
 package-lock.json | 685 ++++++++++++++++------------------------------
 1 file changed, 237 insertions(+), 448 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1ea76713349a..8933242e2d15 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3040,15 +3040,6 @@
 			"resolved": "https://registry.npmjs.org/@rocket.chat/ui-kit/-/ui-kit-0.7.1.tgz",
 			"integrity": "sha512-CUpJt35zq56n4lBwWs17PRa+GGY+NKILv2ydjlL+dQNbtb9peEEzTVmglLRXUJhIwNKndSAr0eqoeTkRIsWL6A=="
 		},
-		"@samverschueren/stream-to-observable": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz",
-			"integrity": "sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==",
-			"dev": true,
-			"requires": {
-				"any-observable": "^0.3.0"
-			}
-		},
 		"@settlin/spacebars-loader": {
 			"version": "1.0.7",
 			"resolved": "https://registry.npmjs.org/@settlin/spacebars-loader/-/spacebars-loader-1.0.7.tgz",
@@ -7028,12 +7019,6 @@
 				"entities": "^1.1.2"
 			}
 		},
-		"any-observable": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/any-observable/-/any-observable-0.3.0.tgz",
-			"integrity": "sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==",
-			"dev": true
-		},
 		"app-root-dir": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/app-root-dir/-/app-root-dir-1.0.2.tgz",
@@ -10001,10 +9986,13 @@
 			}
 		},
 		"cachedir": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz",
-			"integrity": "sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==",
-			"dev": true
+			"version": "1.3.0",
+			"resolved": "https://registry.npmjs.org/cachedir/-/cachedir-1.3.0.tgz",
+			"integrity": "sha512-O1ji32oyON9laVPJL1IZ5bmwd2cB46VfpxkDequezH+15FDzzVddEyrGEeX4WusDSqKxdyFdDQDEG1yo1GoWkg==",
+			"dev": true,
+			"requires": {
+				"os-homedir": "^1.0.1"
+			}
 		},
 		"call-me-maybe": {
 			"version": "1.0.1",
@@ -10460,6 +10448,12 @@
 				"restore-cursor": "^3.1.0"
 			}
 		},
+		"cli-spinners": {
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-0.1.2.tgz",
+			"integrity": "sha1-u3ZNiOGF+54eaiofGXcjGPYF4xw=",
+			"dev": true
+		},
 		"cli-table3": {
 			"version": "0.5.1",
 			"resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.5.1.tgz",
@@ -12042,243 +12036,117 @@
 			"dev": true
 		},
 		"cypress": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/cypress/-/cypress-4.0.2.tgz",
-			"integrity": "sha512-WRzxOoSd+TxyXKa7Zi9orz3ii5VW7yhhVYstCU+EpOKfPan9x5Ww2Clucmy4H/W0GHUYAo7GYFZRD33ZCSNBQA==",
+			"version": "3.8.3",
+			"resolved": "https://registry.npmjs.org/cypress/-/cypress-3.8.3.tgz",
+			"integrity": "sha512-I9L/d+ilTPPA4vq3NC1OPKmw7jJIpMKNdyfR8t1EXYzYCjyqbc59migOm1YSse/VRbISLJ+QGb5k4Y3bz2lkYw==",
 			"dev": true,
 			"requires": {
 				"@cypress/listr-verbose-renderer": "0.4.1",
 				"@cypress/xvfb": "1.2.4",
 				"@types/sizzle": "2.3.2",
 				"arch": "2.1.1",
-				"bluebird": "3.7.2",
-				"cachedir": "2.3.0",
-				"chalk": "3.0.0",
+				"bluebird": "3.5.0",
+				"cachedir": "1.3.0",
+				"chalk": "2.4.2",
 				"check-more-types": "2.24.0",
-				"commander": "4.1.0",
+				"commander": "2.15.1",
 				"common-tags": "1.8.0",
-				"debug": "4.1.1",
+				"debug": "3.2.6",
 				"eventemitter2": "4.1.2",
-				"execa": "3.3.0",
+				"execa": "0.10.0",
 				"executable": "4.1.1",
 				"extract-zip": "1.6.7",
-				"fs-extra": "8.1.0",
-				"getos": "3.1.4",
-				"is-ci": "2.0.0",
+				"fs-extra": "5.0.0",
+				"getos": "3.1.1",
+				"is-ci": "1.2.1",
 				"is-installed-globally": "0.1.0",
 				"lazy-ass": "1.6.0",
-				"listr": "0.14.3",
+				"listr": "0.12.0",
 				"lodash": "4.17.15",
-				"log-symbols": "3.0.0",
+				"log-symbols": "2.2.0",
 				"minimist": "1.2.0",
 				"moment": "2.24.0",
-				"ramda": "0.26.1",
+				"ramda": "0.24.1",
 				"request": "2.88.0",
 				"request-progress": "3.0.0",
-				"supports-color": "7.1.0",
+				"supports-color": "5.5.0",
 				"tmp": "0.1.0",
-				"untildify": "4.0.0",
+				"untildify": "3.0.3",
 				"url": "0.11.0",
 				"yauzl": "2.10.0"
 			},
 			"dependencies": {
 				"ansi-styles": {
-					"version": "4.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-					"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+					"version": "3.2.1",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+					"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
 					"dev": true,
 					"requires": {
-						"@types/color-name": "^1.1.1",
-						"color-convert": "^2.0.1"
+						"color-convert": "^1.9.0"
 					}
 				},
-				"async": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/async/-/async-3.1.1.tgz",
-					"integrity": "sha512-X5Dj8hK1pJNC2Wzo2Rcp9FBVdJMGRR/S7V+lH46s8GVFhtbo5O4Le5GECCF/8PISVdkUA6mMPvgz7qTTD1rf1g==",
-					"dev": true
-				},
 				"bluebird": {
-					"version": "3.7.2",
-					"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
-					"integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+					"version": "3.5.0",
+					"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz",
+					"integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw=",
 					"dev": true
 				},
 				"chalk": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-					"integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+					"version": "2.4.2",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
 					"dev": true,
 					"requires": {
-						"ansi-styles": "^4.1.0",
-						"supports-color": "^7.1.0"
+						"ansi-styles": "^3.2.1",
+						"escape-string-regexp": "^1.0.5",
+						"supports-color": "^5.3.0"
 					}
 				},
-				"ci-info": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-					"integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-					"dev": true
-				},
 				"color-convert": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-					"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+					"version": "1.9.3",
+					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+					"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
 					"dev": true,
 					"requires": {
-						"color-name": "~1.1.4"
+						"color-name": "1.1.3"
 					}
 				},
-				"commander": {
-					"version": "4.1.0",
-					"resolved": "https://registry.npmjs.org/commander/-/commander-4.1.0.tgz",
-					"integrity": "sha512-NIQrwvv9V39FHgGFm36+U9SMQzbiHvU79k+iADraJTpmrFFfx7Ds0IvDoAdZsDrknlkRk14OYoWXb57uTh7/sw==",
+				"color-name": {
+					"version": "1.1.3",
+					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+					"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
 					"dev": true
 				},
-				"cross-spawn": {
-					"version": "7.0.1",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz",
-					"integrity": "sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.1.0",
-						"shebang-command": "^2.0.0",
-						"which": "^2.0.1"
-					}
+				"commander": {
+					"version": "2.15.1",
+					"resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
+					"integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
+					"dev": true
 				},
 				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"version": "3.2.6",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+					"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
 					"dev": true,
 					"requires": {
 						"ms": "^2.1.1"
 					}
 				},
-				"execa": {
-					"version": "3.3.0",
-					"resolved": "https://registry.npmjs.org/execa/-/execa-3.3.0.tgz",
-					"integrity": "sha512-j5Vit5WZR/cbHlqU97+qcnw9WHRCIL4V1SVe75VcHcD1JRBdt8fv0zw89b7CQHQdUHTt2VjuhcF5ibAgVOxqpg==",
-					"dev": true,
-					"requires": {
-						"cross-spawn": "^7.0.0",
-						"get-stream": "^5.0.0",
-						"human-signals": "^1.1.1",
-						"is-stream": "^2.0.0",
-						"merge-stream": "^2.0.0",
-						"npm-run-path": "^4.0.0",
-						"onetime": "^5.1.0",
-						"p-finally": "^2.0.0",
-						"signal-exit": "^3.0.2",
-						"strip-final-newline": "^2.0.0"
-					}
-				},
-				"get-stream": {
-					"version": "5.1.0",
-					"resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
-					"integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
-					"dev": true,
-					"requires": {
-						"pump": "^3.0.0"
-					}
-				},
 				"getos": {
-					"version": "3.1.4",
-					"resolved": "https://registry.npmjs.org/getos/-/getos-3.1.4.tgz",
-					"integrity": "sha512-UORPzguEB/7UG5hqiZai8f0vQ7hzynMQyJLxStoQ8dPGAcmgsfXOPA4iE/fGtweHYkK+z4zc9V0g+CIFRf5HYw==",
-					"dev": true,
-					"requires": {
-						"async": "^3.1.0"
-					}
-				},
-				"has-flag": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-					"dev": true
-				},
-				"is-ci": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-					"integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+					"version": "3.1.1",
+					"resolved": "https://registry.npmjs.org/getos/-/getos-3.1.1.tgz",
+					"integrity": "sha512-oUP1rnEhAr97rkitiszGP9EgDVYnmchgFzfqRzSkgtfv7ai6tEi7Ko8GgjNXts7VLWEqrTWyhsOKLe5C5b/Zkg==",
 					"dev": true,
 					"requires": {
-						"ci-info": "^2.0.0"
+						"async": "2.6.1"
 					}
 				},
-				"is-stream": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
-					"integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==",
-					"dev": true
-				},
 				"lodash": {
 					"version": "4.17.15",
 					"resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
 					"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
 					"dev": true
 				},
-				"log-symbols": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz",
-					"integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==",
-					"dev": true,
-					"requires": {
-						"chalk": "^2.4.2"
-					},
-					"dependencies": {
-						"ansi-styles": {
-							"version": "3.2.1",
-							"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-							"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-							"dev": true,
-							"requires": {
-								"color-convert": "^1.9.0"
-							}
-						},
-						"chalk": {
-							"version": "2.4.2",
-							"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-							"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-							"dev": true,
-							"requires": {
-								"ansi-styles": "^3.2.1",
-								"escape-string-regexp": "^1.0.5",
-								"supports-color": "^5.3.0"
-							}
-						},
-						"color-convert": {
-							"version": "1.9.3",
-							"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-							"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-							"dev": true,
-							"requires": {
-								"color-name": "1.1.3"
-							}
-						},
-						"color-name": {
-							"version": "1.1.3",
-							"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-							"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-							"dev": true
-						},
-						"has-flag": {
-							"version": "3.0.0",
-							"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-							"integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-							"dev": true
-						},
-						"supports-color": {
-							"version": "5.5.0",
-							"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-							"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-							"dev": true,
-							"requires": {
-								"has-flag": "^3.0.0"
-							}
-						}
-					}
-				},
 				"minimist": {
 					"version": "1.2.0",
 					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
@@ -12297,37 +12165,6 @@
 					"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
 					"dev": true
 				},
-				"npm-run-path": {
-					"version": "4.0.1",
-					"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-					"integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-					"dev": true,
-					"requires": {
-						"path-key": "^3.0.0"
-					}
-				},
-				"p-finally": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz",
-					"integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==",
-					"dev": true
-				},
-				"path-key": {
-					"version": "3.1.1",
-					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
-					"dev": true
-				},
-				"pump": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-					"integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-					"dev": true,
-					"requires": {
-						"end-of-stream": "^1.1.0",
-						"once": "^1.3.1"
-					}
-				},
 				"punycode": {
 					"version": "1.3.2",
 					"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
@@ -12335,33 +12172,18 @@
 					"dev": true
 				},
 				"ramda": {
-					"version": "0.26.1",
-					"resolved": "https://registry.npmjs.org/ramda/-/ramda-0.26.1.tgz",
-					"integrity": "sha512-hLWjpy7EnsDBb0p+Z3B7rPi3GDeRG5ZtiI33kJhTt+ORCd38AbAIjB/9zRIUoeTbE/AVX5ZkU7m6bznsvrf8eQ==",
-					"dev": true
-				},
-				"shebang-command": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
-					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
-					"dev": true,
-					"requires": {
-						"shebang-regex": "^3.0.0"
-					}
-				},
-				"shebang-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
-					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+					"version": "0.24.1",
+					"resolved": "https://registry.npmjs.org/ramda/-/ramda-0.24.1.tgz",
+					"integrity": "sha1-w7d1UZfzW43DUCIoJixMkd22uFc=",
 					"dev": true
 				},
 				"supports-color": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-					"integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+					"version": "5.5.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
 					"dev": true,
 					"requires": {
-						"has-flag": "^4.0.0"
+						"has-flag": "^3.0.0"
 					}
 				},
 				"url": {
@@ -12373,15 +12195,23 @@
 						"punycode": "1.3.2",
 						"querystring": "0.2.0"
 					}
-				},
-				"which": {
-					"version": "2.0.2",
-					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-					"dev": true,
-					"requires": {
-						"isexe": "^2.0.0"
-					}
+				}
+			}
+		},
+		"cypress-file-upload": {
+			"version": "4.0.6",
+			"resolved": "https://registry.npmjs.org/cypress-file-upload/-/cypress-file-upload-4.0.6.tgz",
+			"integrity": "sha512-CltcHrspJtGjuwpF/Kgs2gVmJMWlSvZFFW9i6w1kpQIcm7q76/XDuoOBqTKJztrSHOgRT9Vq9g0jpoUBoty+HQ==",
+			"dev": true,
+			"requires": {
+				"mime": "^2.4.4"
+			},
+			"dependencies": {
+				"mime": {
+					"version": "2.4.4",
+					"resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
+					"integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
+					"dev": true
 				}
 			}
 		},
@@ -15309,22 +15139,16 @@
 			"integrity": "sha512-2QY5eeqVv4m2PfyMiEuy9adxNP+ajf+8AR05cEi+OAzPcOj90hvFImeZhTmKLBgSd9EvG33jsD7ZRxsx9dThkQ=="
 		},
 		"fs-extra": {
-			"version": "8.1.0",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-			"integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz",
+			"integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==",
 			"dev": true,
 			"requires": {
-				"graceful-fs": "^4.2.0",
+				"graceful-fs": "^4.1.2",
 				"jsonfile": "^4.0.0",
 				"universalify": "^0.1.0"
 			},
 			"dependencies": {
-				"graceful-fs": {
-					"version": "4.2.3",
-					"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
-					"integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
-					"dev": true
-				},
 				"jsonfile": {
 					"version": "4.0.0",
 					"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
@@ -17654,12 +17478,6 @@
 				}
 			}
 		},
-		"human-signals": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
-			"integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
-			"dev": true
-		},
 		"husky": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/husky/-/husky-1.2.0.tgz",
@@ -18698,15 +18516,6 @@
 			"integrity": "sha1-iVJojF7C/9awPsyF52ngKQMINHA=",
 			"dev": true
 		},
-		"is-observable": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/is-observable/-/is-observable-1.1.0.tgz",
-			"integrity": "sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA==",
-			"dev": true,
-			"requires": {
-				"symbol-observable": "^1.1.0"
-			}
-		},
 		"is-path-inside": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
@@ -19771,20 +19580,62 @@
 			}
 		},
 		"listr": {
-			"version": "0.14.3",
-			"resolved": "https://registry.npmjs.org/listr/-/listr-0.14.3.tgz",
-			"integrity": "sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==",
+			"version": "0.12.0",
+			"resolved": "https://registry.npmjs.org/listr/-/listr-0.12.0.tgz",
+			"integrity": "sha1-a84sD1YD+klYDqF81qAMwOX6RRo=",
 			"dev": true,
 			"requires": {
-				"@samverschueren/stream-to-observable": "^0.3.0",
-				"is-observable": "^1.1.0",
+				"chalk": "^1.1.3",
+				"cli-truncate": "^0.2.1",
+				"figures": "^1.7.0",
+				"indent-string": "^2.1.0",
 				"is-promise": "^2.1.0",
 				"is-stream": "^1.1.0",
 				"listr-silent-renderer": "^1.1.1",
-				"listr-update-renderer": "^0.5.0",
-				"listr-verbose-renderer": "^0.5.0",
-				"p-map": "^2.0.0",
-				"rxjs": "^6.3.3"
+				"listr-update-renderer": "^0.2.0",
+				"listr-verbose-renderer": "^0.4.0",
+				"log-symbols": "^1.0.2",
+				"log-update": "^1.0.2",
+				"ora": "^0.2.3",
+				"p-map": "^1.1.1",
+				"rxjs": "^5.0.0-beta.11",
+				"stream-to-observable": "^0.1.0",
+				"strip-ansi": "^3.0.1"
+			},
+			"dependencies": {
+				"indent-string": {
+					"version": "2.1.0",
+					"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
+					"integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
+					"dev": true,
+					"requires": {
+						"repeating": "^2.0.0"
+					}
+				},
+				"log-symbols": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
+					"integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
+					"dev": true,
+					"requires": {
+						"chalk": "^1.0.0"
+					}
+				},
+				"rxjs": {
+					"version": "5.5.12",
+					"resolved": "https://registry.npmjs.org/rxjs/-/rxjs-5.5.12.tgz",
+					"integrity": "sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==",
+					"dev": true,
+					"requires": {
+						"symbol-observable": "1.0.1"
+					}
+				},
+				"symbol-observable": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.1.tgz",
+					"integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=",
+					"dev": true
+				}
 			}
 		},
 		"listr-silent-renderer": {
@@ -19794,9 +19645,9 @@
 			"dev": true
 		},
 		"listr-update-renderer": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz",
-			"integrity": "sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA==",
+			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/listr-update-renderer/-/listr-update-renderer-0.2.0.tgz",
+			"integrity": "sha1-yoDhd5tOcCZoB+ju0a1qvjmFUPk=",
 			"dev": true,
 			"requires": {
 				"chalk": "^1.1.3",
@@ -19805,7 +19656,7 @@
 				"figures": "^1.7.0",
 				"indent-string": "^3.0.0",
 				"log-symbols": "^1.0.2",
-				"log-update": "^2.3.0",
+				"log-update": "^1.0.2",
 				"strip-ansi": "^3.0.1"
 			},
 			"dependencies": {
@@ -19821,102 +19672,46 @@
 			}
 		},
 		"listr-verbose-renderer": {
-			"version": "0.5.0",
-			"resolved": "https://registry.npmjs.org/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz",
-			"integrity": "sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==",
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz",
+			"integrity": "sha1-ggb0z21S3cWCfl/RSYng6WWTOjU=",
 			"dev": true,
 			"requires": {
-				"chalk": "^2.4.1",
-				"cli-cursor": "^2.1.0",
+				"chalk": "^1.1.3",
+				"cli-cursor": "^1.0.2",
 				"date-fns": "^1.27.2",
-				"figures": "^2.0.0"
+				"figures": "^1.7.0"
 			},
 			"dependencies": {
-				"ansi-styles": {
-					"version": "3.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-					"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^1.9.0"
-					}
-				},
-				"chalk": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-					"dev": true,
-					"requires": {
-						"ansi-styles": "^3.2.1",
-						"escape-string-regexp": "^1.0.5",
-						"supports-color": "^5.3.0"
-					}
-				},
 				"cli-cursor": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-					"integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
-					"dev": true,
-					"requires": {
-						"restore-cursor": "^2.0.0"
-					}
-				},
-				"color-convert": {
-					"version": "1.9.3",
-					"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-					"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
+					"integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
 					"dev": true,
 					"requires": {
-						"color-name": "1.1.3"
+						"restore-cursor": "^1.0.1"
 					}
 				},
-				"color-name": {
-					"version": "1.1.3",
-					"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-					"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
-					"dev": true
-				},
 				"date-fns": {
 					"version": "1.30.1",
 					"resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz",
 					"integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==",
 					"dev": true
 				},
-				"figures": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-					"integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
-					"dev": true,
-					"requires": {
-						"escape-string-regexp": "^1.0.5"
-					}
-				},
 				"onetime": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-					"integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-					"dev": true,
-					"requires": {
-						"mimic-fn": "^1.0.0"
-					}
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+					"integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
+					"dev": true
 				},
 				"restore-cursor": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-					"integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
-					"dev": true,
-					"requires": {
-						"onetime": "^2.0.0",
-						"signal-exit": "^3.0.2"
-					}
-				},
-				"supports-color": {
-					"version": "5.5.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-					"integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
+					"integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
 					"dev": true,
 					"requires": {
-						"has-flag": "^3.0.0"
+						"exit-hook": "^1.0.0",
+						"onetime": "^1.0.0"
 					}
 				}
 			}
@@ -20234,89 +20029,44 @@
 			}
 		},
 		"log-update": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/log-update/-/log-update-2.3.0.tgz",
-			"integrity": "sha1-iDKP19HOeTiykoN0bwsbwSayRwg=",
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz",
+			"integrity": "sha1-GZKfZMQJPS0ucHWh2tivWcKWuNE=",
 			"dev": true,
 			"requires": {
-				"ansi-escapes": "^3.0.0",
-				"cli-cursor": "^2.0.0",
-				"wrap-ansi": "^3.0.1"
+				"ansi-escapes": "^1.0.0",
+				"cli-cursor": "^1.0.2"
 			},
 			"dependencies": {
 				"ansi-escapes": {
-					"version": "3.2.0",
-					"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-					"integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
-					"dev": true
-				},
-				"ansi-regex": {
-					"version": "3.0.0",
-					"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-					"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+					"version": "1.4.0",
+					"resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz",
+					"integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=",
 					"dev": true
 				},
 				"cli-cursor": {
-					"version": "2.1.0",
-					"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-					"integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
+					"integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
 					"dev": true,
 					"requires": {
-						"restore-cursor": "^2.0.0"
+						"restore-cursor": "^1.0.1"
 					}
 				},
-				"is-fullwidth-code-point": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-					"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-					"dev": true
-				},
 				"onetime": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-					"integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-					"dev": true,
-					"requires": {
-						"mimic-fn": "^1.0.0"
-					}
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+					"integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
+					"dev": true
 				},
 				"restore-cursor": {
-					"version": "2.0.0",
-					"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-					"integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
-					"dev": true,
-					"requires": {
-						"onetime": "^2.0.0",
-						"signal-exit": "^3.0.2"
-					}
-				},
-				"string-width": {
-					"version": "2.1.1",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-					"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-					"dev": true,
-					"requires": {
-						"is-fullwidth-code-point": "^2.0.0",
-						"strip-ansi": "^4.0.0"
-					}
-				},
-				"strip-ansi": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-					"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-					"dev": true,
-					"requires": {
-						"ansi-regex": "^3.0.0"
-					}
-				},
-				"wrap-ansi": {
-					"version": "3.0.1",
-					"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-3.0.1.tgz",
-					"integrity": "sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo=",
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
+					"integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
 					"dev": true,
 					"requires": {
-						"string-width": "^2.1.1",
-						"strip-ansi": "^4.0.0"
+						"exit-hook": "^1.0.0",
+						"onetime": "^1.0.0"
 					}
 				}
 			}
@@ -23134,6 +22884,45 @@
 				}
 			}
 		},
+		"ora": {
+			"version": "0.2.3",
+			"resolved": "https://registry.npmjs.org/ora/-/ora-0.2.3.tgz",
+			"integrity": "sha1-N1J9Igrc1Tw5tzVx11QVbV22V6Q=",
+			"dev": true,
+			"requires": {
+				"chalk": "^1.1.1",
+				"cli-cursor": "^1.0.2",
+				"cli-spinners": "^0.1.2",
+				"object-assign": "^4.0.1"
+			},
+			"dependencies": {
+				"cli-cursor": {
+					"version": "1.0.2",
+					"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
+					"integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
+					"dev": true,
+					"requires": {
+						"restore-cursor": "^1.0.1"
+					}
+				},
+				"onetime": {
+					"version": "1.1.0",
+					"resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",
+					"integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=",
+					"dev": true
+				},
+				"restore-cursor": {
+					"version": "1.0.1",
+					"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
+					"integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
+					"dev": true,
+					"requires": {
+						"exit-hook": "^1.0.0",
+						"onetime": "^1.0.0"
+					}
+				}
+			}
+		},
 		"original": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
@@ -23233,9 +23022,9 @@
 			}
 		},
 		"p-map": {
-			"version": "2.1.0",
-			"resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-			"integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
+			"integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
 			"dev": true
 		},
 		"p-queue": {
@@ -27897,6 +27686,12 @@
 				"stream-to": "~0.2.0"
 			}
 		},
+		"stream-to-observable": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/stream-to-observable/-/stream-to-observable-0.1.0.tgz",
+			"integrity": "sha1-Rb8dny19wJvtgfHDB8Qw5ouEz/4=",
+			"dev": true
+		},
 		"streamsearch": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz",
@@ -28238,12 +28033,6 @@
 			"integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
 			"dev": true
 		},
-		"strip-final-newline": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
-			"integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
-			"dev": true
-		},
 		"strip-indent": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
@@ -29969,9 +29758,9 @@
 			}
 		},
 		"untildify": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
-			"integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/untildify/-/untildify-3.0.3.tgz",
+			"integrity": "sha512-iSk/J8efr8uPT/Z4eSUywnqyrQU7DSdMfdqK4iWEaUVVmcP5JcnpRqmVMwcwcnmI1ATFNgC5V90u09tBynNFKA==",
 			"dev": true
 		},
 		"upath": {

From 7f20d7745a47fac3de2652e59e0e898b826d1003 Mon Sep 17 00:00:00 2001
From: Aditya <aditya.1998bhardwaj@gmail.com>
Date: Wed, 15 Apr 2020 01:32:51 +0530
Subject: [PATCH 212/223] merge error fixed

---
 app/ui/client/components/header/headerRoom.html | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/ui/client/components/header/headerRoom.html b/app/ui/client/components/header/headerRoom.html
index 27dc15e81422..df844708b1d1 100644
--- a/app/ui/client/components/header/headerRoom.html
+++ b/app/ui/client/components/header/headerRoom.html
@@ -18,17 +18,18 @@
 
 			<div class="rc-header__content rc-header__block">
 				{{#if isDirect}}
-				<div class="rc-header__block">
-					<div class="rc-header__image">
-						{{> avatar url=avatarBackground}}
+					<div class="rc-header__block">
+						<div class="rc-header__image">
+							{{> avatar url=avatarBackground}}
+						</div>
 					</div>
+				{{/if}}
 				{{#if isToggleFavoriteButtonVisible}}
 					<div class="rc-header__block rc-header__favorite rc-header__block--action">
 						<button aria-label="{{toggleFavoriteButtonIconLabel}}" type="button" class="rc-header__toggle-favorite {{#if isToggleFavoriteButtonChecked}}rc-header__toggle-favorite--checked{{/if}} rc-header__first-icon rc-tooltip rc-tooltip--down rc-tooltip--start js-favorite">
 							{{> icon block="rc-header__icon" icon=toggleFavoriteButtonIcon}}
 						</button>
 					</div>
-				</div>
 				{{/if}}
 
 				<!-- TODO: fix it style and helper -->

From 9fb96af52677659a7b517e9ae2d3eda42c121be4 Mon Sep 17 00:00:00 2001
From: Aditya <aditya.1998bhardwaj@gmail.com>
Date: Wed, 15 Apr 2020 01:38:56 +0530
Subject: [PATCH 213/223] fixed room header

---
 app/ui/client/components/header/headerRoom.html | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/app/ui/client/components/header/headerRoom.html b/app/ui/client/components/header/headerRoom.html
index df844708b1d1..e2741b77ae4a 100644
--- a/app/ui/client/components/header/headerRoom.html
+++ b/app/ui/client/components/header/headerRoom.html
@@ -17,13 +17,6 @@
 			</div>
 
 			<div class="rc-header__content rc-header__block">
-				{{#if isDirect}}
-					<div class="rc-header__block">
-						<div class="rc-header__image">
-							{{> avatar url=avatarBackground}}
-						</div>
-					</div>
-				{{/if}}
 				{{#if isToggleFavoriteButtonVisible}}
 					<div class="rc-header__block rc-header__favorite rc-header__block--action">
 						<button aria-label="{{toggleFavoriteButtonIconLabel}}" type="button" class="rc-header__toggle-favorite {{#if isToggleFavoriteButtonChecked}}rc-header__toggle-favorite--checked{{/if}} rc-header__first-icon rc-tooltip rc-tooltip--down rc-tooltip--start js-favorite">

From 9b1c164d1515192a093ac0c2b311252c39418ccc Mon Sep 17 00:00:00 2001
From: Aditya <aditya.1998bhardwaj@gmail.com>
Date: Tue, 21 Apr 2020 16:59:23 +0530
Subject: [PATCH 214/223] merge errors fixed

---
 app/apps/client/gameCenter/tabBar.js          |   2 -
 .../client/imports/components/header.css      |   2 +-
 app/ui-sidenav/client/sidebarItem.js          |  23 +-
 .../client/components/header/headerRoom.html  |  12 +-
 app/ui/client/views/app/room.html             | 222 ++++++++----------
 5 files changed, 113 insertions(+), 148 deletions(-)

diff --git a/app/apps/client/gameCenter/tabBar.js b/app/apps/client/gameCenter/tabBar.js
index cc52cde03332..3ee4f1074a56 100644
--- a/app/apps/client/gameCenter/tabBar.js
+++ b/app/apps/client/gameCenter/tabBar.js
@@ -12,9 +12,7 @@ Meteor.startup(function() {
 		if (!settings.get('Apps_Game_Center_enabled')) {
 			return TabBar.removeButton('gameCenter');
 		}
-		console.log('first');
 		const { externalComponents } = await APIClient.get('apps/externalComponents');
-		console.log(externalComponents);
 		if (!externalComponents.length) {
 			return TabBar.removeButton('gameCenter');
 		}
diff --git a/app/theme/client/imports/components/header.css b/app/theme/client/imports/components/header.css
index 82163ccd761b..01e7ec4eba52 100644
--- a/app/theme/client/imports/components/header.css
+++ b/app/theme/client/imports/components/header.css
@@ -471,7 +471,7 @@
 		}
 
 		&__status {
-			margin: 0 0.5rem;
+			margin: 0.2rem 0.5rem;
 		}
 
 		&--burger {
diff --git a/app/ui-sidenav/client/sidebarItem.js b/app/ui-sidenav/client/sidebarItem.js
index 835de504e3c5..d9a2006f8cd3 100644
--- a/app/ui-sidenav/client/sidebarItem.js
+++ b/app/ui-sidenav/client/sidebarItem.js
@@ -183,21 +183,24 @@ Template.sidebarItem.onCreated(function() {
 			return;
 		}
 
-		setLastMessageTs(this, currentData.lastMessage.ts);
+		if (currentData.lastMessage && currentData.lastMessage.ts) {
+			setLastMessageTs(this, currentData.lastMessage.ts);
+		}
 
-		if (currentData.lastMessage.t === 'e2e' && currentData.lastMessage.e2e !== 'done') {
+		if (currentData.lastMessage && currentData.lastMessage.t === 'e2e' && currentData.lastMessage.e2e !== 'done') {
 			this.renderedMessage = '******';
 			return;
 		}
 
-		const otherUser = settings.get('UI_Use_Real_Name') ? currentData.lastMessage.u.name || currentData.lastMessage.u.username : currentData.lastMessage.u.username;
-		const renderedMessage = renderMessageBody(currentData.lastMessage).replace(/<br\s?\\?>/g, ' ');
-		const sender = this.user && this.user._id === currentData.lastMessage.u._id ? t('You') : otherUser;
-
-		if (!currentData.isGroupChat && Meteor.userId() !== currentData.lastMessage.u._id) {
-			this.renderedMessage = currentData.lastMessage.msg === '' ? t('Sent_an_attachment') : renderedMessage;
-		} else {
-			this.renderedMessage = currentData.lastMessage.msg === '' ? t('user_sent_an_attachment', { user: sender }) : `${ sender }: ${ renderedMessage }`;
+		if (currentData.lastMessage) {
+			const otherUser = settings.get('UI_Use_Real_Name') ? currentData.lastMessage.u.name || currentData.lastMessage.u.username : currentData.lastMessage.u.username;
+			const renderedMessage = renderMessageBody(currentData.lastMessage).replace(/<br\s?\\?>/g, ' ');
+			const sender = this.user && this.user._id === currentData.lastMessage.u._id ? t('You') : otherUser;
+			if (!currentData.isGroupChat && Meteor.userId() !== currentData.lastMessage.u._id) {
+				this.renderedMessage = currentData.lastMessage.msg === '' ? t('Sent_an_attachment') : renderedMessage;
+			} else {
+				this.renderedMessage = currentData.lastMessage.msg === '' ? t('user_sent_an_attachment', { user: sender }) : `${ sender }: ${ renderedMessage }`;
+			}
 		}
 	});
 });
diff --git a/app/ui/client/components/header/headerRoom.html b/app/ui/client/components/header/headerRoom.html
index e2741b77ae4a..a7cd325f30ef 100644
--- a/app/ui/client/components/header/headerRoom.html
+++ b/app/ui/client/components/header/headerRoom.html
@@ -14,12 +14,10 @@
 						<span class="rc-header__first-icon">{{> icon block="rc-header__icon rc-header__icon" icon="back"}}</span>
 					</div>
 				{{/if}}
-			</div>
 
-			<div class="rc-header__content rc-header__block">
 				{{#if isToggleFavoriteButtonVisible}}
 					<div class="rc-header__block rc-header__favorite rc-header__block--action">
-						<button aria-label="{{toggleFavoriteButtonIconLabel}}" type="button" class="rc-header__toggle-favorite {{#if isToggleFavoriteButtonChecked}}rc-header__toggle-favorite--checked{{/if}} rc-header__first-icon rc-tooltip rc-tooltip--down rc-tooltip--start js-favorite">
+						<button aria-label="{{toggleFavoriteButtonIconLabel}}" type="button" class="rc-header__toggle-favorite rc-header__first-icon js-favorite">
 							{{> icon block="rc-header__icon" icon=toggleFavoriteButtonIcon}}
 						</button>
 					</div>
@@ -62,14 +60,6 @@
 					{{#if isTranslated}}
 					<i class="icon-language" aria-label="{{_ "Translated"}}"></i>
 					{{/if}}
-					{{#if hasPresence}}
-					{{# userPresence uid=uid}}<span class="rc-header__status">
-						<div class="rc-header__status-bullet rc-header__status-bullet--{{userStatus}}" title="{{_ userStatus}}"></div>
-						<div class="rc-header__visual-status">{{userStatusText}}</div>
-					</span>{{/userPresence}}
-					{{else}}
-					{{#if roomTopic}}<span class="rc-header__topic">{{{roomTopic}}}</span>{{/if}}
-					{{/if}}
 				</div>
 
 				{{#if isSection}}
diff --git a/app/ui/client/views/app/room.html b/app/ui/client/views/app/room.html
index 1d3d5c87419c..2ec39c4854ea 100644
--- a/app/ui/client/views/app/room.html
+++ b/app/ui/client/views/app/room.html
@@ -11,129 +11,91 @@
 				{{/headerRoom}}
 			{{/if}}
 			<div class="messages-container-wrapper">
-				{{#if openSearchPage}}
-					{{> RocketSearch}}
-				{{else}}
-					<div class="messages-container-main dropzone {{dragAndDrop}}">
-						<div class="dropzone-overlay {{isDropzoneDisabled}} background-transparent-darkest color-content-background-color">{{_ dragAndDropLabel}}</div>
-						{{#unless embeddedVersion}}
-							{{#if announcement}}
-							<div class="fixed-title announcement {{getAnnouncementStyle}}" aria-label="{{RocketChatMarkdownInline announcement}}">
-								<p>{{{RocketChatMarkdownInline announcement}}}</p>
-							</div>
-							{{/if}}
-						{{/unless}}
-						<div class="container-bars {{containerBarsShow unreadData uploading}}">
-							{{#with unreadData}}
-								{{#if since}}
-									{{#if count}}
-										<div class="unread-bar color-primary-action-color background-component-color">
-											<button class="jump-to">
-												<span class="jump-to-large">{{_ "Jump_to_first_unread"}}</span>
-												<span class="jump-to-small">{{_ "Jump"}}</span>
-											</button>
-											<span class="unread-count-since">
-												{{_ "S_new_messages_since_s" count formatUnreadSince}}
-											</span>
-											<span class="unread-count">
-												{{_ "N_new_messages" count}}
-											</span>
-											<button class="mark-read">
-												{{_ "Mark_as_read"}}
-											</button>
-										</div>
-									{{/if}}
-								{{/if}}
-							{{/with}}
-							{{#each uploading}}
-								<div class="upload-progress color-primary-action-color background-component-color {{#if error}}error-background error-border{{/if}}">
-									{{#if error}}
-										<div class="upload-progress-text">
-											{{error}}
-										</div>
-										<button class="upload-progress-close">
-											{{_ "close"}}
+				<div class="messages-container-main dropzone {{dragAndDrop}}">
+					<div class="dropzone-overlay {{isDropzoneDisabled}} background-transparent-darkest color-content-background-color">{{_ dragAndDropLabel}}</div>
+					{{#unless embeddedVersion}}
+						{{#if announcement}}
+						<div class="fixed-title announcement {{getAnnouncementStyle}}" aria-label="{{RocketChatMarkdownInline announcement}}">
+							<p>{{{RocketChatMarkdownInline announcement}}}</p>
+						</div>
+						{{/if}}
+					{{/unless}}
+					<div class="container-bars {{containerBarsShow unreadData uploading}}">
+						{{#with unreadData}}
+							{{#if since}}
+								{{#if count}}
+									<div class="unread-bar color-primary-action-color background-component-color">
+										<button class="jump-to">
+											<span class="jump-to-large">{{_ "Jump_to_first_unread"}}</span>
+											<span class="jump-to-small">{{_ "Jump"}}</span>
 										</button>
-									{{else}}
-										<div class="upload-progress-progress" style="width: {{percentage}}%;"></div>
-										<div class="upload-progress-text">
-											[{{percentage}}%] {{name}}
-										</div>
-										<button class="upload-progress-close">
-											{{_ "Cancel"}}
+										<span class="unread-count-since">
+											{{_ "S_new_messages_since_s" count formatUnreadSince}}
+										</span>
+										<span class="unread-count">
+											{{_ "N_new_messages" count}}
+										</span>
+										<button class="mark-read">
+											{{_ "Mark_as_read"}}
 										</button>
-									{{/if}}
-								</div>
-							{{/each}}
-						</div>
-						<div class="messages-box {{#if selectable}}selectable{{/if}} {{messageViewMode}} {{hasLeader}}">
-							<div class="ticks-bar"></div>
-							<button class="new-message background-primary-action-color color-content-background-color not">
-								<i class="icon-down-big"></i>
-								{{_ "New_messages"}}
-							</button>
-							<div class="jump-recent background-component-color {{#unless hasMoreNext}}not{{/unless}}">
-								<button>{{_ "Jump_to_recent_messages"}} <i class="icon-level-down"></i></button>
-							</div>
-							{{#unless canPreview}}
-								<div class="content room-not-found error-color">
-									<div>
-										{{_ "You_must_join_to_view_messages_in_this_channel"}}
 									</div>
-								</div>
-							{{/unless}}
-							{{#with roomLeader}}
-								<div class="room-leader message color-primary-font-color content-background-color border-component-color {{hideLeaderHeader}}">
-									<button class="thumb user-card-message">
-										{{> avatar username=username }}
+								{{/if}}
+							{{/if}}
+						{{/with}}
+						{{#each uploading}}
+							<div class="upload-progress color-primary-action-color background-component-color {{#if error}}error-background error-border{{/if}}">
+								{{#if error}}
+									<div class="upload-progress-text">
+										{{error}}
+									</div>
+									<button class="upload-progress-close">
+										{{_ "close"}}
 									</button>
-									<div class="leader-name">{{name}}</div>
-									<div class="leader-status userStatus">
-										<span class="color-ball status-bg-{{status}}"></span>
-										<span class="status-text leader-status-text">{{statusDisplay}}</span>
+								{{else}}
+									<div class="upload-progress-progress" style="width: {{percentage}}%;"></div>
+									<div class="upload-progress-text">
+										[{{percentage}}%] {{name}}
 									</div>
-									<a class="chat-now" href="{{chatNowLink}}">{{_ "Chat_Now"}}</a>
+									<button class="upload-progress-close">
+										{{_ "Cancel"}}
+									</button>
+								{{/if}}
+							</div>
+						{{/each}}
+					</div>
+					<div class="messages-box {{#if selectable}}selectable{{/if}} {{messageViewMode}} {{hasLeader}}">
+						<div class="ticks-bar"></div>
+						<button class="new-message background-primary-action-color color-content-background-color not">
+							<i class="icon-down-big"></i>
+							{{_ "New_messages"}}
+						</button>
+						<div class="jump-recent background-component-color {{#unless hasMoreNext}}not{{/unless}}">
+							<button>{{_ "Jump_to_recent_messages"}} <i class="icon-level-down"></i></button>
+						</div>
+						{{#unless canPreview}}
+							<div class="content room-not-found error-color">
+								<div>
+									{{_ "You_must_join_to_view_messages_in_this_channel"}}
 								</div>
-							{{/with}}
-							<div class="wrapper {{#if hasMoreNext}}has-more-next{{/if}} {{hideUsername}} {{hideAvatar}}">
-								<ul aria-live="polite">
-									{{#if canPreview}}
-										{{#if hasMore}}
-											<li class="load-more">
-												{{#if isLoading}}
-													{{> loading}}
-												{{/if}}
-											</li>
-										{{else}}
-											<li class="start color-info-font-color">
-												{{#if hasPurge}}
-													<div class="start__purge-warning error-background error-border error-color">
-														{{> icon block="start__purge-warning-icon" icon="warning"}}
-														{{#unless filesOnly}}
-															{{#unless excludePinned}}
-																{{_ "RetentionPolicy_RoomWarning" time=purgeTimeout}}
-															{{else}}
-																{{_ "RetentionPolicy_RoomWarning_Unpinned" time=purgeTimeout}}
-															{{/unless}}
-														{{else}}
-															{{#unless excludePinned}}
-																{{_ "RetentionPolicy_RoomWarning_FilesOnly" time=purgeTimeout}}
-															{{else}}
-																{{_ "RetentionPolicy_RoomWarning_UnpinnedFilesOnly" time=purgeTimeout}}
-															{{/unless}}
-														{{/unless}}
-													</div>
-												{{/if}}
-												{{_ "Start_of_conversation"}}
-											</li>
-										{{/if}}
-									{{/if}}
-
-									{{# with messageContext}}
-										{{#each msg in messagesHistory}}{{> message index=@index shouldCollapseReplies=true msg=msg room=room subscription=subscription settings=settings u=u}}{{/each}}
-									{{/with}}
-
-									{{#if hasMoreNext}}
+							</div>
+						{{/unless}}
+						{{#with roomLeader}}
+							<div class="room-leader message color-primary-font-color content-background-color border-component-color {{hideLeaderHeader}}">
+								<button class="thumb user-card-message">
+									{{> avatar username=username }}
+								</button>
+								<div class="leader-name">{{name}}</div>
+								<div class="leader-status userStatus">
+									<span class="color-ball status-bg-{{status}}"></span>
+									<span class="status-text leader-status-text">{{statusDisplay}}</span>
+								</div>
+								<a class="chat-now" href="{{chatNowLink}}">{{_ "Chat_Now"}}</a>
+							</div>
+						{{/with}}
+						<div class="wrapper {{#if hasMoreNext}}has-more-next{{/if}} {{hideUsername}} {{hideAvatar}}">
+							<ul aria-live="polite">
+								{{#if canPreview}}
+									{{#if hasMore}}
 										<li class="load-more">
 											{{#if isLoading}}
 												{{> loading}}
@@ -163,18 +125,30 @@
 											{{> RoomForeword }}
 										</li>
 									{{/if}}
-								</ul>
-							</div>
+								{{/if}}
+
+								{{# with messageContext}}
+									{{#each msg in messagesHistory}}{{> message index=@index shouldCollapseReplies=true msg=msg room=room subscription=subscription settings=settings u=u}}{{/each}}
+								{{/with}}
+
+								{{#if hasMoreNext}}
+									<li class="load-more">
+										{{#if isLoading}}
+											{{> loading}}
+										{{/if}}
+									</li>
+								{{/if}}
+							</ul>
 						</div>
-						<footer class="footer border-component-color">
-							{{> messageBox messageboxData}}
-						</footer>
 					</div>
-				{{/if}}
+					<footer class="footer border-component-color">
+						{{> messageBox messageboxData}}
+					</footer>
+				</div>
 				{{#with flexData}}
 					{{> contextualBar}}
 				{{/with}}
 			</div>
 		</section>
 	</div>
-</template>
\ No newline at end of file
+</template>

From 9c9139ad005e8e5153b71eb4d9511965cb3b1116 Mon Sep 17 00:00:00 2001
From: Shailesh Baldaniya <shaileshbaldaniya351@gmail.com>
Date: Sat, 4 Apr 2020 15:16:12 +0000
Subject: [PATCH 215/223] Fix Room Search Issue and sidebar header

---
 app/ui-sidenav/client/sidebarHeader.js |   2 +-
 app/ui/client/views/app/room.html      | 243 +++++++++++++------------
 2 files changed, 124 insertions(+), 121 deletions(-)

diff --git a/app/ui-sidenav/client/sidebarHeader.js b/app/ui-sidenav/client/sidebarHeader.js
index 41d99d84bc5a..8f69136fca89 100644
--- a/app/ui-sidenav/client/sidebarHeader.js
+++ b/app/ui-sidenav/client/sidebarHeader.js
@@ -75,7 +75,7 @@ const extendedViewOption = (user) => {
 const toolbarButtons = (user) => [{
 	name: t('Home'),
 	icon: 'home',
-	condition: () => settings.get('Layout_Show_Home_Button'),
+	condition: () => !isMobile() && settings.get('Layout_Show_Home_Button'),
 	action: () => {
 		FlowRouter.go('home');
 	},
diff --git a/app/ui/client/views/app/room.html b/app/ui/client/views/app/room.html
index 2ec39c4854ea..6fbb8e0fac70 100644
--- a/app/ui/client/views/app/room.html
+++ b/app/ui/client/views/app/room.html
@@ -11,140 +11,143 @@
 				{{/headerRoom}}
 			{{/if}}
 			<div class="messages-container-wrapper">
-				<div class="messages-container-main dropzone {{dragAndDrop}}">
-					<div class="dropzone-overlay {{isDropzoneDisabled}} background-transparent-darkest color-content-background-color">{{_ dragAndDropLabel}}</div>
-					{{#unless embeddedVersion}}
-						{{#if announcement}}
-						<div class="fixed-title announcement {{getAnnouncementStyle}}" aria-label="{{RocketChatMarkdownInline announcement}}">
-							<p>{{{RocketChatMarkdownInline announcement}}}</p>
-						</div>
-						{{/if}}
-					{{/unless}}
-					<div class="container-bars {{containerBarsShow unreadData uploading}}">
-						{{#with unreadData}}
-							{{#if since}}
-								{{#if count}}
-									<div class="unread-bar color-primary-action-color background-component-color">
-										<button class="jump-to">
-											<span class="jump-to-large">{{_ "Jump_to_first_unread"}}</span>
-											<span class="jump-to-small">{{_ "Jump"}}</span>
+				{{#if openSearchPage}}
+					{{> RocketSearch}}
+				{{else}}
+					<div class="messages-container-main dropzone {{dragAndDrop}}">
+						<div class="dropzone-overlay {{isDropzoneDisabled}} background-transparent-darkest color-content-background-color">{{_ dragAndDropLabel}}</div>
+						{{#unless embeddedVersion}}
+							{{#if announcement}}
+							<div class="fixed-title announcement {{getAnnouncementStyle}}" aria-label="{{RocketChatMarkdownInline announcement}}">
+								<p>{{{RocketChatMarkdownInline announcement}}}</p>
+							</div>
+							{{/if}}
+						{{/unless}}
+						<div class="container-bars {{containerBarsShow unreadData uploading}}">
+							{{#with unreadData}}
+								{{#if since}}
+									{{#if count}}
+										<div class="unread-bar color-primary-action-color background-component-color">
+											<button class="jump-to">
+												<span class="jump-to-large">{{_ "Jump_to_first_unread"}}</span>
+												<span class="jump-to-small">{{_ "Jump"}}</span>
+											</button>
+											<span class="unread-count-since">
+												{{_ "S_new_messages_since_s" count formatUnreadSince}}
+											</span>
+											<span class="unread-count">
+												{{_ "N_new_messages" count}}
+											</span>
+											<button class="mark-read">
+												{{_ "Mark_as_read"}}
+											</button>
+										</div>
+									{{/if}}
+								{{/if}}
+							{{/with}}
+							{{#each uploading}}
+								<div class="upload-progress color-primary-action-color background-component-color {{#if error}}error-background error-border{{/if}}">
+									{{#if error}}
+										<div class="upload-progress-text">
+											{{error}}
+										</div>
+										<button class="upload-progress-close">
+											{{_ "close"}}
 										</button>
-										<span class="unread-count-since">
-											{{_ "S_new_messages_since_s" count formatUnreadSince}}
-										</span>
-										<span class="unread-count">
-											{{_ "N_new_messages" count}}
-										</span>
-										<button class="mark-read">
-											{{_ "Mark_as_read"}}
+									{{else}}
+										<div class="upload-progress-progress" style="width: {{percentage}}%;"></div>
+										<div class="upload-progress-text">
+											[{{percentage}}%] {{name}}
+										</div>
+										<button class="upload-progress-close">
+											{{_ "Cancel"}}
 										</button>
+									{{/if}}
+								</div>
+							{{/each}}
+						</div>
+						<div class="messages-box {{#if selectable}}selectable{{/if}} {{messageViewMode}} {{hasLeader}}">
+							<div class="ticks-bar"></div>
+							<button class="new-message background-primary-action-color color-content-background-color not">
+								<i class="icon-down-big"></i>
+								{{_ "New_messages"}}
+							</button>
+							<div class="jump-recent background-component-color {{#unless hasMoreNext}}not{{/unless}}">
+								<button>{{_ "Jump_to_recent_messages"}} <i class="icon-level-down"></i></button>
+							</div>
+							{{#unless canPreview}}
+								<div class="content room-not-found error-color">
+									<div>
+										{{_ "You_must_join_to_view_messages_in_this_channel"}}
 									</div>
-								{{/if}}
-							{{/if}}
-						{{/with}}
-						{{#each uploading}}
-							<div class="upload-progress color-primary-action-color background-component-color {{#if error}}error-background error-border{{/if}}">
-								{{#if error}}
-									<div class="upload-progress-text">
-										{{error}}
-									</div>
-									<button class="upload-progress-close">
-										{{_ "close"}}
+								</div>
+							{{/unless}}
+							{{#with roomLeader}}
+								<div class="room-leader message color-primary-font-color content-background-color border-component-color {{hideLeaderHeader}}">
+									<button class="thumb user-card-message">
+										{{> avatar username=username }}
 									</button>
-								{{else}}
-									<div class="upload-progress-progress" style="width: {{percentage}}%;"></div>
-									<div class="upload-progress-text">
-										[{{percentage}}%] {{name}}
+									<div class="leader-name">{{name}}</div>
+									<div class="leader-status userStatus">
+										<span class="color-ball status-bg-{{status}}"></span>
+										<span class="status-text leader-status-text">{{statusDisplay}}</span>
 									</div>
-									<button class="upload-progress-close">
-										{{_ "Cancel"}}
-									</button>
-								{{/if}}
-							</div>
-						{{/each}}
-					</div>
-					<div class="messages-box {{#if selectable}}selectable{{/if}} {{messageViewMode}} {{hasLeader}}">
-						<div class="ticks-bar"></div>
-						<button class="new-message background-primary-action-color color-content-background-color not">
-							<i class="icon-down-big"></i>
-							{{_ "New_messages"}}
-						</button>
-						<div class="jump-recent background-component-color {{#unless hasMoreNext}}not{{/unless}}">
-							<button>{{_ "Jump_to_recent_messages"}} <i class="icon-level-down"></i></button>
-						</div>
-						{{#unless canPreview}}
-							<div class="content room-not-found error-color">
-								<div>
-									{{_ "You_must_join_to_view_messages_in_this_channel"}}
-								</div>
-							</div>
-						{{/unless}}
-						{{#with roomLeader}}
-							<div class="room-leader message color-primary-font-color content-background-color border-component-color {{hideLeaderHeader}}">
-								<button class="thumb user-card-message">
-									{{> avatar username=username }}
-								</button>
-								<div class="leader-name">{{name}}</div>
-								<div class="leader-status userStatus">
-									<span class="color-ball status-bg-{{status}}"></span>
-									<span class="status-text leader-status-text">{{statusDisplay}}</span>
+									<a class="chat-now" href="{{chatNowLink}}">{{_ "Chat_Now"}}</a>
 								</div>
-								<a class="chat-now" href="{{chatNowLink}}">{{_ "Chat_Now"}}</a>
-							</div>
-						{{/with}}
-						<div class="wrapper {{#if hasMoreNext}}has-more-next{{/if}} {{hideUsername}} {{hideAvatar}}">
-							<ul aria-live="polite">
-								{{#if canPreview}}
-									{{#if hasMore}}
+							{{/with}}
+							<div class="wrapper {{#if hasMoreNext}}has-more-next{{/if}} {{hideUsername}} {{hideAvatar}}">
+								<ul aria-live="polite">
+									{{#if canPreview}}
+										{{#if hasMore}}
+											<li class="load-more">
+												{{#if isLoading}}
+													{{> loading}}
+												{{/if}}
+											</li>
+										{{else}}
+											<li class="start color-info-font-color">
+												{{#if hasPurge}}
+													<div class="start__purge-warning error-background error-border error-color">
+														{{> icon block="start__purge-warning-icon" icon="warning"}}
+														{{#unless filesOnly}}
+															{{#unless excludePinned}}
+																{{_ "RetentionPolicy_RoomWarning" time=purgeTimeout}}
+															{{else}}
+																{{_ "RetentionPolicy_RoomWarning_Unpinned" time=purgeTimeout}}
+															{{/unless}}
+														{{else}}
+															{{#unless excludePinned}}
+																{{_ "RetentionPolicy_RoomWarning_FilesOnly" time=purgeTimeout}}
+															{{else}}
+																{{_ "RetentionPolicy_RoomWarning_UnpinnedFilesOnly" time=purgeTimeout}}
+															{{/unless}}
+														{{/unless}}
+													</div>
+												{{/if}}
+												{{_ "Start_of_conversation"}}
+											</li>
+										{{/if}}
+									{{/if}}
+
+									{{# with messageContext}}
+										{{#each msg in messagesHistory}}{{> message index=@index shouldCollapseReplies=true msg=msg room=room subscription=subscription settings=settings u=u}}{{/each}}
+									{{/with}}
+
+									{{#if hasMoreNext}}
 										<li class="load-more">
 											{{#if isLoading}}
 												{{> loading}}
 											{{/if}}
 										</li>
-									{{else}}
-										<li class="start color-info-font-color">
-											{{#if hasPurge}}
-												<div class="start__purge-warning error-background error-border error-color">
-													{{> icon block="start__purge-warning-icon" icon="warning"}}
-													{{#unless filesOnly}}
-														{{#unless excludePinned}}
-															{{_ "RetentionPolicy_RoomWarning" time=purgeTimeout}}
-														{{else}}
-															{{_ "RetentionPolicy_RoomWarning_Unpinned" time=purgeTimeout}}
-														{{/unless}}
-													{{else}}
-														{{#unless excludePinned}}
-															{{_ "RetentionPolicy_RoomWarning_FilesOnly" time=purgeTimeout}}
-														{{else}}
-															{{_ "RetentionPolicy_RoomWarning_UnpinnedFilesOnly" time=purgeTimeout}}
-														{{/unless}}
-													{{/unless}}
-												</div>
-											{{/if}}
-
-											{{> RoomForeword }}
-										</li>
 									{{/if}}
-								{{/if}}
-
-								{{# with messageContext}}
-									{{#each msg in messagesHistory}}{{> message index=@index shouldCollapseReplies=true msg=msg room=room subscription=subscription settings=settings u=u}}{{/each}}
-								{{/with}}
-
-								{{#if hasMoreNext}}
-									<li class="load-more">
-										{{#if isLoading}}
-											{{> loading}}
-										{{/if}}
-									</li>
-								{{/if}}
-							</ul>
+								</ul>
+							</div>
 						</div>
+						<footer class="footer border-component-color">
+							{{> messageBox messageboxData}}
+						</footer>
 					</div>
-					<footer class="footer border-component-color">
-						{{> messageBox messageboxData}}
-					</footer>
-				</div>
+				{{/if}}
 				{{#with flexData}}
 					{{> contextualBar}}
 				{{/with}}

From a441272ff0e2eeb69e31a1bb0849d7281446bf2b Mon Sep 17 00:00:00 2001
From: ear-dev <ear@shirim.com>
Date: Fri, 24 Apr 2020 15:25:35 -0400
Subject: [PATCH 216/223] Update build_and_test.yml

---
 .github/workflows/build_and_test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index de13e79df853..a5565a2f2b02 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -245,7 +245,7 @@ jobs:
 
   build-image-pr:
     runs-on: ubuntu-latest
-    if: github.event_name == 'pull_request'
+    if: github.event_name == 'DEACTIVATED-pull_request'
 
     steps:
     - uses: actions/checkout@v1

From ac6ea9aa3525810e7af43ccae125f384907e41bb Mon Sep 17 00:00:00 2001
From: shubhsherl <shubham.singh094@yahoo.com>
Date: Sat, 11 Apr 2020 22:21:21 +0530
Subject: [PATCH 217/223] fix quote message redirect in pwa

---
 app/ui/client/views/app/room.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/ui/client/views/app/room.js b/app/ui/client/views/app/room.js
index 8620e1c009cc..47b290235256 100644
--- a/app/ui/client/views/app/room.js
+++ b/app/ui/client/views/app/room.js
@@ -883,7 +883,7 @@ Template.room.events({
 		const { msg } = messageArgs(this);
 		const link = msg.attachments ? msg.attachments[0].message_link : this.message_link;
 		const repliedMessageId = link.split('?msg=')[1];
-		const { pathname } = new URL(link);
+		const pathname = `/${ link.split('?msg=')[0].split('/').slice(-2)[0] }/${ link.split('?msg=')[0].split('/').slice(-1)[0] }`;
 		FlowRouter.go(pathname, null, { msg: repliedMessageId, hash: Random.id() });
 	},
 	'click .mention-link'(e, instance) {

From 8433b138af05e11dedd1451e9205ee31ecffbbaa Mon Sep 17 00:00:00 2001
From: Shailesh Baldaniya <shaileshbaldaniya351@gmail.com>
Date: Tue, 14 Apr 2020 04:53:13 +0000
Subject: [PATCH 218/223] Fix Favorite Icon In Room

---
 app/ui/client/components/header/headerRoom.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/ui/client/components/header/headerRoom.html b/app/ui/client/components/header/headerRoom.html
index a7cd325f30ef..ac9f0ebee980 100644
--- a/app/ui/client/components/header/headerRoom.html
+++ b/app/ui/client/components/header/headerRoom.html
@@ -17,7 +17,7 @@
 
 				{{#if isToggleFavoriteButtonVisible}}
 					<div class="rc-header__block rc-header__favorite rc-header__block--action">
-						<button aria-label="{{toggleFavoriteButtonIconLabel}}" type="button" class="rc-header__toggle-favorite rc-header__first-icon js-favorite">
+						<button aria-label="{{toggleFavoriteButtonIconLabel}}" type="button" class="rc-header__toggle-favorite {{#if isToggleFavoriteButtonChecked}}rc-header__toggle-favorite--checked{{/if}} rc-header__first-icon rc-tooltip rc-tooltip--down rc-tooltip--start js-favorite">
 							{{> icon block="rc-header__icon" icon=toggleFavoriteButtonIcon}}
 						</button>
 					</div>

From 924082eef2d538b46c48feddbd582a0c3e1f6f15 Mon Sep 17 00:00:00 2001
From: Shailesh Baldaniya <shaileshbaldaniya351@gmail.com>
Date: Sun, 26 Apr 2020 18:54:25 +0000
Subject: [PATCH 219/223] Fix LivaChat Import

---
 client/importPackages.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/importPackages.js b/client/importPackages.js
index e160849f2487..34f63614227c 100644
--- a/client/importPackages.js
+++ b/client/importPackages.js
@@ -109,4 +109,4 @@ import '../app/ui-cached-collection';
 import '../app/action-links';
 import '../app/reactions/client';
 import '../app/meteor-autocomplete/client';
-// import '../app/livechat/client';
+import '../app/livechat/client';

From 7df1fcb08224e46bc6232a74ff69121c4e0a25bc Mon Sep 17 00:00:00 2001
From: Aditya <aditya.1998bhardwaj@gmail.com>
Date: Mon, 27 Apr 2020 02:12:30 +0530
Subject: [PATCH 220/223] popover not closing on page change issue fixed

---
 app/ui-utils/client/lib/popover.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/ui-utils/client/lib/popover.js b/app/ui-utils/client/lib/popover.js
index dfc2b9d34bf3..70e7257cfc58 100644
--- a/app/ui-utils/client/lib/popover.js
+++ b/app/ui-utils/client/lib/popover.js
@@ -167,6 +167,16 @@ Template.popover.onRendered(function() {
 	this.firstNode.style.visibility = 'visible';
 });
 
+Template.popover.onCreated(function() {
+	this.route = FlowRouter.current().path;
+	this.autorun(() => {
+		FlowRouter.watchPathChange();
+		if (FlowRouter.current().path !== this.route) {
+			popover.close();
+		}
+	});
+});
+
 Template.popover.onDestroyed(function() {
 	if (this.data.onDestroyed) {
 		this.data.onDestroyed();

From be776e31295fa8da5516e2f4de6ec2d830dfef89 Mon Sep 17 00:00:00 2001
From: shubhsherl <shubham.singh094@yahoo.com>
Date: Tue, 14 Apr 2020 22:09:52 +0530
Subject: [PATCH 221/223] use URL function to extract pathname

---
 app/ui/client/views/app/room.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/ui/client/views/app/room.js b/app/ui/client/views/app/room.js
index 47b290235256..8620e1c009cc 100644
--- a/app/ui/client/views/app/room.js
+++ b/app/ui/client/views/app/room.js
@@ -883,7 +883,7 @@ Template.room.events({
 		const { msg } = messageArgs(this);
 		const link = msg.attachments ? msg.attachments[0].message_link : this.message_link;
 		const repliedMessageId = link.split('?msg=')[1];
-		const pathname = `/${ link.split('?msg=')[0].split('/').slice(-2)[0] }/${ link.split('?msg=')[0].split('/').slice(-1)[0] }`;
+		const { pathname } = new URL(link);
 		FlowRouter.go(pathname, null, { msg: repliedMessageId, hash: Random.id() });
 	},
 	'click .mention-link'(e, instance) {

From dd2fce0ad011a77e4c18455c1988ea934b3e5667 Mon Sep 17 00:00:00 2001
From: Aditya <aditya.1998bhardwaj@gmail.com>
Date: Tue, 28 Apr 2020 16:30:12 +0530
Subject: [PATCH 222/223] removed status text for mobile view

---
 app/ui/client/components/header/headerRoom.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/ui/client/components/header/headerRoom.html b/app/ui/client/components/header/headerRoom.html
index ac9f0ebee980..80fe79a5f5df 100644
--- a/app/ui/client/components/header/headerRoom.html
+++ b/app/ui/client/components/header/headerRoom.html
@@ -47,7 +47,7 @@
 						{{#if isDirect}}
 						<span class="rc-header__status">
 							<div class="rc-header__status-bullet rc-header__status-bullet--{{userStatus}}" title="{{_ userStatus}}"></div>
-							<div class="rc-header__visual-status">{{userStatusText}}</div>
+							{{#if isNotMobile}}<div class="rc-header__visual-status">{{userStatusText}}</div>{{/if}}
 						</span>
 						{{else}}
 						{{#if $and roomTopic isNotMobile}}<span class="rc-header__topic">{{{roomTopic}}}</span>{{/if}}

From bfad9d00879bdb4e18423b46ea2d13ea4a58e245 Mon Sep 17 00:00:00 2001
From: Aditya <aditya.1998bhardwaj@gmail.com>
Date: Thu, 30 Apr 2020 17:14:43 +0530
Subject: [PATCH 223/223] focus on message input box removed for mobile devices
 after clicking new messages button

---
 app/ui/client/views/app/room.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/ui/client/views/app/room.js b/app/ui/client/views/app/room.js
index 8620e1c009cc..643acdd0be97 100644
--- a/app/ui/client/views/app/room.js
+++ b/app/ui/client/views/app/room.js
@@ -838,7 +838,9 @@ Template.room.events({
 
 	'click .new-message'(event, instance) {
 		instance.atBottom = true;
-		chatMessages[RoomManager.openedRoom].input.focus();
+		if (!isMobile()) {
+			chatMessages[RoomManager.openedRoom].input.focus();
+		}
 	},
 	'click .message-actions__menu'(e, i) {
 		const messageContext = messageArgs(this);