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

Merge master into develop & Set version to 0.70.0-develop #11921

Merged
merged 37 commits into from
Aug 31, 2018
Merged

Merge master into develop & Set version to 0.70.0-develop #11921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
abfe38c
[FIX] HipChat importer wasn’t compatible with latest exports (#11597)
rodrigok Jul 31, 2018
ef8a9e3
[FIX] Jump to message search result action (#11613)
tassoevan Jul 30, 2018
59d92e9
Updated icon assets
engelgabriel Jul 27, 2018
499ff2e
Bump version to 0.68.1
sampaiodiego Jul 31, 2018
0e00032
Merge pull request #11616 from RocketChat/release-0.68.1
sampaiodiego Jul 31, 2018
5584fb6
[FIX] Incorrect migration version in v130.js (#11544)
c0dzilla Aug 1, 2018
e383105
Bump version to 0.68.2
sampaiodiego Aug 1, 2018
960b893
Merge pull request #11630 from RocketChat/release-0.68.2
sampaiodiego Aug 1, 2018
b1d1305
[FIX] SAML login not working when user has multiple emails (#11642)
Hudell Aug 2, 2018
4b27388
[FIX] Prune translation on room info panel (#11635)
sampaiodiego Aug 1, 2018
e3b4461
[FIX] Prune translations in German (#11631)
rndmh3ro Aug 1, 2018
b94badc
[FIX] User info APIs not returning customFields correctly (#11625)
MarcosSpessatto Aug 1, 2018
730022e
[FIX] Missing chat history for users without permission `preview-c-ro…
Hudell Aug 1, 2018
6f8f90f
Bump version to 0.68.3
sampaiodiego Aug 2, 2018
90be09e
Merge pull request #11650 from RocketChat/release-0.68.3
sampaiodiego Aug 2, 2018
e3df820
[FIX] Regression in prune by user, and update lastMessage (#11646)
vynmera Aug 7, 2018
c90dd6b
Merge pull request #11708 from RocketChat/fix-setup-wizard-logo
tassoevan Aug 8, 2018
224c76e
[FIX] Default server language not being applied (#11719)
sampaiodiego Aug 10, 2018
8dad048
Bump version to 0.68.4
sampaiodiego Aug 10, 2018
200a6b0
Merge pull request #11743 from RocketChat/release-0.68.4
sampaiodiego Aug 10, 2018
5e30341
Bump version to 0.69.0-rc.0
sampaiodiego Aug 21, 2018
85d70e1
[FIX] Livechat open room method (#11830)
renatobecker Aug 20, 2018
40779b3
Bump version to 0.68.5
sampaiodiego Aug 23, 2018
e412d01
Merge pull request #11852 from RocketChat/release-0.68.5
sampaiodiego Aug 23, 2018
31e7381
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Aug 28, 2018
19f6ec7
Bump version to 0.69.0-rc.1
sampaiodiego Aug 28, 2018
43ae6f2
Merge remote-tracking branch 'origin/release-candidate' into release-…
sampaiodiego Aug 28, 2018
0428ec7
Bump version to 0.69.0
sampaiodiego Aug 28, 2018
79e53f9
Merge pull request #11881 from RocketChat/release-0.69.0
sampaiodiego Aug 28, 2018
b5b42b6
[FIX] Duplicated message buttons (#11853)
ubarsaiyan Aug 31, 2018
2cd3958
[FIX] App updates were not being shown correctly (#11893)
rodrigok Aug 31, 2018
02bc5ec
[FIX] Hipchat importer was not importing users without emails and upl…
rodrigok Aug 31, 2018
4c7af7b
[FIX] Hipchat import was failing when importing messages from a non e…
rodrigok Aug 31, 2018
025c709
Bump version to 0.69.1
sampaiodiego Aug 31, 2018
ed7ab02
Merge pull request #11918 from RocketChat/release-0.69.1
sampaiodiego Aug 31, 2018
470157c
Merge remote-tracking branch 'origin/master' into develop-sync
sampaiodiego Aug 31, 2018
90c9c83
Bump version to 0.70.0-develop
sampaiodiego Aug 31, 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.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.69.0-develop
ENV RC_VERSION 0.70.0-develop

MAINTAINER buildmaster@rocket.chat

Expand Down
Loading