diff --git a/.docker/Dockerfile.rhel b/.docker/Dockerfile.rhel index 5ec10627ea5ad..8015df1aa0231 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.7.1 +ENV RC_VERSION 3.7.2 MAINTAINER buildmaster@rocket.chat diff --git a/.github/history.json b/.github/history.json index c2c7afdec1020..cd0138c9cc0e2 100644 --- a/.github/history.json +++ b/.github/history.json @@ -50289,6 +50289,56 @@ ] } ] + }, + "3.7.2": { + "node_version": "12.18.4", + "npm_version": "6.14.8", + "apps_engine_version": "1.18.0", + "mongo_versions": [ + "3.4", + "3.6", + "4.0" + ], + "pull_requests": [ + { + "pr": "19525", + "title": "[FIX] Update Polyfills and fix directory in IE", + "userLogin": "MartinSchoeler", + "milestone": "3.7.2", + "contributors": [ + "MartinSchoeler" + ] + }, + { + "pr": "19348", + "title": "[FIX] Admin not working on IE11", + "userLogin": "ggazzo", + "milestone": "3.7.2", + "contributors": [ + "ggazzo", + "web-flow", + "dougfabris" + ] + }, + { + "pr": "19524", + "title": "[FIX] Channel creation not working on IE", + "userLogin": "MartinSchoeler", + "milestone": "3.7.2", + "contributors": [ + "MartinSchoeler" + ] + }, + { + "pr": "19519", + "title": "[FIX] Custom Emojis PNGs on IE11", + "userLogin": "MartinSchoeler", + "milestone": "3.7.2", + "contributors": [ + "MartinSchoeler" + ] + } + ] } } } \ No newline at end of file diff --git a/.snapcraft/resources/prepareRocketChat b/.snapcraft/resources/prepareRocketChat index b2b303326e446..d8f959ba0277c 100755 --- a/.snapcraft/resources/prepareRocketChat +++ b/.snapcraft/resources/prepareRocketChat @@ -1,6 +1,6 @@ #!/bin/bash -curl -SLf "https://releases.rocket.chat/3.7.1/download/" -o rocket.chat.tgz +curl -SLf "https://releases.rocket.chat/3.7.2/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 9e9a2f4001842..eb4add4efb069 100644 --- a/.snapcraft/snap/snapcraft.yaml +++ b/.snapcraft/snap/snapcraft.yaml @@ -7,7 +7,7 @@ # 5. `snapcraft snap` name: rocketchat-server -version: 3.7.1 +version: 3.7.2 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 98b7aaa4aaf3c..c4d9d90894f31 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -1,4 +1,30 @@ +# 3.7.2 +`2020-11-13 ยท 4 ๐Ÿ› ยท 3 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` + +### Engine versions +- Node: `12.18.4` +- NPM: `6.14.8` +- MongoDB: `3.4, 3.6, 4.0` +- Apps-Engine: `1.18.0` + +### ๐Ÿ› Bug fixes + + +- Admin not working on IE11 ([#19348](https://github.com/RocketChat/Rocket.Chat/pull/19348)) + +- Channel creation not working on IE ([#19524](https://github.com/RocketChat/Rocket.Chat/pull/19524)) + +- Custom Emojis PNGs on IE11 ([#19519](https://github.com/RocketChat/Rocket.Chat/pull/19519)) + +- Update Polyfills and fix directory in IE ([#19525](https://github.com/RocketChat/Rocket.Chat/pull/19525)) + +### ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป Core Team ๐Ÿค“ + +- [@MartinSchoeler](https://github.com/MartinSchoeler) +- [@dougfabris](https://github.com/dougfabris) +- [@ggazzo](https://github.com/ggazzo) + # 3.7.1 `2020-10-09 ยท 6 ๐Ÿ› ยท 5 ๐Ÿ‘ฉโ€๐Ÿ’ป๐Ÿ‘จโ€๐Ÿ’ป` diff --git a/app/emoji-custom/server/startup/emoji-custom.js b/app/emoji-custom/server/startup/emoji-custom.js index 8110fc0667eea..8decb068ea1ed 100644 --- a/app/emoji-custom/server/startup/emoji-custom.js +++ b/app/emoji-custom/server/startup/emoji-custom.js @@ -104,6 +104,8 @@ Meteor.startup(function() { } if (/^svg$/i.test(params.emoji.split('.').pop())) { res.setHeader('Content-Type', 'image/svg+xml'); + } else if (/^png$/i.test(params.emoji.split('.').pop())) { + res.setHeader('Content-Type', 'image/png'); } else { res.setHeader('Content-Type', 'image/jpeg'); } diff --git a/app/ui/client/views/app/createChannel.html b/app/ui/client/views/app/createChannel.html index 07114f490cd5f..752d3a98e3b59 100644 --- a/app/ui/client/views/app/createChannel.html +++ b/app/ui/client/views/app/createChannel.html @@ -125,10 +125,10 @@ {{> tokenpass extensionsConfig}} {{/if}} {{/if}} +
+ +
-
- -
{{#each roomType in roomTypesAfterStandard}}
diff --git a/app/utils/rocketchat.info b/app/utils/rocketchat.info index 63ac3aa3f647d..5e2f7d1eabd27 100644 --- a/app/utils/rocketchat.info +++ b/app/utils/rocketchat.info @@ -1,3 +1,3 @@ { - "version": "3.7.1" + "version": "3.7.2" } diff --git a/client/polyfills/index.js b/client/polyfills/index.js index 472e672e0bfc8..b871e4139d366 100644 --- a/client/polyfills/index.js +++ b/client/polyfills/index.js @@ -6,3 +6,18 @@ import './cssVars'; Object.fromEntries = Object.fromEntries || function fromEntries(iterable) { return [...iterable].reduce((obj, { 0: key, 1: val }) => Object.assign(obj, { [key]: val }), {}); }; +(function(arr) { + arr.forEach(function(item) { + if (item.hasOwnProperty('remove')) { + return; + } + Object.defineProperty(item, 'remove', { + configurable: true, + enumerable: true, + writable: true, + value: function remove() { + this.parentNode.removeChild(this); + }, + }); + }); +}([Element.prototype, CharacterData.prototype, DocumentType.prototype])); diff --git a/package-lock.json b/package-lock.json index 03395abbc3605..f4632bfe2228d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "Rocket.Chat", - "version": "3.7.1", + "version": "3.7.2", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -5098,13 +5098,15 @@ } }, "@rocket.chat/fuselage-polyfills": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-polyfills/-/fuselage-polyfills-0.14.1.tgz", - "integrity": "sha512-DjMwnT+jgnNb0LSLPjW95YEEdFRehURpSqkg938BpEIiHF8DPbMtkDuro9nNblZ8i+1+iGFj8SQE5PSsukWlpg==", + "version": "0.17.2", + "resolved": "https://registry.npmjs.org/@rocket.chat/fuselage-polyfills/-/fuselage-polyfills-0.17.2.tgz", + "integrity": "sha512-aiO2JH4Ze0mgLWNB/+oT5/IMCIqg1tZOVT5G9mjy+DdHhX/h1LrnpjY3ZZPcmiz6qREpdwAZnwS0RTc+kqCQQQ==", "requires": { "@juggle/resize-observer": "^3.1.2", - "clipboard-polyfill": "^2.8.6", - "focus-visible": "^5.0.2" + "clipboard-polyfill": "^3.0.1", + "element-closest-polyfill": "^1.0.2", + "focus-visible": "^5.0.2", + "focus-within-polyfill": "^5.1.0" } }, "@rocket.chat/fuselage-tokens": { @@ -13374,9 +13376,9 @@ } }, "clipboard-polyfill": { - "version": "2.8.6", - "resolved": "https://registry.npmjs.org/clipboard-polyfill/-/clipboard-polyfill-2.8.6.tgz", - "integrity": "sha512-kz/1ov+PXsBpGnW9XJH3dLWdYj12FpXqO89Dngm/GRPoI36E/tnYs6N0YPTEhxM9WHAlFiN5eoyIVuv5nzKXvg==" + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/clipboard-polyfill/-/clipboard-polyfill-3.0.1.tgz", + "integrity": "sha512-R/uxBa8apxLJArzpFpuTLqavUcnEX8bezZKSuqkwz7Kny2BmxyKDslYGdrKiasKuD+mU1noF7Lkt/p5pyDqFoQ==" }, "cliui": { "version": "5.0.0", @@ -15899,6 +15901,11 @@ "integrity": "sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4=", "dev": true }, + "element-closest-polyfill": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/element-closest-polyfill/-/element-closest-polyfill-1.0.2.tgz", + "integrity": "sha512-+3cNhtv8YIyk/oDSlBv+zqUjQFcF9puLp4TFIk2w0Gqd6IL2uZnnu0jvDdOaI7dsK1bIA9gG69KIvkEyUFVGRg==" + }, "element-resize-detector": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.1.tgz", @@ -17582,9 +17589,14 @@ "dev": true }, "focus-visible": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/focus-visible/-/focus-visible-5.2.0.tgz", + "integrity": "sha512-Rwix9pBtC1Nuy5wysTmKy+UjbDJpIfg8eHjw0rjZ1mX4GNLz1Bmd16uDpI3Gk1i70Fgcs8Csg2lPm8HULFg9DQ==" + }, + "focus-within-polyfill": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/focus-visible/-/focus-visible-5.1.0.tgz", - "integrity": "sha512-nPer0rjtzdZ7csVIu233P2cUm/ks/4aVSI+5KUkYrYpgA7ujgC3p6J7FtFU+AIMWwnwYQOB/yeiOITxFeYIXiw==" + "resolved": "https://registry.npmjs.org/focus-within-polyfill/-/focus-within-polyfill-5.1.0.tgz", + "integrity": "sha512-u944FX2NsX5nhCi3jsXcWkUcPAekvFHnhl5+OQJZvZeRamPXhQxwvOVs1ordzyIaP7sc+cW3PU7z1fDKPYM9+A==" }, "follow-redirects": { "version": "1.5.10", diff --git a/package.json b/package.json index 827c87fcec1b7..18e1daaa976c9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "Rocket.Chat", "description": "The Ultimate Open Source WebChat Platform", - "version": "3.7.1", + "version": "3.7.2", "author": { "name": "Rocket.Chat", "url": "https://rocket.chat/" @@ -134,7 +134,7 @@ "@rocket.chat/css-in-js": "^0.14.1", "@rocket.chat/fuselage": "^0.14.1", "@rocket.chat/fuselage-hooks": "^0.14.1", - "@rocket.chat/fuselage-polyfills": "^0.14.1", + "@rocket.chat/fuselage-polyfills": "^0.17.0", "@rocket.chat/fuselage-ui-kit": "^0.14.1", "@rocket.chat/icons": "^0.14.1", "@rocket.chat/mp3-encoder": "^0.14.1",