Skip to content

Merge master into develop & Set version to 3.4.0-develop #17764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sampaiodiego merged 27 commits into from
Jun 1, 2020
Merged

Merge master into develop & Set version to 3.4.0-develop #17764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
28fea82
[FIX] LDAP login error on Enterprise version (#17497)
pierre-lehnen-rc Apr 30, 2020
2be4b2c
Update Apps Engine to final release
sampaiodiego May 1, 2020
e783498
Bump version to 3.2.1
sampaiodiego May 1, 2020
485be3b
Merge pull request #17506 from RocketChat/release-3.2.1
sampaiodiego May 1, 2020
4c34378
[FIX] Reactions may present empty names of who reacted when using Rea…
rodrigok May 5, 2020
456e135
[FIX] Emoji picker search broken (#17570)
ggazzo May 8, 2020
7693020
[FIX] Error during data export for DMs (#17577)
May 8, 2020
6cfb448
[FIX] Email configs not updating after setting changes (#17578)
rodrigok May 8, 2020
34ed2a8
[FIX] Login Forbidden on servers that had LDAP enabled in the past (#…
pierre-lehnen-rc May 8, 2020
1bbe74d
[FIX] LDAP login on Enteprise Version (#17508)
pierre-lehnen-rc May 8, 2020
1b9648f
[FIX] Push settings enabled when push gateway is selected (#17582)
geekgonecrazy May 8, 2020
47d0935
Bump version to 3.2.2
sampaiodiego May 11, 2020
a720d25
Merge pull request #17600 from RocketChat/release-3.2.2
sampaiodiego May 11, 2020
bdcac83
[FIX] Slack importer Link handling (#17595)
lpilz May 19, 2020
9575d1e
Bump version to 3.3.0-rc.0
sampaiodiego May 21, 2020
91928ec
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego May 22, 2020
705ea6d
Bump version to 3.3.0-rc.1
sampaiodiego May 22, 2020
af54767
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego May 22, 2020
83b5f44
Bump version to 3.3.0-rc.2
sampaiodiego May 22, 2020
3b43d19
Merge remote-tracking branch 'origin/develop' into release-candidate
rodrigok May 26, 2020
c152cbf
Bump version to 3.3.0-rc.3
rodrigok May 26, 2020
1dce6e0
Merge remote-tracking branch 'origin/develop' into release-candidate
rodrigok May 27, 2020
e674d7e
Bump version to 3.3.0-rc.4
rodrigok May 27, 2020
abd5ebf
Merge remote-tracking branch 'origin/release-candidate' into release-…
rodrigok May 28, 2020
c98bcbe
Bump version to 3.3.0
rodrigok May 28, 2020
a987295
Merge pull request #17763 from RocketChat/release-3.3.0
rodrigok May 28, 2020
3e31d9e
Bump version to 3.4.0-develop
rodrigok May 28, 2020
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
View file
Open in desktop
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.3.0-develop
ENV RC_VERSION 3.4.0-develop

MAINTAINER [email protected]

Expand Down
Loading