Skip to content
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

Jump to bottom

Merge master into develop & Set version to 2.1.0-develop #15357

Merged
merged 28 commits into from
Sep 12, 2019
Merged

Merge master into develop & Set version to 2.1.0-develop #15357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
18009ee
[FIX] Direct Message names not visible on Admin panel (#15114)
ggazzo Aug 7, 2019
47cf06d
[FIX] Custom emoji limit table scroll (#15119)
ggazzo Aug 7, 2019
d1372d7
Fix custom auth (#15141)
MarcosSpessatto Aug 8, 2019
fbdb7d7
Bump version to 1.3.1
sampaiodiego Aug 8, 2019
63bb25e
Merge pull request #15148 from RocketChat/release-1.3.1
sampaiodiego Aug 9, 2019
8f672b6
Update latest Livechat widget version(1.1.3) (#15154)
renatobecker Aug 12, 2019
af0bcc8
Update latest Livechat widget version to 1.1.4 (#15173)
renatobecker Aug 13, 2019
3be728b
[FIX] IE11 - callback createTreeWalker doesnt accept acceptNo… (#15157)
ggazzo Aug 13, 2019
15b8579
[FIX] search messages scroll (#15175)
ggazzo Aug 13, 2019
f17e9a8
[FIX] Attachment download button behavior (#15172)
tassoevan Aug 13, 2019
e6be2a9
Bump version to 1.3.2
sampaiodiego Aug 13, 2019
2289486
Merge pull request #15176 from RocketChat/release-1.3.2
sampaiodiego Aug 14, 2019
53d0aa3
Bump version to 2.0.0-rc.0
sampaiodiego Aug 21, 2019
db870c8
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Aug 23, 2019
61c5388
Bump version to 2.0.0-rc.1
sampaiodiego Aug 23, 2019
3042a3e
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Aug 28, 2019
6dc57e1
Bump version to 2.0.0-rc.2
sampaiodiego Aug 28, 2019
3a5c818
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Sep 10, 2019
0f43330
Bump version to 2.0.0-rc.3
sampaiodiego Sep 10, 2019
9362cf1
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Sep 12, 2019
73bfe73
Bump version to 2.0.0-rc.4
sampaiodiego Sep 12, 2019
04535fa
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Sep 12, 2019
056fc30
Bump version to 2.0.0-rc.5
sampaiodiego Sep 12, 2019
cd8c3c3
Remove wrong items on history.json file
sampaiodiego Sep 12, 2019
67593f7
Merge remote-tracking branch 'origin/release-candidate' into release-…
sampaiodiego Sep 12, 2019
370d4a6
Bump version to 2.0.0
sampaiodiego Sep 12, 2019
92c00dc
Merge pull request #15350 from RocketChat/release-2.0.0
sampaiodiego Sep 12, 2019
cce0274
Bump version to 2.1.0-develop
sampaiodiego Sep 12, 2019
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 2.0.0-develop
ENV RC_VERSION 2.1.0-develop

MAINTAINER buildmaster@rocket.chat

Expand Down
Loading