Skip to content

Merge master into develop & Set version to 3.5.0-develop #18083

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 35 commits into from
Jun 30, 2020
Merged

Merge master into develop & Set version to 3.5.0-develop #18083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
aedce8c
[FIX] Slack importer settings object (#17776)
lpilz Jun 9, 2020
af7b42d
[FIX] Error when re-installing an App (#17789)
d-gubert Jun 2, 2020
f92a193
[FIX] Email link "go to message" being incorrectly escaped (#17803)
sampaiodiego Jun 2, 2020
ee7b467
Update Apps-Engine version (#17804)
d-gubert Jun 2, 2020
3173431
Fix the update check not working (#17809)
graywolf336 Jun 3, 2020
6b48d21
[REGRESSION] Omnichannel visitor forward was applying wrong restricti…
Jun 5, 2020
ae28107
[FIX] Apps room events losing data (#17827)
d-gubert Jun 9, 2020
9e04e14
[FIX] Administration User page blank opening users without email (#17…
dudizilla Jun 5, 2020
d3f68e2
[FIX] Omnichannel message link is broken in email notifications (#17843)
renatobecker Jun 9, 2020
4adb676
[FIX] Logic for room type was inverted in edit panel (#17851) (#17853)
cking-vonix Jun 9, 2020
cc73302
[FIX] SAML LogoutRequest sending wrong NameID (#17860)
pierre-lehnen-rc Jun 9, 2020
16646f9
Bump version to 3.3.1
sampaiodiego Jun 10, 2020
95b46a6
Merge pull request #17865 from RocketChat/release-3.3.1
sampaiodiego Jun 10, 2020
bf9421d
Submit a payload to the release service when a release happens (#17775)
graywolf336 May 28, 2020
90ce6cb
Fix invalid develop payload to release service (#17799)
graywolf336 Jun 1, 2020
9567f0e
Bump version to 3.3.2
sampaiodiego Jun 10, 2020
a089803
Merge pull request #17870 from RocketChat/release-3.3.2
sampaiodiego Jun 10, 2020
9589502
Always initialize CIRCLE_BRANCH env var on CI (#17874)
sampaiodiego Jun 11, 2020
34fdf5c
Bump version to 3.3.3
sampaiodiego Jun 11, 2020
f9553e4
Merge pull request #17875 from RocketChat/release-3.3.3
sampaiodiego Jun 11, 2020
c1244bf
Bump version to 3.4.0-rc.0
sampaiodiego Jun 22, 2020
da1266b
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Jun 23, 2020
6024fdb
Bump version to 3.4.0-rc.1
sampaiodiego Jun 23, 2020
d7b9dfb
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Jun 25, 2020
59da623
Bump version to 3.4.0-rc.2
sampaiodiego Jun 25, 2020
0c17938
Merge remote-tracking branch 'origin/develop' into release-candidate
rodrigok Jun 28, 2020
a065ed5
Bump version to 3.4.0-rc.3
rodrigok Jun 28, 2020
438d580
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Jun 30, 2020
112fc5a
Bump version to 3.4.0-rc.4
sampaiodiego Jun 30, 2020
995d03f
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Jun 30, 2020
667abdc
Bump version to 3.4.0-rc.5
sampaiodiego Jun 30, 2020
ddd284c
Merge remote-tracking branch 'origin/release-candidate' into release-…
sampaiodiego Jun 30, 2020
2f16afc
Bump version to 3.4.0
sampaiodiego Jun 30, 2020
52171c4
Merge pull request #18078 from RocketChat/release-3.4.0
sampaiodiego Jun 30, 2020
0ba0bd0
Bump version to 3.5.0-develop
sampaiodiego Jun 30, 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.4.0-develop
ENV RC_VERSION 3.5.0-develop

MAINTAINER [email protected]

Expand Down
Loading