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 markdown #1

Merged
merged 941 commits into from
Sep 11, 2017
Merged

Conversation

vcapretz
Copy link

Hey, I saw your excellent PR in RocketChat#7454 and that it needed some conflicts to be fixed, so I wanted to help you!

This branch is the rebase with develop branch from Rocket.Chat

graywolf336 and others added 30 commits August 17, 2017 14:21
…oints. Rework the direct messages endpoints to support username instead of room id
[FIX] Fix flex tab not opening and getting offscreen
1. process_incoming_request can now return falsey (null, undefined, 0, false, etc) and nothing will be sent to the channel
2. integrations can post messages to channels without the user being in them (direct messages, etc)
3. users can't brute force check if a room exists by successfully sending a message there
Manual push by LingoHub User: Gabriel Engel.
Project: Rocket.Chat

Made with ❤️ by https://lingohub.com
[FIX] Fixed function closure syntax allowing validation emails to be sent.
[FIX] Remove redundant "do" in "Are you sure ...?" messages.
The word "account" was translated with "bank account"
"Port" was translated to "harbour" and other fixes
FIX: Error when starting local development environment
…ot-set

[FIX] Settings not getting applied from Meteor.settings and process.env
karlprieb and others added 27 commits September 4, 2017 18:52
[NEW] Add yunohost.org installation method to Readme.md
[FIX] copy to clipboard and update clipboard.js library
…ate-race-condition

[FIX] Prevent autotranslate tokens race condition
…-notification

[FIX] Fix email on mention
Remove unnecessary returns in cors common
…eded on the CSS and in the highlight code probably
@gromain
Copy link
Owner

gromain commented Sep 11, 2017

Thanks a lot! I'm merging now!

@gromain gromain merged commit 76121ee into gromain:develop-markdown Sep 11, 2017
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.