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 0.66.0-develop #10903

Merged
merged 28 commits into from
May 28, 2018
Merged

Merge master into develop & Set version to 0.66.0-develop #10903

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
79c023e
add redhat dockerfile to master (#10408)
geekgonecrazy Apr 10, 2018
05ae7d6
Release 0.63.2 (#10476)
graywolf336 Apr 17, 2018
304bc49
Added one2mail.info to default blocked domain list (#10218)
elaine-jackson Apr 17, 2018
68a2b6d
[FIX] The 'channel.messages' REST API Endpoint error (#10485)
rafaelks Apr 18, 2018
3eeab6e
Bump version to 0.63.3
graywolf336 Apr 19, 2018
4398912
Add the history of v0.63.3
graywolf336 Apr 19, 2018
cbc951c
Merge pull request #10504 from RocketChat/release-0.63.3
graywolf336 Apr 19, 2018
0097258
Bump version to 0.64.0-rc.0
rodrigok Apr 21, 2018
6f50c6c
Merge remote-tracking branch 'origin/develop' into release-candidate
rodrigok Apr 21, 2018
bba44ac
Bump version to 0.64.0-rc.1
rodrigok Apr 21, 2018
4fa3bca
Merge remote-tracking branch 'origin/develop' into release-candidate
rodrigok Apr 24, 2018
71ab8e4
Bump version to 0.64.0-rc.2
rodrigok Apr 24, 2018
42f706b
Merge branch 'develop' into release-candidate
sampaiodiego Apr 24, 2018
198e458
Bump version to 0.64.0-rc.3
sampaiodiego Apr 24, 2018
0942ed3
Merge remote-tracking branch 'origin/develop' into release-candidate
rodrigok Apr 26, 2018
e7e18a7
Bump version to 0.64.0-rc.4
rodrigok Apr 26, 2018
3d5aa6a
Merge remote-tracking branch 'origin/develop' into release-candidate
rodrigok Apr 28, 2018
59f88e2
Bump version to 0.64.0
rodrigok Apr 28, 2018
6dc6c18
Merge remote-tracking branch 'origin/master' into release-0.64.0
rodrigok Apr 28, 2018
2fae79a
Merge pull request #10613 from RocketChat/release-0.64.0
rodrigok Apr 28, 2018
9e42f42
Merge remote-tracking branch 'origin/develop' into release-0.64.1
rodrigok May 3, 2018
f8c99e2
Bump version to 0.64.1
rodrigok May 3, 2018
54738c0
Merge pull request #10660 from RocketChat/release-0.64.1
rodrigok May 3, 2018
105715e
Release 0.64.2 (#10812)
rodrigok May 18, 2018
6d6d8be
Release 0.65.0 (#10893)
rodrigok May 28, 2018
6cd8f34
Merge remote-tracking branch 'origin/master' into develop-sync
rodrigok May 28, 2018
a6436fb
Bump version to 0.66.0-develop
rodrigok May 28, 2018
a8711ad
Update HISTORY.md
rodrigok May 28, 2018
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM rocketchat/base:8

ENV RC_VERSION 0.65.0-develop
ENV RC_VERSION 0.66.0-develop

MAINTAINER buildmaster@rocket.chat

Expand Down
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 0.65.0-develop
ENV RC_VERSION 0.66.0-develop

MAINTAINER buildmaster@rocket.chat

Expand Down
Loading