chat - chat

	Commit message (Collapse)	Author	Age	Files	Lines
*	[MM-10718] Move custom branding to TE (#8871)	Saturnino Abril	2018-06-02	8	-59/+50
\| \| \| \| \|	* move custom branding to TE * move brand's enterprise code to server and remove BrandInterface
*	Adding mlog to context. (#8882)	Christopher Speller	2018-06-01	2	-9/+29
\|
*	MM-10412: Adds deleteBy prop to posts. (#8896)	Martin Kraft	2018-06-01	8	-17/+39
\|
*	MM-10760: Using master for any Exec call (#8895)	Jesús Espino	2018-06-01	2	-3/+3
\|
*	MM-10757: Default roles from scheme should be keyed by name not ID. (#8894)	George Goldberg	2018-06-01	8	-73/+104
\| \| \| \| \| \|	* MM-10757: Default roles from scheme should be keyed by name not ID. * Update permissions import/export.
*	Merge branch 'advanced-permissions-phase-2'	George Goldberg	2018-05-31	93	-220/+8286
\|\
\| *	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	16	-37/+427
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 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.
\| *	Allow to update the teams scheme to default scheme (#8855)	Jesús Espino	2018-05-29	2	-10/+16
\| \|
\| *	Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2	Martin Kraft	2018-05-28	11	-2/+157
\| \|\
\| * \|	MM-8814: Remove implicit permission grants from post ownership. (#8391)	George Goldberg	2018-05-28	2	-19/+35
\| \| \|
\| * \|	Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2	Martin Kraft	2018-05-28	3	-8/+13
\| \|\ \
\| * \ \	Merge branch 'advanced-permissions-phase-2' of ↵	Martin Kraft	2018-05-25	1	-0/+3
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	github.com:mattermost/mattermost-server into advanced-permissions-phase-2
\| \| * \| \|	Add autogenerate scheme.name for new schemes without explicit name (#8848)	Jesús Espino	2018-05-25	1	-0/+3
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2	Martin Kraft	2018-05-25	8	-55/+37
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \|
\| * \| \| \|	MM-10402: Adds RunJobs to client config API. (#8846)	Martin Kraft	2018-05-24	1	-0/+2
\| \| \| \| \|
\| * \| \| \|	Merge fixes.	Martin Kraft	2018-05-24	1	-0/+5
\| \| \| \| \|
\| * \| \| \|	Merge fix.	Martin Kraft	2018-05-24	1	-14/+15
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2	Martin Kraft	2018-05-24	39	-259/+1064
\| \|\ \ \ \
\| * \| \| \| \|	fmt fix.	Martin Kraft	2018-05-22	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'master' into advanced-permissions-phase-2	Martin Kraft	2018-05-22	9	-12/+53
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2	Martin Kraft	2018-05-22	199	-8872/+20286
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Refactors migrations check. (#8814)	Martin Kraft	2018-05-21	5	-89/+39
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge fix.	Martin Kraft	2018-05-18	1	-0/+0
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2	Martin Kraft	2018-05-18	41	-264/+288
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Reinstate upgrade code that mysteriously vanished during some merge.	George Goldberg	2018-05-18	1	-1/+14
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix tests.	George Goldberg	2018-05-18	3	-0/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	MM-10264: Adds CLI command to import and export permissions. (#8787)	Martin Kraft	2018-05-17	14	-14/+670
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* MM-10264: Adds CLI command to import and export permissions. * MM-10264: Changes Scheme Name to DisplayName and adds Name slug field. * MM-10264: Changes display name max size. * MM-10264: Another merge fix. * MM-10264: Changes for more Schemes methods checking for migration. * MM-10264: More updates for Schemes migration checking.
\| * \| \| \| \| \| \| \|	MM-10606: License feature flag for custom schemes. (#8804)	George Goldberg	2018-05-17	5	-15/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* MM-10606: Add new field to license for custom schemes. * Add feature flag to license check for Schemes.
\| * \| \| \| \| \| \| \|	MM-10235: Make permissions reset CLI shcemes-aware. (#8773)	George Goldberg	2018-05-17	18	-0/+281
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* MM-10235: Make permissions reset CLI shcemes-aware. * Add i18n strings.
\| * \| \| \| \| \| \| \|	Merge error fix.	Martin Kraft	2018-05-17	1	-522/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2	Martin Kraft	2018-05-17	86	-22384/+1539
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	MM-10615: Reset teams/channels to default scheme on delete scheme. (#8811)	George Goldberg	2018-05-17	4	-61/+34
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	MM-10591: Well known error for all scheme endpoints pre-migration. (#8812)	George Goldberg	2018-05-17	3	-32/+63
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	MM-10234: Make CLI roles command advanced-permissions aware. (#8771)	George Goldberg	2018-05-17	2	-5/+58
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* MM-10234: Make CLI roles command advanced-permissions aware. * Fix for loop scope. * Fix style.
\| * \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2	Martin Kraft	2018-05-16	41	-2003/+2461
\| \|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Fix build failure from bad merge.	George Goldberg	2018-05-16	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2	Martin Kraft	2018-05-15	29	-902/+1300
\| \|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	MM-9728: Online migration for advanced permissions phase 2 (#8744)	George Goldberg	2018-05-14	28	-4/+1586
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* MM-9728: Online migration for advanced permissions phase 2 * Add unit tests for new store functions. * Move migration specific code to own file. * Add migration state function test. * Style fixes. * Add i18n strings. * Fix mocks. * Add TestMain to migrations package tests. * Fix typo. * Fix review comments. * Fix up the "Check if migration is done" check to actually work.
\| * \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2	Martin Kraft	2018-05-11	55	-213/+289
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into advanced-permissions-phase-2	George Goldberg	2018-05-10	2	-2/+7
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2	Martin Kraft	2018-05-09	20	-98/+214
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	MM-10140: API Implementation for Schemes related Endpoints (#8615)	George Goldberg	2018-05-03	22	-5/+1303
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Implement basic scheme CRUD endpoints. * Get All Schemes (Paged) Endpoint and store plumbing. * Add get teams/channels for schemes. * Fix unit tests. * Review fixes. * More review fixes.
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2	Martin Kraft	2018-05-02	87	-2595/+4677
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MM-10182 & MM-10183: Adds channel scheme and team scheme API endpoint. (#8680)	Martin Kraft	2018-05-02	11	-0/+370
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* MM-10183: Adds channel scheme API endpoint. MM-10182: Adds team scheme API endpoint. MM-10182_3: Switch from scheme_id in path to body. * MM-10182/MM-10183: Changes path from 'schemes' to 'scheme'. * MM-10182: Fix merge error.
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'advanced-permissions-phase-2' of ↵	Martin Kraft	2018-05-01	3	-6/+6
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	github.com:mattermost/mattermost-server into advanced-permissions-phase-2
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixing structured logging conflicts.	Christopher Speller	2018-04-27	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into advanced-permissions-phase-2	Christopher Speller	2018-04-27	206	-2489/+9496
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2	Martin Kraft	2018-05-01	261	-3075/+168113
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' into advanced-permissions-phase-2	George Goldberg	2018-04-27	14	-111/+524
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \