[Upstream Catchup] Merge RC:master to develop_pwa #421
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merge master into develop & Set version to 3.7.0-develop
* Update Meteor to 1.11 * Update Node version * Fix livechat view creation
Manual push by LingoHub User: Diego Sampaio. Project: Rocket.Chat Made with ❤️ by https://lingohub.com Co-authored-by: Diego Sampaio <chinello@gmail.com>
Replace [Nom du site] by [Site_Name]...
Co-authored-by: Guilherme Gazzo <guilherme@gazzo.xyz>
* Remember users' 2FA right after registration * Change register server to false by default
* Remember users' 2FA right after registration * Change register server to false by default
* fixed message sending, you should not filter the domains, specially filter by only the local origin/source * Fixing callback registration * Increased the rate limiting
…m Apps (RocketChat#19002) * Allow specify the encoding of the response data * Update Apps-Engine version Co-authored-by: Douglas Gubert <douglas.gubert@gmail.com> Co-authored-by: Douglas Gubert <d-gubert@users.noreply.github.com>
…tChat#18995) * [FIX] [Apps] Fix app user doesn't has permission to upload files * Fix errorClass [Error]: Forbidden [forbidden] In `app/file-upload/lib/FileUploadBase.js`, we configured `UploadFS.config.defaultStorePermissions`, which validates `insert(userId, doc)` etc. But the parameter userId cann't be always obtained by this validation method correctly (sometimes it's undefined). Meteor use the Meteor.userId() as its fallback option. So we can wrap the original call with `Meteor.runAsUser` to solve issue. * Add a new validator into canAccessRoom canAccessRoom (`app/authorization/server/functions/canAccessRoom.js`) is an essential validator for Rocket.Chat to check whether some user has permissions to access some room. In this PR, we added a new validator that allows app users to access any room on a Rocket.Chat server even if it is not a member of the room. * An attempt to fix Meteor code must always run within a Fiber Error Original Error: "Error: Meteor code must always run within a Fiber. Try wrapping callbacks that you pass to non-Meteor libraries with Meteor.bindEnvironment." * Add support for uploading files by a livecaht visitor * Support upload files with livechat visitors * Reduce an unnecessary DB query - Users.findOneById * Move the "bypass" out of canAccessRoom Adding a bypass inside canAccessRoom can potentially allow apps to do stuff we're not prepared (yet) * Update Apps-Engine version * Some refactoring * Fix a rateada Co-authored-by: Douglas Gubert <douglas.gubert@gmail.com>
…he App Settings (RocketChat#19005) Co-authored-by: Douglas Gubert <d-gubert@users.noreply.github.com>
Shailesh351
approved these changes
Oct 5, 2020
Shailesh351
left a comment
Shailesh351
left a comment
There was a problem hiding this comment.
Looks good to me. Working fine locally ✅
|
thanks @Shailesh351 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Weekly Catchup PR to merge RC:master in develop_pwa.