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

Sync from Master #9796

merged 59 commits into from
Feb 21, 2018

Conversation

rodrigok
Copy link
Member

@RocketChat/core

Closes #ISSUE_NUMBER

rodrigok and others added 30 commits December 27, 2017 22:59
[FIX] File access not working when passing credentials via querystring
…ation

[FIX] Remove sweetalert from livechat facebook integration page
[FIX] Restore translations from other languages
[FIX] Wrong position of notifications alert in accounts preference page
Fix: Change 'Wordpress' to 'WordPress
Fix: English language improvements
[FIX] LDAP/AD is not importing all users
[FIX] LDAP TLS not working in some cases
[FIX] Deleting message with store last message not removing
[FIX] Highlight setting not working correctly
rodrigok and others added 27 commits January 25, 2018 10:57
# 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
[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
…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
@engelgabriel engelgabriel requested a deployment to rocket-chat-pr-9796 February 21, 2018 03:44 Abandoned
@rodrigok rodrigok merged commit 9046b4c into develop Feb 21, 2018
@rodrigok rodrigok mentioned this pull request Feb 28, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants