diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel
index c4685444b7a..547eb234f11 100644
--- a/.docker/Dockerfile.rhel
+++ b/.docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
FROM registry.access.redhat.com/ubi8/nodejs-12
-ENV RC_VERSION 3.10.0
+ENV RC_VERSION 3.10.1
MAINTAINER buildmaster@rocket.chat
diff --git a/.github/history.json b/.github/history.json
index 9c311669cbc..79d71989f9a 100644
--- a/.github/history.json
+++ b/.github/history.json
@@ -53685,6 +53685,202 @@
"4.0"
],
"pull_requests": []
+ },
+ "3.8.5": {
+ "node_version": "12.18.4",
+ "npm_version": "6.14.8",
+ "apps_engine_version": "1.19.0",
+ "mongo_versions": [
+ "3.4",
+ "3.6",
+ "4.0"
+ ],
+ "pull_requests": [
+ {
+ "pr": "19978",
+ "title": "Regression: Fix oembed",
+ "userLogin": "sampaiodiego",
+ "contributors": [
+ "sampaiodiego"
+ ]
+ }
+ ]
+ },
+ "3.9.4": {
+ "node_version": "12.18.4",
+ "npm_version": "6.14.8",
+ "apps_engine_version": "1.21.0-alpha.4235",
+ "mongo_versions": [
+ "3.4",
+ "3.6",
+ "4.0"
+ ],
+ "pull_requests": [
+ {
+ "pr": "19978",
+ "title": "Regression: Fix oembed",
+ "userLogin": "sampaiodiego",
+ "contributors": [
+ "sampaiodiego"
+ ]
+ },
+ {
+ "pr": "19830",
+ "title": "[FIX] Omnichannel Departments Canned Responses",
+ "userLogin": "gabriellsh",
+ "milestone": "3.9.4",
+ "contributors": [
+ "gabriellsh",
+ "web-flow",
+ "renatobecker",
+ "dougfabris"
+ ]
+ },
+ {
+ "pr": "19945",
+ "title": "[FIX] Room scrolling to top after returns to a opened room",
+ "userLogin": "ggazzo",
+ "milestone": "3.9.4",
+ "contributors": [
+ "ggazzo",
+ "tassoevan",
+ "web-flow"
+ ]
+ },
+ {
+ "pr": "19935",
+ "title": "[FIX] Status on searchlist",
+ "userLogin": "gabriellsh",
+ "milestone": "3.9.4",
+ "contributors": [
+ "gabriellsh",
+ "tassoevan",
+ "web-flow"
+ ]
+ }
+ ]
+ },
+ "3.10.1": {
+ "node_version": "12.18.4",
+ "npm_version": "6.14.8",
+ "apps_engine_version": "1.21.0-alpha.4235",
+ "mongo_versions": [
+ "3.4",
+ "3.6",
+ "4.0"
+ ],
+ "pull_requests": [
+ {
+ "pr": "20073",
+ "title": "[FIX] Actions from User Info panel",
+ "userLogin": "Darshilp326",
+ "description": "Users can be removed from channels without any error message.",
+ "milestone": "3.10.1",
+ "contributors": [
+ "Darshilp326"
+ ]
+ },
+ {
+ "pr": "20114",
+ "title": "[FIX] Messages being updated when not required after user changes his profile",
+ "userLogin": "sampaiodiego",
+ "milestone": "3.10.1",
+ "contributors": [
+ "sampaiodiego"
+ ]
+ },
+ {
+ "pr": "19953",
+ "title": "[FIX][ENTERPRISE] Omnichannel custom fields not storing additional form values ",
+ "userLogin": "rafaelblink",
+ "milestone": "3.10.1",
+ "contributors": [
+ "rafaelblink",
+ "renatobecker",
+ "web-flow"
+ ]
+ },
+ {
+ "pr": "20089",
+ "title": "[FIX] Omnichannel rooms breaking after return to queue or forward",
+ "userLogin": "gabriellsh",
+ "milestone": "3.10.1",
+ "contributors": [
+ "gabriellsh",
+ "renatobecker",
+ "web-flow"
+ ]
+ },
+ {
+ "pr": "20093",
+ "title": "[FIX] Omnichannel raw model importing meteor dependency",
+ "userLogin": "renatobecker",
+ "milestone": "3.10.1",
+ "contributors": [
+ "renatobecker"
+ ]
+ },
+ {
+ "pr": "20061",
+ "title": "[FIX] User Audio notification preference not being applied",
+ "userLogin": "sampaiodiego",
+ "milestone": "3.10.1",
+ "contributors": [
+ "sampaiodiego"
+ ]
+ },
+ {
+ "pr": "20003",
+ "title": "[FIX] OAuth users being asked to change password on second login",
+ "userLogin": "pierre-lehnen-rc",
+ "milestone": "3.10.1",
+ "contributors": [
+ "pierre-lehnen-rc",
+ "sampaiodiego"
+ ]
+ },
+ {
+ "pr": "20022",
+ "title": "[FIX] Omnichannel Agents unable to take new chats in the queue",
+ "userLogin": "rafaelblink",
+ "milestone": "3.10.1",
+ "contributors": [
+ "rafaelblink",
+ "renatobecker"
+ ]
+ },
+ {
+ "pr": "20007",
+ "title": "[FIX] Omnichannel Business Hours form is not being rendered",
+ "userLogin": "rafaelblink",
+ "milestone": "3.10.1",
+ "contributors": [
+ "rafaelblink",
+ "renatobecker",
+ "web-flow"
+ ]
+ },
+ {
+ "pr": "19965",
+ "title": "[FIX] Agent information panel not rendering",
+ "userLogin": "rafaelblink",
+ "milestone": "3.10.1",
+ "contributors": [
+ "rafaelblink",
+ "renatobecker",
+ "web-flow"
+ ]
+ },
+ {
+ "pr": "19997",
+ "title": "[FIX] Creation of Omnichannel rooms not working correctly through the Apps when the agent parameter is set",
+ "userLogin": "murtaza98",
+ "milestone": "3.10.1",
+ "contributors": [
+ "murtaza98"
+ ]
+ }
+ ]
}
}
}
\ No newline at end of file
diff --git a/.snapcraft/resources/prepareRocketChat b/.snapcraft/resources/prepareRocketChat
index e03dd7765b6..5f548f1159e 100755
--- a/.snapcraft/resources/prepareRocketChat
+++ b/.snapcraft/resources/prepareRocketChat
@@ -1,6 +1,6 @@
#!/bin/bash
-curl -SLf "https://releases.rocket.chat/3.10.0/download/" -o rocket.chat.tgz
+curl -SLf "https://releases.rocket.chat/3.10.1/download/" -o rocket.chat.tgz
tar xf rocket.chat.tgz --strip 1
diff --git a/.snapcraft/snap/snapcraft.yaml b/.snapcraft/snap/snapcraft.yaml
index 79ac3108e14..6bcd1f19d95 100644
--- a/.snapcraft/snap/snapcraft.yaml
+++ b/.snapcraft/snap/snapcraft.yaml
@@ -7,7 +7,7 @@
# 5. `snapcraft snap`
name: rocketchat-server
-version: 3.10.0
+version: 3.10.1
summary: Rocket.Chat server
description: Have your own Slack like online chat, built with Meteor. https://rocket.chat/
confinement: strict
diff --git a/HISTORY.md b/HISTORY.md
index 9e9625e1128..e67cba033d4 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,4 +1,53 @@
+# 3.10.1
+`2021-01-08 ยท 11 ๐ ยท 7 ๐ฉโ๐ป๐จโ๐ป`
+
+### Engine versions
+- Node: `12.18.4`
+- NPM: `6.14.8`
+- MongoDB: `3.4, 3.6, 4.0`
+- Apps-Engine: `1.21.0-alpha.4235`
+
+### ๐ Bug fixes
+
+
+- **ENTERPRISE:** Omnichannel custom fields not storing additional form values ([#19953](https://github.com/RocketChat/Rocket.Chat/pull/19953))
+
+- Actions from User Info panel ([#20073](https://github.com/RocketChat/Rocket.Chat/pull/20073) by [@Darshilp326](https://github.com/Darshilp326))
+
+ Users can be removed from channels without any error message.
+
+- Agent information panel not rendering ([#19965](https://github.com/RocketChat/Rocket.Chat/pull/19965))
+
+- Creation of Omnichannel rooms not working correctly through the Apps when the agent parameter is set ([#19997](https://github.com/RocketChat/Rocket.Chat/pull/19997))
+
+- Messages being updated when not required after user changes his profile ([#20114](https://github.com/RocketChat/Rocket.Chat/pull/20114))
+
+- OAuth users being asked to change password on second login ([#20003](https://github.com/RocketChat/Rocket.Chat/pull/20003))
+
+- Omnichannel Agents unable to take new chats in the queue ([#20022](https://github.com/RocketChat/Rocket.Chat/pull/20022))
+
+- Omnichannel Business Hours form is not being rendered ([#20007](https://github.com/RocketChat/Rocket.Chat/pull/20007))
+
+- Omnichannel raw model importing meteor dependency ([#20093](https://github.com/RocketChat/Rocket.Chat/pull/20093))
+
+- Omnichannel rooms breaking after return to queue or forward ([#20089](https://github.com/RocketChat/Rocket.Chat/pull/20089))
+
+- User Audio notification preference not being applied ([#20061](https://github.com/RocketChat/Rocket.Chat/pull/20061))
+
+### ๐ฉโ๐ป๐จโ๐ป Contributors ๐
+
+- [@Darshilp326](https://github.com/Darshilp326)
+
+### ๐ฉโ๐ป๐จโ๐ป Core Team ๐ค
+
+- [@gabriellsh](https://github.com/gabriellsh)
+- [@murtaza98](https://github.com/murtaza98)
+- [@pierre-lehnen-rc](https://github.com/pierre-lehnen-rc)
+- [@rafaelblink](https://github.com/rafaelblink)
+- [@renatobecker](https://github.com/renatobecker)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
# 3.10.0
`2020-12-29 ยท 6 ๐ ยท 10 ๐ ยท 29 ๐ ยท 39 ๐ ยท 20 ๐ฉโ๐ป๐จโ๐ป`
@@ -243,6 +292,41 @@
- [@thassiov](https://github.com/thassiov)
- [@tiagoevanp](https://github.com/tiagoevanp)
+# 3.9.4
+`2020-12-31 ยท 3 ๐ ยท 1 ๐ ยท 6 ๐ฉโ๐ป๐จโ๐ป`
+
+### Engine versions
+- Node: `12.18.4`
+- NPM: `6.14.8`
+- MongoDB: `3.4, 3.6, 4.0`
+- Apps-Engine: `1.21.0-alpha.4235`
+
+### ๐ Bug fixes
+
+
+- Omnichannel Departments Canned Responses ([#19830](https://github.com/RocketChat/Rocket.Chat/pull/19830))
+
+- Room scrolling to top after returns to a opened room ([#19945](https://github.com/RocketChat/Rocket.Chat/pull/19945))
+
+- Status on searchlist ([#19935](https://github.com/RocketChat/Rocket.Chat/pull/19935))
+
+
+๐ Minor changes
+
+
+- Regression: Fix oembed ([#19978](https://github.com/RocketChat/Rocket.Chat/pull/19978))
+
+
+
+### ๐ฉโ๐ป๐จโ๐ป Core Team ๐ค
+
+- [@dougfabris](https://github.com/dougfabris)
+- [@gabriellsh](https://github.com/gabriellsh)
+- [@ggazzo](https://github.com/ggazzo)
+- [@renatobecker](https://github.com/renatobecker)
+- [@sampaiodiego](https://github.com/sampaiodiego)
+- [@tassoevan](https://github.com/tassoevan)
+
# 3.9.3
`2020-12-18 ยท 2 ๐ ยท 1 ๐ฉโ๐ป๐จโ๐ป`
@@ -538,6 +622,27 @@
- [@sampaiodiego](https://github.com/sampaiodiego)
- [@tiagoevanp](https://github.com/tiagoevanp)
+# 3.8.5
+`2020-12-31 ยท 1 ๐ ยท 1 ๐ฉโ๐ป๐จโ๐ป`
+
+### Engine versions
+- Node: `12.18.4`
+- NPM: `6.14.8`
+- MongoDB: `3.4, 3.6, 4.0`
+- Apps-Engine: `1.19.0`
+
+
+๐ Minor changes
+
+
+- Regression: Fix oembed ([#19978](https://github.com/RocketChat/Rocket.Chat/pull/19978))
+
+
+
+### ๐ฉโ๐ป๐จโ๐ป Core Team ๐ค
+
+- [@sampaiodiego](https://github.com/sampaiodiego)
+
# 3.8.4
`2020-12-18 ยท 2 ๐ ยท 1 ๐ฉโ๐ป๐จโ๐ป`
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info
index 755476438b8..58ea23dd305 100644
--- a/app/utils/rocketchat.info
+++ b/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
{
- "version": "3.10.0"
+ "version": "3.10.1"
}
diff --git a/package-lock.json b/package-lock.json
index 03e82a473db..8e6232ef23b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "Rocket.Chat",
- "version": "3.10.0",
+ "version": "3.10.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 5d6f80ba04c..12a5e85914a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "Rocket.Chat",
"description": "The Ultimate Open Source WebChat Platform",
- "version": "3.10.0",
+ "version": "3.10.1",
"author": {
"name": "Rocket.Chat",
"url": "https://rocket.chat/"