diff --git a/.github/history.json b/.github/history.json index 7d2b52787e0f..93f6e4018eab 100644 --- a/.github/history.json +++ b/.github/history.json @@ -95655,6 +95655,85 @@ ] } ] + }, + "4.8.7": { + "node_version": "14.18.3", + "npm_version": "6.14.15", + "mongo_versions": [ + "3.6", + "4.0", + "4.2", + "4.4", + "5.0" + ], + "pull_requests": [] + }, + "5.0.8": { + "node_version": "14.19.3", + "npm_version": "6.14.17", + "mongo_versions": [ + "4.2", + "4.4", + "5.0" + ], + "pull_requests": [] + }, + "5.1.5": { + "node_version": "14.19.3", + "npm_version": "6.14.17", + "mongo_versions": [ + "4.2", + "4.4", + "5.0" + ], + "pull_requests": [] + }, + "5.2.1": { + "node_version": "14.19.3", + "npm_version": "6.14.17", + "mongo_versions": [ + "4.2", + "4.4", + "5.0" + ], + "pull_requests": [] + }, + "5.3.3": { + "node_version": "14.19.3", + "npm_version": "6.14.17", + "mongo_versions": [ + "4.2", + "4.4", + "5.0" + ], + "pull_requests": [] + }, + "5.3.4": { + "node_version": "14.19.3", + "npm_version": "6.14.17", + "mongo_versions": [ + "4.2", + "4.4", + "5.0" + ], + "pull_requests": [ + { + "pr": "27391", + "title": "[FIX] Thread messages being included in the room history even though they are not displayed", + "userLogin": "dougfabris", + "contributors": [ + "dougfabris" + ] + }, + { + "pr": "27340", + "title": "Release 5.3.3", + "userLogin": "ggazzo", + "contributors": [ + "ggazzo" + ] + } + ] } } } \ No newline at end of file diff --git a/HISTORY.md b/HISTORY.md index 58ca0980683f..6342649c1cb3 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,7 +1,38 @@ +# 5.3.4 +`2022-11-28 ยท 1 ๐Ÿ› ยท 1 ๐Ÿ” ยท 2 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` + +### Engine versions +- Node: `14.19.3` +- NPM: `6.14.17` +- MongoDB: `4.2, 4.4, 5.0` + +### ๐Ÿ› Bug fixes + + +- Thread messages being included in the room history even though they are not displayed ([#27391](https://github.com/RocketChat/Rocket.Chat/pull/27391)) + +
+๐Ÿ” Minor changes + + +- Release 5.3.3 ([#27340](https://github.com/RocketChat/Rocket.Chat/pull/27340)) + +
+ +### ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป Core Team ๐Ÿค“ + +- [@dougfabris](https://github.com/dougfabris) +- [@ggazzo](https://github.com/ggazzo) + # 5.3.3 `2022-11-24 ยท 1 ๐Ÿ› ยท 1 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` +### Engine versions +- Node: `14.19.3` +- NPM: `6.14.17` +- MongoDB: `4.2, 4.4, 5.0` + ### ๐Ÿ› Bug fixes diff --git a/apps/meteor/.docker/Dockerfile.rhel b/apps/meteor/.docker/Dockerfile.rhel index 97342a2095f7..8e505a96822b 100644 --- a/apps/meteor/.docker/Dockerfile.rhel +++ b/apps/meteor/.docker/Dockerfile.rhel @@ -1,6 +1,6 @@ FROM registry.access.redhat.com/ubi8/nodejs-12 -ENV RC_VERSION 5.3.3 +ENV RC_VERSION 5.3.4 MAINTAINER buildmaster@rocket.chat diff --git a/apps/meteor/app/ui-utils/client/lib/RoomHistoryManager.ts b/apps/meteor/app/ui-utils/client/lib/RoomHistoryManager.ts index 627ef606369d..06ab9a30ef1d 100644 --- a/apps/meteor/app/ui-utils/client/lib/RoomHistoryManager.ts +++ b/apps/meteor/app/ui-utils/client/lib/RoomHistoryManager.ts @@ -169,7 +169,7 @@ class RoomHistoryManagerClass extends Emitter { ({ ls } = subscription); } - const result = await callWithErrorHandling('loadHistory', rid, ts, limit, ls); + const result = await callWithErrorHandling('loadHistory', rid, ts, limit, ls, false); this.unqueue(); diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info index e02974483ec2..d158364deb19 100644 --- a/apps/meteor/app/utils/rocketchat.info +++ b/apps/meteor/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "5.3.3" + "version": "5.3.4" } diff --git a/apps/meteor/package.json b/apps/meteor/package.json index 720715e69d13..8ba688ebe999 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -1,7 +1,7 @@ { "name": "@rocket.chat/meteor", "description": "The Ultimate Open Source WebChat Platform", - "version": "5.3.3", + "version": "5.3.4", "private": true, "author": { "name": "Rocket.Chat", diff --git a/package.json b/package.json index 3fc0c395e0dc..e9c8141cb19f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rocket.chat", - "version": "5.3.3", + "version": "5.3.4", "description": "Rocket.Chat Monorepo", "main": "index.js", "private": true,