diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel index 53e57eb3d8e..3da60178791 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.17.0-rc.4 +ENV RC_VERSION 3.17.0-rc.5 MAINTAINER buildmaster@rocket.chat diff --git a/.github/history.json b/.github/history.json index b3e1d893376..c1b44228fcd 100644 --- a/.github/history.json +++ b/.github/history.json @@ -63484,6 +63484,85 @@ ] } ] + }, + "3.17.0-rc.5": { + "node_version": "12.22.1", + "npm_version": "6.14.1", + "apps_engine_version": "1.27.1", + "mongo_versions": [ + "3.4", + "3.6", + "4.0", + "4.2" + ], + "pull_requests": [ + { + "pr": "22791", + "title": "[FIX] Content-Security-Policy ignoring CDN configuration", + "userLogin": "ggazzo", + "milestone": "3.16.4", + "contributors": [ + "ggazzo", + "nmagedman" + ] + }, + { + "pr": "22799", + "title": "Regression: roles.removeUserFromRole API not working with scoped roles.", + "userLogin": "pierre-lehnen-rc", + "contributors": [ + "pierre-lehnen-rc", + "web-flow", + "tassoevan" + ] + }, + { + "pr": "22813", + "title": "Regression: Fix tooltip style in the \"Busiest Chat Times\" chart", + "userLogin": "matheusbsilva137", + "description": "- Fix tooltip in the Engagement Dashboard's \"Busiest Chat Times\" chart (Hours).\r\n\r\n**Expected behavior:**\r\n![busiest-times-ed](https://user-images.githubusercontent.com/36537004/127527827-465397ed-f089-4fb7-9ab2-6fa8cea6abdf.PNG)", + "contributors": [ + "matheusbsilva137" + ] + }, + { + "pr": "22810", + "title": "Regression: Added missing translate keys for Federation", + "userLogin": "alansikora", + "contributors": [ + "alansikora" + ] + }, + { + "pr": "22798", + "title": "Regression: Text wrap in MarkdownTextEditor and PreviewText", + "userLogin": "tiagoevanp", + "contributors": [ + "tiagoevanp", + "web-flow", + "KevLehman" + ] + }, + { + "pr": "22586", + "title": "[FIX] Quote message not working for Livechat visitors", + "userLogin": "murtaza98", + "description": "### Before:\r\n![image](https://user-images.githubusercontent.com/34130764/124583613-de2b1180-de70-11eb-82aa-18564b317626.png)\r\n### After:\r\n![image](https://user-images.githubusercontent.com/34130764/124583775-12063700-de71-11eb-8ab5-b0169fac2d40.png)", + "contributors": [ + "murtaza98", + "web-flow", + "KevLehman" + ] + }, + { + "pr": "22800", + "title": "Regression: Replaced manual state control with a .once event", + "userLogin": "pierre-lehnen-rc", + "contributors": [ + "pierre-lehnen-rc" + ] + } + ] } } } \ No newline at end of file diff --git a/.snapcraft/resources/prepareRocketChat b/.snapcraft/resources/prepareRocketChat index 2d58bff1d7f..37dc1319f07 100755 --- a/.snapcraft/resources/prepareRocketChat +++ b/.snapcraft/resources/prepareRocketChat @@ -1,6 +1,6 @@ #!/bin/bash -curl -SLf "https://releases.rocket.chat/3.17.0-rc.4/download/" -o rocket.chat.tgz +curl -SLf "https://releases.rocket.chat/3.17.0-rc.5/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 f09c6327ac1..ab799935ca4 100644 --- a/.snapcraft/snap/snapcraft.yaml +++ b/.snapcraft/snap/snapcraft.yaml @@ -7,7 +7,7 @@ # 5. `snapcraft snap` name: rocketchat-server -version: 3.17.0-rc.4 +version: 3.17.0-rc.5 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 794db6a6642..a908392701c 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,6 +1,57 @@ # 3.17.0 (Under Release Candidate Process) +## 3.17.0-rc.5 +`2021-07-29 ยท 2 ๐Ÿ› ยท 5 ๐Ÿ” ยท 9 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` + +### ๐Ÿ› Bug fixes + + +- Content-Security-Policy ignoring CDN configuration ([#22791](https://github.com/RocketChat/Rocket.Chat/pull/22791) by [@nmagedman](https://github.com/nmagedman)) + +- Quote message not working for Livechat visitors ([#22586](https://github.com/RocketChat/Rocket.Chat/pull/22586)) + + ### Before: + ![image](https://user-images.githubusercontent.com/34130764/124583613-de2b1180-de70-11eb-82aa-18564b317626.png) + ### After: + ![image](https://user-images.githubusercontent.com/34130764/124583775-12063700-de71-11eb-8ab5-b0169fac2d40.png) + +
+๐Ÿ” Minor changes + + +- Regression: Added missing translate keys for Federation ([#22810](https://github.com/RocketChat/Rocket.Chat/pull/22810)) + +- Regression: Fix tooltip style in the "Busiest Chat Times" chart ([#22813](https://github.com/RocketChat/Rocket.Chat/pull/22813)) + + - Fix tooltip in the Engagement Dashboard's "Busiest Chat Times" chart (Hours). + + **Expected behavior:** + ![busiest-times-ed](https://user-images.githubusercontent.com/36537004/127527827-465397ed-f089-4fb7-9ab2-6fa8cea6abdf.PNG) + +- Regression: Replaced manual state control with a .once event ([#22800](https://github.com/RocketChat/Rocket.Chat/pull/22800)) + +- Regression: roles.removeUserFromRole API not working with scoped roles. ([#22799](https://github.com/RocketChat/Rocket.Chat/pull/22799)) + +- Regression: Text wrap in MarkdownTextEditor and PreviewText ([#22798](https://github.com/RocketChat/Rocket.Chat/pull/22798)) + +
+ +### ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป Contributors ๐Ÿ˜ + +- [@nmagedman](https://github.com/nmagedman) + +### ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป Core Team ๐Ÿค“ + +- [@KevLehman](https://github.com/KevLehman) +- [@alansikora](https://github.com/alansikora) +- [@ggazzo](https://github.com/ggazzo) +- [@matheusbsilva137](https://github.com/matheusbsilva137) +- [@murtaza98](https://github.com/murtaza98) +- [@pierre-lehnen-rc](https://github.com/pierre-lehnen-rc) +- [@tassoevan](https://github.com/tassoevan) +- [@tiagoevanp](https://github.com/tiagoevanp) + ## 3.17.0-rc.4 `2021-07-28 ยท 2 ๐Ÿ” ยท 2 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info index 8fc8797f5b3..b34075c89a9 100644 --- a/app/utils/rocketchat.info +++ b/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "3.17.0-rc.4" + "version": "3.17.0-rc.5" } diff --git a/package-lock.json b/package-lock.json index b632d69fa66..3bddcc9590e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "Rocket.Chat", - "version": "3.17.0-rc.4", + "version": "3.17.0-rc.5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 67944ced817..fe0ca10f9b9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "Rocket.Chat", "description": "The Ultimate Open Source WebChat Platform", - "version": "3.17.0-rc.4", + "version": "3.17.0-rc.5", "author": { "name": "Rocket.Chat", "url": "https://rocket.chat/"