-
Notifications
You must be signed in to change notification settings - Fork 10.9k
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
Sync from Master #9796
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
[FIX] File access not working when passing credentials via querystring
[FIX] Missing translations
…ation [FIX] Remove sweetalert from livechat facebook integration page
[FIX] Restore translations from other languages
Release 0.60.2
[FIX] English Typos
Fix: README typo
[FIX] Wrong position of notifications alert in accounts preference page
Fix: Improved README.md
Fix: Change 'Wordpress' to 'WordPress
Fix: English language improvements
[FIX] LDAP/AD is not importing all users
[FIX] sidebar footer padding
[FIX] svg render on firefox
[FIX] custom emoji size on sidebar item
Release 0.60.3
[FIX] LDAP TLS not working in some cases
Update Marked dependecy to 0.3.9
[FIX] last message cutting on bottom
[FIX] Deleting message with store last message not removing
[FIX] announcement hyperlink color
[FIX] popover on safari for iOS
[FIX] Highlight setting not working correctly
# Conflicts: # .docker/Dockerfile # .sandstorm/sandstorm-pkgdef.capnp # .scripts/set-version.js # .travis/snap.sh # HISTORY.md # README.md # package.json # packages/rocketchat-i18n/i18n/en.i18n.json # packages/rocketchat-lib/rocketchat.info # packages/rocketchat-livechat/client/views/app/integrations/livechatIntegrationFacebook.js # packages/rocketchat-markdown/.npm/package/npm-shrinkwrap.json # packages/rocketchat-markdown/package.js # packages/rocketchat-theme/client/imports/components/sidebar/sidebar-account.css # packages/rocketchat-theme/client/imports/general/variables.css # packages/rocketchat-ui/client/views/app/popover.html
Release 0.61.0
This reverts commit 8400926.
… Apps."" This reverts commit 7860905.
[FIX] Missing string 'There_are_no_applications' on the OAuth Apps Page
[FIX] Desktop notification not showing when avatar came from external storage service
[FIX] Weird rendering of emojis at sidebar when `last message` is activated
[FIX] Facebook integration in livechat not working on version 0.61.0
[FIX] Formal pronouns and some small mistakes in German texts
[FIX] Close Livechat conversation by visitor not working in version 0.61.0
[FIX] GitLab OAuth does not work when GitLab’s URL ends with slash
…age-breaking [FIX] Messages can't be quoted sometimes
Release 0.61.1
…ion-without-register-form [FIX] Livechat conversation not receiving messages when start without form
[FIX] Emoji rendering on last message
[FIX] Livechat issues on external queue and lead capture
Release 0.61.2
Merged
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.
@RocketChat/core
Closes #ISSUE_NUMBER