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 1.2.0-develop #14656

Merged
merged 33 commits into from
May 29, 2019
Merged

Merge master into develop & Set version to 1.2.0-develop #14656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
31f08cd
[FIX] Remove reference to inexistent field when deleting message in t…
tassoevan Apr 29, 2019
f3f7f34
[Fix] group name appears instead of the room id (#14075)
mohamedar97 Apr 29, 2019
9c62004
[FIX] show roles on message (#14313)
ggazzo Apr 29, 2019
95a54ba
Coerces the MongoDB version string before checking its range satisfac…
Apr 29, 2019
c086c8b
Fixes #14300 (#14301)
knrt10 Apr 29, 2019
6dd14cc
Fix View Logs admin page (#14316)
tassoevan Apr 29, 2019
b2062b6
Update new Permissions rules in en.i18n.json (#14009) (#14011)
shiqimei Apr 29, 2019
38c963c
[i18n] Update German strings (#14182)
AnBo83 Apr 29, 2019
610c03f
Add cross-browser select arrow positioning (#14318)
tassoevan Apr 30, 2019
c46f611
[IMPROVE] Better error message when not able to get MongoDB Version (…
rodrigok Apr 30, 2019
2210947
[FIX] New day separator rendered over thread reply (#14328)
rodrigok Apr 30, 2019
7fb88e6
[FIX] Duplicate thread message after editing (#14330)
ggazzo Apr 30, 2019
5236774
Improve i18n of threads and discussion buttons (#14334)
sampaiodiego Apr 30, 2019
641d233
Fix audio notification for messages on DM (#14336)
sampaiodiego Apr 30, 2019
115835b
fix (#14338)
ggazzo Apr 30, 2019
5cf93be
Bump version to 1.0.2
rodrigok Apr 30, 2019
abf67ce
Merge pull request #14339 from RocketChat/release-1.0.2
rodrigok Apr 30, 2019
f19473c
Release 1.0.3 (#14446)
rodrigok May 10, 2019
b0ba19a
Bump version to 1.1.0-rc.0
sampaiodiego May 21, 2019
e14ff00
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego May 21, 2019
d64d790
Bump version to 1.1.0-rc.1
sampaiodiego May 21, 2019
cfe9388
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego May 22, 2019
6588baf
Bump version to 1.1.0-rc.2
sampaiodiego May 22, 2019
8d4480a
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego May 24, 2019
6acf91a
Bump version to 1.1.0-rc.3
sampaiodiego May 24, 2019
0dc26f7
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego May 25, 2019
cb1e6db
Bump version to 1.1.0-rc.4
sampaiodiego May 25, 2019
8d89d20
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego May 28, 2019
57204d2
Bump version to 1.1.0-rc.5
sampaiodiego May 28, 2019
4a191e0
Merge remote-tracking branch 'origin/release-candidate' into release-…
sampaiodiego May 28, 2019
3a7c871
Bump version to 1.1.0
sampaiodiego May 28, 2019
484ee10
Merge pull request #14653 from RocketChat/release-1.1.0
sampaiodiego May 28, 2019
4a2ffa1
Bump version to 1.2.0-develop
sampaiodiego May 28, 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 1.1.0-develop
ENV RC_VERSION 1.2.0-develop

MAINTAINER buildmaster@rocket.chat

Expand Down
Loading