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

Develop sync #7866

Merged
merged 41 commits into from
Aug 25, 2017
Merged

Develop sync #7866

merged 41 commits into from
Aug 25, 2017

Conversation

rodrigok
Copy link
Member

@RocketChat/core

Closes #ISSUE_NUMBER

rodrigok and others added 30 commits August 1, 2017 10:25
[FIX] Wrong email subject when "All Messages" setting enabled
[FIX] Only use "File Uploaded" prefix on files
[FIX] Markdown noopener/noreferrer: use correct HTML attribute
…ages

[NEW] Add unread options for direct messages
[FIX] Fix Join Channel Without Preview Room Permission
…running-in-subdir-6679

[FIX] file upload broken when running in subdirectory https://github.com…
[FIX] Use UTF8 setting for /create command
[FIX] custom soundEdit.html
[FIX] Modernize rate limiting of sendMessage
[Fix] Users and Channels list not respecting permissions
[FIX] Csv importer: work with more problematic data
[FIX] make flex-tab visible again when reduced width
# Conflicts:
#	.docker/Dockerfile
#	.sandstorm/sandstorm-pkgdef.capnp
#	.travis/snap.sh
#	HISTORY.md
#	package.json
#	packages/rocketchat-authorization/server/startup.js
#	packages/rocketchat-lib/rocketchat.info
#	packages/rocketchat-ui/client/views/app/room.js
rodrigok and others added 11 commits August 17, 2017 17:01
[FIX] Fix flex tab not opening and getting offscreen
# Conflicts:
#	.docker/Dockerfile
#	.sandstorm/sandstorm-pkgdef.capnp
#	.travis/snap.sh
#	package.json
#	packages/rocketchat-i18n/i18n/en.i18n.json
#	packages/rocketchat-lib/rocketchat.info
#	packages/rocketchat-lib/server/lib/sendEmailOnMessage.js
#	packages/rocketchat-markdown/markdown.js
#	packages/rocketchat-theme/client/imports/general/base_old.css
#	packages/rocketchat-ui-account/client/accountProfile.js
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-7866 August 25, 2017 01:03 Inactive
@engelgabriel engelgabriel merged commit f6c0654 into develop Aug 25, 2017
@engelgabriel engelgabriel deleted the develop-sync branch August 25, 2017 02:18
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.

None yet

6 participants