# Conflicts:
#	.docker/Dockerfile
#	.docker/Dockerfile.rhel
#	.github/history.json
#	.sandstorm/sandstorm-pkgdef.capnp
#	.travis/snap.sh
#	HISTORY.md
#	package.json
#	packages/rocketchat-i18n/i18n/cs.i18n.json
#	packages/rocketchat-i18n/i18n/da.i18n.json
#	packages/rocketchat-i18n/i18n/en.i18n.json
#	packages/rocketchat-i18n/i18n/fr.i18n.json
#	packages/rocketchat-i18n/i18n/lv.i18n.json
#	packages/rocketchat-i18n/i18n/ru.i18n.json
#	packages/rocketchat-i18n/i18n/sk-SK.i18n.json
#	packages/rocketchat-i18n/i18n/vi-VN.i18n.json
#	packages/rocketchat-lib/rocketchat.info
#	packages/rocketchat-lib/server/functions/notifications/index.js
#	packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js
#	packages/rocketchat-lib/server/models/Subscriptions.js
#	packages/rocketchat-lib/server/startup/settings.js
#	packages/rocketchat-livechat/.app/i18n/lv.i18n.json
#	packages/rocketchat-push-notifications/server/methods/saveNotificationSettings.js
#	packages/rocketchat-ui-account/client/accountPreferences.html
#	server/startup/initialData.js

Fix: Manage apps layout was a bit confuse

Manual push by LingoHub User: Rodrigo Nascimento.
Project: Rocket.Chat

Made with  by https://lingohub.com

* fix avatar admin lists

* test to fix shuffle avatars

Fix: typo on error message for push token API

* Fix email notification preference not showing correct selected value

Closes #10844

* Save email notification preferences correctly

Closes #10787

* Create room with user notification preferences

* Add back the uploaded file message on push notifications

* Add missing pagination fields in the response of REST /directory endpoint

* Add support to choose sort field in REST directory

[FIX] Layout badge cutting on unread messages for long names

* Clarify the wording of the release issue template

* Update release.md

* fix avatar admin lists

* Update messagePopup.js

[FIX] Broadcast channels were showing reply button for deleted messages and generating wrong reply links some times

Fix: Regression in REST API endpoint `/me` 

[FIX] User's preference `Unread on Top` wasn't working for LiveChat rooms

[NEW] Add permission `view-broadcast-member-list`

Fix working of cancel button in progress bar, while uploading file.

* Add message and room removal events for Apps, fix a few other issues

* First very rough draft of the slash command preview

* Add the command preview rest api and make the previews selectable via the keyboard

* Add loading i18n

* Remove duplicated toLowerCase()

* Implement a local password policy

* Improve ValidatePasswordPolicy and create tests

* Validate user’s password on method saveUserProfile

* Fix typo PasswordPoliceClass

When a manager tried to send a message in a live room, an error was being displayed because there is no subscription for the manager. (#10663)

[FIX] Livechat managers were not being able to send messages in some cases

[NEW] Options to enable/disable each Livechat registration form field

The Livechat settings of the 'color' types  were not appearing correctly in the administrative area. (#10612)

* Add response of the /me endpoint to /login endpoint

* change underscore use to ES6 object destructuring

* add redhat dockerfile to master (#10408)

* add redhat dockerfile to master

* Add redhat dockerfile to set-version helper script

* Release 0.63.2 (#10476)

* [FIX] Even TypeErrors with SAML (#10475)

* Bump version to 0.63.2

* Added one2mail.info to default blocked domain list (#10218)

* [FIX] The 'channel.messages' REST API Endpoint error (#10485)

* Bump version to 0.63.3

* Add the history of v0.63.3

* Bump version to 0.64.0-rc.0

* Bump version to 0.64.0-rc.1

* Bump version to 0.64.0-rc.2

* Bump version to 0.64.0-rc.3

* Bump version to 0.64.0-rc.4

* Bump version to 0.64.0

* Bump version to 0.64.1

* Bump version to 0.65.0-develop

[NEW] Lazy load image attachments

* changed saml integration to store data on mongo instead of memory

* Update saml_server.js

*  [FIX] Fix create channel, when created a readonly channel (#10665)

[FIX] Channel owner was being set as muted when creating a read-only channel

* Correct links to Rocket.Chat documentation (#10674)

Correct links in README file

* Fix flickering on message-box emoji icon (#10678)

[FIX] Message box emoji icon was flickering when typing a text

* add `npm run postinstall` into build script (#10524)

Add `npm run postinstall` into example build script

* [FIX] Improve desktop notification formatting (#10445)

* Improved notification formatting

* Fixed lint issues

* Changed body format

* Fixed the problem of missing descriptions on message attachments (#10705)

* [BREAK] Improvements to notifications logic (#10686)

[NEW] Improvements to notifications logic

* LingoHub Update  (#10691)

Manual push by LingoHub User: Rodrigo Nascimento.
Project: Rocket.Chat

Made with  by https://lingohub.com

* [NEW] Setup Wizard (#10523)

* welcome

* .

* stylelint

* new ilustration

* new layout

* .

* implements dicts

* added all setup wizard settings to wizard

* fix some setup wizard css

* fix setup wizard js linter errors

* remove old setup wizard templaates

* setup wizard has just one main tag now

* setup wizard registration fields filter is more readable

* add register server page to setup wizard

* fix setup wizard progress bar on RTL

* setup wizard is registering users

* Add setup wizard tests, routes and fix batch

* fix setup wizard tests

* add api test back

* comment rocketchat:google-natural-language package and remove logs

* add some translation keys for setup wizard

* remove old setup wizard template

* fix sort code on setup wizard

* fix getWizardSetting method

* new migration for setupwizard

* setup wizard setting migration

* fix setupwizard migration

* Update versions

* fix some setup wizard code logic

* fix setup wizard registerServer setting

* rever package-lock.json

* rever google-natural-language .npm folder

* rever meteor packages file and add setup wizard

* remove some default values from setup wizard settings

* add advocacy option on setup wizard industry setting

* change key name to setting to make the filter more readable on setup wizard

* change key name to setting to make the filter more readable on setup wizard

* add findWizardSettings on models Settings and handle errors of getWizardSettings method

* change setting to key to make the filter more readable on setup wizard

* fix setup wizard settings filter map

* remove serverHasAdminUser method on setup wizard

* fix setup wizard tests

* fix setup wizard final step workspace link

* fix setup wizard tests

* [FIX] Improve wordpress OAuth settings (#10724)

[NEW] Add more options for Wordpress OAuth configuration

* [NEW] Add /api/v1/channels.roles & /api/v1/groups.roles (#10607)

[NEW] Add REST endpoints `channels.roles` & `groups.roles`

* Changes source of text for announcement modal content (#10733)

[FIX] Regression: Empty content on announcement modal

* [FIX] Send a message when muted returns inconsistent result in chat.sendMessage (#10720)

* Change the message that returns, when a muted or blocked user tries to send a message using that endpoint

* Remove origin provide to sendMessage method, simply throwing an error when the user is muted or blocked

* More improvements on send notifications logic (#10736)

* Denormalize the User’s Highlights

* Find subscriptions for each type of notification

* Change email preference values

* General improvements

* Use just one query to get all subscriptions to notify

* Get hightlights from subscriptions on method notifyUsersOnMessage

* Keep compatibility of emailNotifications preference in subscription save

* Prevent group mentions on large rooms

* Bump version to 0.64.2-rc.0

* Fix notifications for direct messages (#10760)

* Add setting and expose prometheus on port 9100 (#10766)

* Add setting and expose prometheus on port 9100

* Prometheus: Add number of connected users

* Send statistics to prometheus

* Prometheus: Add methods, subscriptions and callbacks data

* Prometheus: Add metrics of REST API calls

* Prometheus: Record subscriptions time

* Add metrics to notifications

* Wizard improvements (#10776)

* Change wizard state from boolean to `pending`, `in_progress` or `completed`
* Add migration to change the wizard setting to new values and fix the old migration
* Make the wizard responsive for small screens
* Do not publish wizard settings to the client
* Do not show wizard for unlogged users after admin was created

* Add badge back to push notifications (#10779)

* Better metric for notifications (#10786)

* Improvement to push notifications on direct messages (#10788)

* Prometheus: Improve metric names (#10789)

* Bump version to 0.64.2-rc.1

* [FIX] Not escaping special chars on mentions (#10793)

* Regression: Fix wrong wizard field name (#10804)

* Prometheus: Fix notification metric (#10803)

* Regression: Autorun of wizard was not destroyed after completion (#10802)

* Prometheus: Add metric to track hooks time (#10798)

* Bump version to 0.64.2-rc.2

* Prevent setup wizard redirects (#10811)

* Prevent setup wizard redirects

* Fix setup wizard layout

* Prometheus: Track user agent

* Bump version to 0.64.2

[FIX] Enabling `Collapse Embedded Media by Default` was hiding replies and quotes

* displays pinned file's attachments

* handles pin for replies and quotes

* fix review