Merged Upstream develop #61
Merged
Conversation
This file contains 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
…jaditya/Rocket.Chat into service-account-callbacks
…jaditya/Rocket.Chat into service-account-callbacks
…ajaditya/Rocket.Chat into service-account-login
* Prevent errors when allowing anonymous read * getSingleMessage for anonymous users * Fix register user when allow read and write anonymous is enabled * Fix anonymous with sidebar extended as default Co-authored-by: ubergeekzone <ubergeekzone@gmail.com>
* Prevent errors when allowing anonymous read * getSingleMessage for anonymous users * Fix register user when allow read and write anonymous is enabled * Fix anonymous with sidebar extended as default Co-authored-by: ubergeekzone <ubergeekzone@gmail.com>
…itya/Rocket.Chat into service-account-discovery
…Rocket.Chat into service-account-callbacks
[NEW] Service account creation
[NEW] Service account one-tap login
…Rocket.Chat into service-account-discovery
[NEW] Service account directory feature
* Fixes for status message text presence issues Added statusText to several api endpoints Changed statusMessage to statusText since that is what it is called everywhere * Fixed slash command for changing status * Fixed the "name is required" issue * Make sure the status is set blank if selecting a default status... we don't want an "online" status when someone is actually offline! * Fixes display of custom status on the room header * Changed the header of DM rooms to query the server for the user status text when it is not found on the internal collection * Changed Custom Status methods to check if the user is logged in * Improved code readability * Fix getting status list before logging in
…nto service-accounts
Merge master into develop & Set version to 1.3.0-develop
…nto service-accounts
…Rocket.Chat into service-account-notification
…nto social-features-prototype
…at/Rocket.Chat into social-features-prototype
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.