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.0.0-develop #13435

Merged
merged 41 commits into from
Feb 12, 2019
Merged

Merge master into develop & Set version to 1.0.0-develop #13435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
d9765a7
Fix default importer path (#13045)
sampaiodiego Dec 28, 2018
ba1f1b4
Regression: Get room's members list not working on MongoDB 3.2 (#13051)
sampaiodiego Dec 28, 2018
e707f7a
Execute tests with versions 3.2, 3.4, 3.6 and 4.0 of MongoDB (#13049)
rodrigok Dec 28, 2018
c413a57
Bump version to 0.73.1
rodrigok Dec 28, 2018
1ddf838
Merge pull request #13052 from RocketChat/release-0.73.1
sampaiodiego Dec 29, 2018
ef0ae41
[NEW] Cloud Integration (#13013)
graywolf336 Jan 7, 2019
26b7722
Bump version to 0.73.2
sampaiodiego Jan 7, 2019
8ff0e3d
Merge pull request #13086 from RocketChat/release-0.73.2
sampaiodiego Jan 7, 2019
b22f3b5
[FIX] Few polish translating (#13112)
theundefined Jan 20, 2019
0adb1f7
Bump version to 0.74.0-rc.0
sampaiodiego Jan 20, 2019
21ac61e
Regression: Fix message pinning (#13213)
TkTech Jan 22, 2019
f3ec143
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Jan 22, 2019
af43505
Bump version to 0.74.0-rc.1
sampaiodiego Jan 22, 2019
8fe4b61
Merge remote-tracking branch 'origin/develop' into release-candidate
sampaiodiego Jan 28, 2019
f21d6b2
Bump version to 0.74.0-rc.2
sampaiodiego Jan 28, 2019
71ba09c
Merge remote-tracking branch 'origin/release-candidate' into release-…
sampaiodiego Jan 28, 2019
89c4dbd
Bump version to 0.74.0
sampaiodiego Jan 28, 2019
cc5391e
Merge pull request #13270 from RocketChat/release-0.74.0
sampaiodiego Jan 28, 2019
df4074e
[FIX] Fix bug when user try recreate channel or group with same name …
MarcosSpessatto Jan 29, 2019
56c4d80
Fix: Missing export in cloud package (#13282)
geekgonecrazy Jan 29, 2019
8ab3416
Add parseUrls field to the apps message converter (#13248)
d-gubert Jan 29, 2019
d0c0644
[NEW] Collect data for Monthly/Daily Active Users for a future dashbo…
renatobecker Jan 30, 2019
77fb258
[FIX] HipChat Enterprise importer fails when importing a large amount…
Hudell Jan 30, 2019
ac1ed8e
[FIX] Preview of image uploads were not working when apps framework i…
rodrigok Jan 31, 2019
7ab34af
[FIX] REST endpoint for creating custom emojis (#13306)
sampaiodiego Feb 1, 2019
be37ef3
[FIX] Message updating by Apps (#13294)
sampaiodiego Feb 1, 2019
6fb5b00
[FIX] Hipchat Enterprise Importer not generating subscriptions (#13293)
Hudell Feb 1, 2019
bb9b51e
[NEW] REST endpoint to forward livechat rooms (#13308)
renatobecker Feb 1, 2019
50765cb
[FIX] Mobile view and re-enable E2E tests (#13322)
sampaiodiego Feb 1, 2019
0bcf78d
[NEW] Limit all DDP/Websocket requests (configurable via admin panel)…
rodrigok Feb 1, 2019
cb6a69b
Bump version to 0.74.1
sampaiodiego Feb 1, 2019
47a7463
Merge pull request #13323 from RocketChat/release-0.74.1
sampaiodiego Feb 1, 2019
57f359e
Fix missing param for cloud token (#13350)
geekgonecrazy Feb 5, 2019
772e856
Unhide uniqueID setting (#13342)
sampaiodiego Feb 5, 2019
ef88185
fix batchSet settings (#13349)
ggazzo Feb 5, 2019
5ff952e
[FIX] Rate Limiter was limiting communication between instances (#13326)
rodrigok Feb 5, 2019
0130d2e
Bump version to 0.74.2
sampaiodiego Feb 5, 2019
5fb5e57
Merge pull request #13364 from RocketChat/release-0.74.2
sampaiodiego Feb 5, 2019
a07c8e9
Merge remote-tracking branch 'origin/master' into develop-sync
sampaiodiego Feb 11, 2019
7da1672
Bump version to 1.0.0-develop
sampaiodiego Feb 11, 2019
9aa03b4
Merge branch 'develop' into develop-sync
engelgabriel Feb 11, 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 0.74.0-develop
ENV RC_VERSION 1.0.0-develop

MAINTAINER buildmaster@rocket.chat

Expand Down
Loading