forked from RocketChat/Rocket.Chat
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge updates from mainstream into goalify
* develop: Fixed the problem of missing descriptions on message attachments (RocketChat#10705) [FIX] Improve desktop notification formatting (RocketChat#10445) add `npm run postinstall` into build script (RocketChat#10524) Fix flickering on message-box emoji icon (RocketChat#10678) Correct links to Rocket.Chat documentation (RocketChat#10674) [FIX] Fix create channel, when created a readonly channel (RocketChat#10665) Update saml_server.js changed saml integration to store data on mongo instead of memory dependencies update Look for URLs on parsed markdown HTML [FIX] Regression on 0.64.0 was freezing the application when posting some URLs [FIX] E-mails were hidden some information Do not add a migration to enable Store_Last_Message to all installations Fix the misspellings of 'recieved' to 'received' on the apps...whoopies Fix updating apps not working on multi-instance servers Enable the 'Store_Last_Message' by default - Remove undefined object - Lint changes - Merge call to `setConnectionOptions` with existing call elsewhere - Remove brackets around `typeof` call for consistency with other code - Use `let` instead of `var` - Support passing extra connection options to the Mongo driver. See http://mongodb.github.io/node-mongodb-native/2.2/reference/connecting/connection-settings/ for valid options. # Conflicts: # package-lock.json
- Loading branch information
Showing
24 changed files
with
366 additions
and
278 deletions.
There are no files selected for viewing
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
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
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
Oops, something went wrong.