forked from cmrd-senya/Rocket.Chat
-
Notifications
You must be signed in to change notification settings - Fork 0
merge develop into tmp2 (forward messages.new) #3
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
Open
zdumitru
wants to merge
777
commits into
tmp2
Choose a base branch
from
develop
base: tmp2
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
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
…t being shown (RocketChat#14018) * fix deleted discussion closes RocketChat#13689 * update topic discussion if the parent room name change * fix translation to non subscribed channels closes RocketChat#13965
… sender (RocketChat#14043) * Fix sending notifications to mentions on threads * Always use the sender name as email from field
By removing reactivity in message box component and the most important one, one the `hasPermission` checks
* fix modal scroll * Change modal max-height to 90%
This causes errors when running tests multiple times
… to have (RocketChat#14049) * Add a .message-body--unstyled style for sidebar item's last message and thread quotes * Remove broken tooltip from thread quotes * Memoize normalizeThreadMessage helper * Clear messageBox input on send * Update join button in messageBox * Add word wrap in thread * Avoid overflow from embedded attachment * Fix thread reply counter * Update RoomHistoryManager.js
Fix threads rendering performance
* LingoHub Update 🚀 Manual push by LingoHub User: Diego Sampaio. Project: Rocket.Chat Made with ❤️ by https://lingohub.com * LingoHub Update 🚀 Manual push by LingoHub User: Diego Sampaio. Project: Rocket.Chat Made with ❤️ by https://lingohub.com
) * When a manager tried to send a message in a live room, an error was being displayed because there is no subscription for the manager. * When a visitor attempted to register on the Livechat registration form and it was a registered user, if they tried to register in a different department from the previous department, this was not taking effect and the user was being sent to the same department registered before.
* Fix validations on create discussion function * Add Rest endpoint to be able to create discussions * Add Rest endpoint to get list of discussion of room * Revert rename of Rest params, keep the same of DDP calls * Fix assign statement * Fix broken tests * Fix tests
Query subscription when update unread messages count
…cussion (RocketChat#13872) * Add tooltip to to notify user the action of back button in discussion * Use conventional style of tooltip * use a dictionary key. * solved linting issue * USe rc-tooltip--start * fix review
…the opened room (RocketChat#12971) * Don't show unread count badge in burger menu if it is from the opened room * Remove package-lock.json * fix lint * fix lint * Query unread message count on burger template * fix review
…cketChat#13328) * fix: make room description and topic text area * cleanup: remove comments * fix review
…4516) * Fix logout custom script to run only in logout flow * Revert changes in logged custom script * Add description to custom scripts to make it more clear * Add custom script for logout flow
…cketChat#14534) * displaying notifications if user already exists * remove commented code
* Reduced code complexity and added data validation * Improved code quality * Fix file import * Skip user join and user leave messages when the user is not imported * Fixing code for new eslint rules
* improved event emitter * more changes * Update WebRTCClass.js * fix review * Update index.js * Update WebRTCClass.js * Update WebRTCClass.js * Revert webrtc api paths
…hat#10273) * Add secret property to setting Co-authored-by: kb0304 <karanbedi0304@gmail.com> Co-authored-by: Aaron Ogle <aaron@geekgonecrazy.com> * Fixed missed global reference * Add missed settings
Manual push by LingoHub User: Diego Sampaio. Project: Rocket.Chat Made with ❤️ by https://lingohub.com
…g some times (RocketChat#13919) * Update unread property in the lastMessage room's object * Remove uneeded query
* Fix emoji replacing some chars * Add tests * Optmize emoji sprites
* [FIX] Edit Message when down arrow is pressed. * Prefer querying message on DOM tree over keeping an index
* Remove jump to message duplicated link * Remove star message if the setting in disabled
* fix z-index to edge browsers * fix sidebar on ie10
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.
Closes #ISSUE_NUMBER