Merge branch 'develop' into fix/webdav-file-storage

RocketChat · Aug 26, 2022 · 6f6f2c0 · 6f6f2c0
2 parents a1620f2 + 36d5252
commit 6f6f2c0
Show file tree

Hide file tree

Showing 98 changed files with 1,904 additions and 3,062 deletions.
diff --git a/apps/meteor/app/lib/server/functions/loadMessageHistory.ts b/apps/meteor/app/lib/server/functions/loadMessageHistory.ts
@@ -11,13 +11,15 @@ export function loadMessageHistory({
 	limit = 20,
 	ls,
 	showThreadMessages = true,
+	offset = 0,
 }: {
 	userId: string;
 	rid: string;
 	end: string;
 	limit: number;
 	ls: string;
 	showThreadMessages: boolean;
+	offset: number;
 }) {
 	const room = Rooms.findOneById(rid, { fields: { sysMes: 1 } });
 
@@ -28,6 +30,7 @@ export function loadMessageHistory({
 			ts: -1,
 		},
 		limit,
+		skip: offset,
 		fields: {},
 	};
 

diff --git a/apps/meteor/app/livechat/client/views/app/customTemplates/register.js b/apps/meteor/app/livechat/client/views/app/customTemplates/register.js
diff --git a/apps/meteor/app/livechat/client/views/app/tabbar/agentEdit.html b/apps/meteor/app/livechat/client/views/app/tabbar/agentEdit.html
diff --git a/apps/meteor/app/livechat/client/views/app/tabbar/agentEdit.js b/apps/meteor/app/livechat/client/views/app/tabbar/agentEdit.js
diff --git a/apps/meteor/app/livechat/client/views/app/tabbar/agentInfo.html b/apps/meteor/app/livechat/client/views/app/tabbar/agentInfo.html