Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .docker/Dockerfile.rhel
Original file line number Diff line number Diff line change
@@ -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

Expand Down
50 changes: 50 additions & 0 deletions .github/history.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
]
}
}
}
2 changes: 1 addition & 1 deletion .snapcraft/resources/prepareRocketChat
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion .snapcraft/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
26 changes: 26 additions & 0 deletions HISTORY.md
Original file line number Diff line number Diff line change
@@ -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 👩‍💻👨‍💻`

Expand Down
2 changes: 2 additions & 0 deletions app/emoji-custom/server/startup/emoji-custom.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
Expand Down
6 changes: 3 additions & 3 deletions app/ui/client/views/app/createChannel.html
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,10 @@
{{> tokenpass extensionsConfig}}
{{/if}}
{{/if}}
<div class="create-channel__inputs">
<input form='create-channel' class="rc-button rc-button--primary" type='submit' data-button="create" {{createIsDisabled}} value="{{_ "Create"}}" />
</div>
</form>
<div class="create-channel__inputs">
<input form='create-channel' class="rc-button rc-button--primary" type='submit' data-button="create" {{createIsDisabled}} value="{{_ "Create"}}" />
</div>
</div>
{{#each roomType in roomTypesAfterStandard}}
<div class="room-type-creation">
Expand Down
2 changes: 1 addition & 1 deletion app/utils/rocketchat.info
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"version": "3.7.1"
"version": "3.7.2"
}
15 changes: 15 additions & 0 deletions client/polyfills/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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]));
34 changes: 23 additions & 11 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -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/"
Expand Down Expand Up @@ -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",
Expand Down