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.

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

Sync from Master #9796

Merged
merged 59 commits into from
Feb 21, 2018
Merged
Changes from 2 commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
bd83f13
Merge pull request #9262 from RocketChat/hotfix/file-access
rodrigok Dec 28, 2017
e957940
Bump version to 0.60.1
rodrigok Dec 28, 2017
5b1467c
Merge pull request #9272 from RocketChat/hotifx/i18n
rodrigok Dec 28, 2017
8489425
Merge pull request #9274 from RocketChat/fix-livechat-facebook-integr…
rodrigok Dec 29, 2017
66f3f76
Merge pull request #9277 from RocketChat/hotifx/i18n
rodrigok Dec 29, 2017
689a8b3
Bump version to 0.60.2
rodrigok Dec 29, 2017
2149a6c
Merge pull request #9280 from RocketChat/release-0.60.2
rodrigok Dec 29, 2017
70cb8f3
Merge pull request #9285 from HammyHavoc/patch-5
rodrigok Jan 2, 2018
3b05711
Merge pull request #9286 from HammyHavoc/patch-6
rodrigok Jan 2, 2018
b64e5a9
Merge pull request #9289 from HammyHavoc/patch-7
rodrigok Jan 2, 2018
298a7e7
Merge pull request #9290 from HammyHavoc/patch-8
rodrigok Jan 2, 2018
2bb6d88
[FIX] Changed 'Wordpress' to 'WordPress (#9291)
HammyHavoc Jan 2, 2018
aa40d40
[FIX] English language improvements (#9299)
HammyHavoc Jan 2, 2018
5762032
Merge pull request #9309 from RocketChat/hotfix/ldap-import
rodrigok Jan 2, 2018
f070358
Merge pull request #9249 from RocketChat/fix-sidebar-footer-padding
rodrigok Jan 3, 2018
79b1cc2
Merge pull request #9311 from RocketChat/fix-svg-firefox
rodrigok Jan 3, 2018
24a3af0
Merge pull request #9314 from RocketChat/custom-emoji-size-last-message
rodrigok Jan 3, 2018
84453b3
Bump version to 0.60.3
rodrigok Jan 3, 2018
397857e
Merge pull request #9320 from RocketChat/release-0.60.3
rodrigok Jan 3, 2018
f0f90e0
[FIX] LDAP TLS not working in some cases
rodrigok Jan 5, 2018
5d1b628
Merge pull request #9343 from RocketChat/hotfix/ldap-tls
rodrigok Jan 5, 2018
e0041cb
Bump version to 0.60.4-rc.0
rodrigok Jan 5, 2018
e1c93a0
Merge pull request #9346 from RocketChat/hotifx/update-marked
rodrigok Jan 8, 2018
e88265a
Merge pull request #9345 from RocketChat/fix-last-message-height
rodrigok Jan 8, 2018
7b2451d
Merge pull request #9335 from RocketChat/fix-not-updating-last-message
rodrigok Jan 5, 2018
ad498e2
Merge pull request #9330 from RocketChat/fix-announcement-link
rodrigok Jan 8, 2018
fea039b
Merge pull request #9328 from RocketChat/popover-on-safari-ios
rodrigok Jan 8, 2018
fe3a9cb
Bump version to 0.60.4-rc.1
rodrigok Jan 8, 2018
633df9b
Merge pull request #9364 from intwarehq/fix-highlight-setting
rodrigok Jan 10, 2018
df78282
Bump version to 0.60.4
rodrigok Jan 10, 2018
34cd952
Merge pull request #9377 from RocketChat/release-0.60.4
rodrigok Jan 10, 2018
e9d4109
Bump version to 0.61.0-rc.0
rodrigok Jan 21, 2018
90db68b
Merge remote-tracking branch 'origin/develop' into release-candidate
rodrigok Jan 25, 2018
fdd574a
Bump version to 0.61.0-rc.1
rodrigok Jan 25, 2018
be0b14c
Merge remote-tracking branch 'origin/develop' into release-candidate
rodrigok Jan 26, 2018
6ba08fa
Bump version to 0.61.0-rc.2
rodrigok Jan 26, 2018
563a496
Merge remote-tracking branch 'origin/develop' into release-candidate
rodrigok Jan 27, 2018
1325e0c
Merge branch 'release-candidate' into release-0.61.0
rodrigok Jan 27, 2018
ece2f39
Bump version to 0.61.0
rodrigok Jan 27, 2018
0b71e0e
Merge pull request #9533 from RocketChat/release-0.61.0
rodrigok Jan 28, 2018
8400926
Add "There_are_no_applications" Translation for OAuth Apps.
kaialexanderfischer Feb 7, 2018
7860905
Revert "Add "There_are_no_applications" Translation for OAuth Apps."
kaiiiiiiiii Feb 7, 2018
29fdb8d
Revert "Revert "Add "There_are_no_applications" Translation for OAuth…
kaiiiiiiiii Feb 7, 2018
9b1be3c
Optimized translation
kaiiiiiiiii Feb 7, 2018
2c65f2b
Merge pull request #9626 from 0x0000007/master
rodrigok Feb 8, 2018
9401947
Merge pull request #9639 from RocketChat/hotfix/notification
rodrigok Feb 9, 2018
4414600
Merge pull request #9623 from RocketChat/fix-emoji-big
rodrigok Feb 14, 2018
72b62e0
Merge pull request #9640 from RocketChat/fix-facebook-integration
rodrigok Feb 14, 2018
a0a708a
Merge pull request #9067 from 1and1/fix-german-formal-pronouns
rodrigok Feb 14, 2018
dbbb2a7
Merge pull request #9714 from RocketChat/fix-close-livechat-by-visitor
rodrigok Feb 14, 2018
617c426
Merge pull request #9716 from RocketChat/hotfix/gitlab-ending-slash
rodrigok Feb 14, 2018
4b35658
Merge pull request #9720 from RocketChat/fix/quoting-integration-mess…
rodrigok Feb 14, 2018
5a8f979
Bump version to 0.61.1
rodrigok Feb 14, 2018
c620502
Merge pull request #9721 from RocketChat/release-0.61.1
rodrigok Feb 14, 2018
6f8d3fc
Merge pull request #9772 from RocketChat/fix-livechat-start-conversat…
sampaiodiego Feb 20, 2018
5fcbc41
Merge pull request #9776 from RocketChat/fix-emoji-big
sampaiodiego Feb 20, 2018
4d3aacf
Merge pull request #9750 from RocketChat/livechat-general-fixes
rodrigok Feb 17, 2018
c188c20
Bump version to 0.61.2
sampaiodiego Feb 20, 2018
cff389e
Merge pull request #9786 from RocketChat/release-0.61.2
sampaiodiego Feb 20, 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
5 changes: 5 additions & 0 deletions packages/rocketchat-cors/cors.js
Original file line number Diff line number Diff line change
@@ -3,6 +3,11 @@ import _ from 'underscore';

import url from 'url';

import tls from 'tls';
// FIX For TLS error see more here https://github.com/RocketChat/Rocket.Chat/issues/9316
// TODO: Remove after NodeJS fix it, more information https://github.com/nodejs/node/issues/16196 https://github.com/nodejs/node/pull/16853
tls.DEFAULT_ECDH_CURVE = 'auto';

WebApp.rawConnectHandlers.use(Meteor.bindEnvironment(function(req, res, next) {
if (req._body) {
return next();