chat - chat

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'advanced-permissions-phase-2'	George Goldberg	2018-05-31	6	-5/+168
\|\
\| *	Add note about clearing caches when permissions reset CLI done. (#8823)	George Goldberg	2018-05-30	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \|	* Add note about clearing caches when permissions reset CLI done. * Adjust text.
\| *	MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions (#8860)	Jesús Espino	2018-05-29	2	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions * MM-8853: Removing unnecesary emoji enterprise feature * Create emojis migration * Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS always to system admins * Simplifing permissions checks * Revert "Simplifing permissions checks" This reverts commit e2cafc1905fc9e20125dd9a1552d2d0c7340ae59.
\| *	Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2	Martin Kraft	2018-05-22	4	-5/+27
\| \|\
\| * \|	Merge fix.	Martin Kraft	2018-05-18	1	-0/+40
\| \| \|
\| * \|	Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2	Martin Kraft	2018-05-18	3	-4/+123
\| \| \|
* \| \|	MM-10731 Revert site url kill server (#8877)	Christopher Speller	2018-05-30	2	-23/+7
\| \|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	* Revert "MM-9983 Requiring SiteURL to be set. (#8769)" This reverts commit 0432f995ec27de9ee6cc2f5847d4a17fcc095a26. * Add log message for SiteURL not being set.
* \|	Fixing CMD docs. (#8827)	Christopher Speller	2018-05-18	2	-3/+3
\| \|
* \|	MM-9983 Requiring SiteURL to be set. (#8769)	Christopher Speller	2018-05-18	2	-2/+24
\|/ \| \| \| \| \| \| \|	* Requiring SiteURL to be set. * Modifying to make tests pass. * Fixing test.
*	Renaming platform binary to mattermost. (#8801)	Christopher Speller	2018-05-17	37	-0/+4410