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 3.2.0-develop #17241

Merged
merged 51 commits into from
Apr 10, 2020
Merged

Merge master into develop & Set version to 3.2.0-develop #17241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
951a06e
Bump version to 3.1.0-rc.0
sampaiodiego Mar 26, 2020
b691b84
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Mar 26, 2020
8dbb0d2
Bump version to 3.1.0-rc.1
sampaiodiego Mar 26, 2020
092237b
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Mar 29, 2020
98bd8c9
Bump version to 3.1.0-rc.2
sampaiodiego Mar 29, 2020
f8be79d
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Mar 30, 2020
8f9a855
Bump version to 3.1.0-rc.3
sampaiodiego Mar 30, 2020
53b39e6
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Mar 31, 2020
66c82df
Bump version to 3.1.0-rc.4
sampaiodiego Mar 31, 2020
2bc1714
[FIX] Apps Engine notifyRoom sending notification to wrong users (#17…
sampaiodiego Mar 31, 2020
fd07bcf
Bump version to 3.0.9
sampaiodiego Mar 31, 2020
b7f307d
Merge pull request #17094 from RocketChat/release-3.0.9
sampaiodiego Mar 31, 2020
9e68420
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Mar 31, 2020
6ce901d
Bump version to 3.1.0-rc.5
sampaiodiego Mar 31, 2020
2b490d7
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Mar 31, 2020
f4f4ff9
Bump version to 3.1.0-rc.6
sampaiodiego Mar 31, 2020
5348895
[FIX] Federation delete room event not being dispatched (#16861)
1rV1N-git Apr 1, 2020
ccec102
[FIX] Federation Event ROOM_ADD_USER not being dispatched (#16878)
1rV1N-git Apr 1, 2020
1b5cff1
Add User’s index for field `appId` (#17075)
rodrigok Mar 30, 2020
b95fd14
Regression: Do not refresh statistics when opening the info panel (#1…
rodrigok Mar 28, 2020
4edc566
[IMPROVE] Apps Engine: Reduce some stream calls and remove a find use…
d-gubert Apr 1, 2020
50652d1
New Troubleshoot section for disabling features (#17114)
rodrigok Apr 1, 2020
9fbef43
Bump version to 3.0.10
sampaiodiego Apr 1, 2020
f84e082
Merge pull request #17126 from RocketChat/release-3.0.10
sampaiodiego Apr 1, 2020
64feaf3
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Apr 2, 2020
f960d33
Bump version to 3.1.0-rc.7
sampaiodiego Apr 2, 2020
e04da25
New metric to track oplog queue (#17142)
rodrigok Apr 3, 2020
d418626
[FIX] Option BYPASS_OPLOG_VALIDATION not working (#17143)
rodrigok Apr 3, 2020
5de6322
[FIX] Omnichannel endpoint `inquiries.getOne` returning only queued i…
renatobecker Apr 2, 2020
075570b
Bump version to 3.0.11
sampaiodiego Apr 3, 2020
18bdefa
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Apr 3, 2020
8ff674e
Bump version to 3.1.0-rc.8
sampaiodiego Apr 3, 2020
5fbbc7d
Merge pull request #17148 from RocketChat/release-3.0.11
sampaiodiego Apr 3, 2020
e06fe70
Fix: Error message on startup of multiple instances related to the me…
rodrigok Apr 3, 2020
9675424
Fix: Missing checks for Troubleshoot > Disable Notifications (#17155)
rodrigok Apr 3, 2020
07ca30a
Bump version to 3.0.12
sampaiodiego Apr 3, 2020
15ac767
Merge pull request #17158 from RocketChat/release-3.0.12
sampaiodiego Apr 3, 2020
20d1ff0
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Apr 7, 2020
7c93bd3
Bump version to 3.1.0-rc.9
sampaiodiego Apr 7, 2020
7330a56
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Apr 7, 2020
0c13251
Bump version to 3.1.0-rc.10
sampaiodiego Apr 7, 2020
9d8a647
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Apr 8, 2020
090dbee
Bump version to 3.1.0-rc.11
sampaiodiego Apr 8, 2020
b0af779
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Apr 9, 2020
b97e214
Bump version to 3.1.0-rc.12
sampaiodiego Apr 9, 2020
f369846
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Apr 9, 2020
8f2e89e
Bump version to 3.1.0-rc.13
sampaiodiego Apr 9, 2020
057b695
Merge remote-tracking branch 'origin/release-candidate' into release-…
sampaiodiego Apr 9, 2020
f07507b
Bump version to 3.1.0
sampaiodiego Apr 9, 2020
dd9b1a1
Merge pull request #17240 from RocketChat/release-3.1.0
sampaiodiego Apr 10, 2020
1ace460
Bump version to 3.2.0-develop
sampaiodiego Apr 10, 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.1.0-develop
ENV RC_VERSION 3.2.0-develop

MAINTAINER buildmaster@rocket.chat

Expand Down
Loading