Skip to content

Commit

Permalink
Merge remote-tracking branch 'rocketchat/master'
Browse files Browse the repository at this point in the history
* rocketchat/master: (134 commits)
  Bump version to 3.12.0
  Bump version to 3.12.0-rc.4
  Revert config ignoreUndefined
  Bump version to 3.12.0-rc.3
  Fix lint
  Security Fixes
  Bump version to 3.12.0-rc.2
  [FIX] Admin Panel pages not visible in Safari (RocketChat#20912)
  Update Apps-Engine version (RocketChat#20921)
  Regression: Messages not being encrypted E2E (RocketChat#20922)
  Fix: Add network observe plug to snap (RocketChat#20852)
  Language update from LingoHub 🤖 (RocketChat#20853)
  Added types to Emitters (RocketChat#20819)
  Bump version to 3.12.0-rc.1
  Regression: Fix scopes not being provided to getWorkspaceAccessToken (RocketChat#20871)
  Regression: Keep user custom status after change presence (RocketChat#20869)
  [FIX] Markdown prop variants (RocketChat#20767)
  [FIX] Open Visitor Info when omnichannel chat was open (RocketChat#20868)
  Regression: Prevent Message Attachment rendering (RocketChat#20860)
  [FIX] Download buttons on desktop app and CDN being ignored (RocketChat#20820)
  ...
  • Loading branch information
Dinh Van Hoang committed Mar 2, 2021
2 parents cd137d6 + 7551a16 commit ed72a17
Show file tree
Hide file tree
Showing 303 changed files with 14,636 additions and 6,982 deletions.
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/ubi8/nodejs-12

ENV RC_VERSION 3.11.1
ENV RC_VERSION 3.12.0

MAINTAINER buildmaster@rocket.chat

Expand Down
7 changes: 7 additions & 0 deletions .github/history-manual.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,12 @@
"contributors": [
"sampaiodiego"
]
}],
"3.12.0-rc.3": [{
"title": "[FIX] Security Hotfix (https://docs.rocket.chat/guides/security/security-updates)",
"userLogin": "sampaiodiego",
"contributors": [
"sampaiodiego"
]
}]
}
Loading

0 comments on commit ed72a17

Please sign in to comment.