chat - chat

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| * \| \| \|	Merge release-4.7 with master in side branch	Derrick Anderson	2018-02-13	7	-68/+153
\| \|/\| \| \| \| \| \| \|/ / /
\| \| * \| \|	Merge branch 'ccbrown-rm-willnorris-proxy-support' into release-4.7	Derrick Anderson	2018-02-13	4	-67/+14
\| \| \|\ \ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| \| * \|	Merge branch 'release-4.7' into rm-willnorris-proxy-support	Chris	2018-02-12	86	-1349/+1358
\| \| \| \|\ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| * \| \|	Merge branch 'release-4.7-revertmaster' into release-4.7	Derrick Anderson	2018-02-12	84	-1345/+1216
\| \| \|\ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| \| * \|	revert master changes	Derrick Anderson	2018-02-12	84	-1345/+1216
\| \| \|/ /
\| \| * \|	Merge branch 'icu669' into release-4.7	Derrick Anderson	2018-02-12	2	-4/+142
\| \| \|\ \
\| \| \| * \	Merge branch 'release-4.7' into icu669	Derrick Anderson	2018-02-12	91	-1234/+1527
\| \| \| \|\ \ \| \| \| \|/ / \| \| \|/\| \|
\| \| \| * \|	Fixed typo in unit test	Harrison Healey	2018-02-12	1	-1/+1
\| \| \| \| \|
\| \| \| * \|	ICU-669 Handle relative links better	Harrison Healey	2018-02-09	2	-12/+19
\| \| \| \| \|
\| \| \| * \|	ICU-669 Ensured all URLs returned from OpenGraph are absolute	Harrison Healey	2018-02-08	2	-4/+135
\| \| \| \| \|
\| \| \| \| *	poke jenkins	Christopher Brown	2018-02-12	0	-0/+0
\| \| \| \| \|
\| \| \| \| *	remove willnorris/imageproxy support	Christopher Brown	2018-02-12	4	-66/+13
\| \| \| \|/ \| \| \|/\|
* \| \| \|	MM-8827: Add ADD_REACTION, REMOVE_REACTION and REMOVE_OTHERS_REACTIONS ↵	Jesús Espino	2018-02-19	6	-188/+333
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	permissions (#8300)
* \| \| \|	MM-9618: Don't change default role permissions for policy. (#8303)	George Goldberg	2018-02-19	5	-47/+47
\| \| \| \|
* \| \| \|	Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1	Martin Kraft	2018-02-14	6	-32/+45
\|\\| \| \|
\| * \| \|	XYZ-110: Cherrypicking changes from release-4.7 to master (#8254)	Jonathan	2018-02-13	6	-32/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Cherry-picking 7b2861de3a09cf00d00b0872cc537d54302c4bfa to master because enterprise/master has code in it that enterprise/release-4.7 does not, and I don't want enterprise/master to break the next time somebody merges enterprise/release-4.7 to enterprise/master * Renamed file to match existing scheme (cherry picked from commit 8c22c5c6c6f835a6e73faf19036bad2a51bb9127)
* \| \| \|	Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1	Martin Kraft	2018-02-13	0	-0/+0
\|\\| \| \|
\| * \| \|	ABC-176 Prevent changing PluginSettings.EnableUploads through the API (#8249)	Joram Wilander	2018-02-13	4	-2/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Prevent changing PluginSettings.EnableUploads through the API * Contain api4 test case in it's own test
* \| \| \|	ABC-176 Prevent changing PluginSettings.EnableUploads through the API (#8249)	Joram Wilander	2018-02-13	4	-2/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Prevent changing PluginSettings.EnableUploads through the API * Contain api4 test case in it's own test
* \| \| \|	XYZ-78: Add note to upgrade code about advanced permissions migration. (#8267)	George Goldberg	2018-02-13	1	-0/+4
\| \| \| \|
* \| \| \|	Merge branch 'master' into advanced-permissions-phase-1	George Goldberg	2018-02-13	74	-666/+939
\|\\| \| \|
\| * \| \|	Merge branch 'release-4.7-t4merge'	Derrick Anderson	2018-02-12	7	-18/+100
\| \|\ \ \
\| \| * \| \|	Merge remote-tracking branch 'origin/release-4.7' into release-4.7-t4merge	Derrick Anderson	2018-02-12	7	-18/+100
\| \|/\| \| \| \| \| \|/ /
\| \| * \|	Merge branch 'master' into release-4.7	Chris	2018-02-12	84	-1216/+1345
\| \| \|\ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Add tests for the `platform server` command (#8231)	Pierre de La Morinerie	2018-02-12	4	-10/+89
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Cleanup app state on initialization error When returning an initialization error, the app state was not cleaned up. This is especially visible during tests, as `appCount` is not decremented, and makes the new app initialization fail. * Test the `platform server` command As the `platform server` command only exits when interrupted by a signal, it is not possible to test it as the other cobra commands. Instead we directly test the actual command function. The internal command handler is slighly refactored to take a channel in argument, and registers it as the signal handler. Nothing very different—except than controlling this channel from the outside allows the test to send the system signal itself, thus preventing the server to run forever.
\| * \| \|	ABC-228 Update GetPosts caching to work for non-60 limits (#8233)	Joram Wilander	2018-02-09	2	-7/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Update GetPosts caching to work for non-60 limits * Only cache on limits of 30/60 and add test * Add comments clarifying 30 and 60 limits
\| * \| \|	Add /v4/image api (#8230)	Chris	2018-02-09	4	-0/+82
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* add image api * i suppose i should add a test... * only redirect to image proxy
\| * \| \|	Merge branch 'release-4.7'	Derrick Anderson	2018-02-09	4	-3/+4
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| * \| \|	Remove license globals entirely (#8229)	Chris	2018-02-09	29	-429/+256
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* remove license globals entirely * fix infinite recursion * test fix
\| * \| \|	use mattermost fork of go-bindata (#8216)	Chris	2018-02-08	1	-2/+2
\| \| \| \|
\| * \| \|	Add prepatory code for 4.8.0 (#8226)	Derrick Anderson	2018-02-08	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Add prepatory code for 4.8.0 * formatting issue * build bug
\| * \| \|	fix client4 post sanitization (#8219)	Chris	2018-02-08	3	-8/+67
\| \| \| \|
\| * \| \|	Merge branch 'release-4.7'	Derrick Anderson	2018-02-08	6	-34/+34
\| \|\ \ \
\| * \| \| \|	Eliminate utils.SetLicense calls (#8217)	Chris	2018-02-07	14	-665/+91
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* eliminate utils.SetLicense calls * test fix * another test fix * more test fixes
\| * \| \| \|	ABC-132: sign error page parameters (#8197)	Chris	2018-02-07	12	-36/+226
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* sign error page parameters * add comments
\| \| \| \| *	Added invite_id field to email invite url, along with validation of this ↵	Jonathan	2018-02-12	5	-13/+79
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	field on the server (#8235)
\| \| \| \| *	minor addition to #8238	Christopher Brown	2018-02-09	2	-5/+7
\| \| \| \| \|
\| \| \| \| *	Don't proxy same-site image urls (#8238)	Chris	2018-02-09	2	-2/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* don't proxy same-site urls * fix empty site url case
\| \| \| \| *	Add /v4/image api (#8230)	Chris	2018-02-09	4	-0/+82
\| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* add image api * i suppose i should add a test... * only redirect to image proxy
\| \| \| *	Merge branch 'abc-239' into release-4.7	Derrick Anderson	2018-02-08	4	-3/+4
\| \| \|/\|
\| \| \| *	Increase OAuth2 state parameter limit	JoramWilander	2018-02-07	4	-3/+4
\| \| \|/
\| \| *	translations PR 20180205 (#8200)	enahum	2018-02-07	6	-34/+34
\| \| \|
* \| \|	Updates migration tests to reflect front-end mapping changes. (#8237)	Martin Kraft	2018-02-13	6	-31/+65
\| \| \|
* \| \|	XYZ-73: Removes EnableOnlyAdminIntegrations uses. (#8245)	Martin Kraft	2018-02-12	2	-6/+0
\| \| \|
* \| \|	Fix tests. (#8244)	George Goldberg	2018-02-12	3	-18/+8
\| \| \|
* \| \|	XYZ-51: Unit tests for and changes to SetRolePermissionsFromConfig. (#8160)	Martin Kraft	2018-02-09	5	-29/+667
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* XYZ-10: Role store. * XYZ-37: Update unit tests to work with database roles. * XYZ-51: Tests 'SetRolePermissionsFromConfig' against JSON from policy page. * XYZ-51: Adds permissions in non-licensed cases also. * XYZ-51: Removes some permissions from team_user role. * XYZ-51: Merge fix for change to default permissions from PR 8208. * XYZ-51: Removes unused function.
* \| \|	AllowEditPost and PostEditTimeLimit migration (#8208)	Jesús Espino	2018-02-09	10	-26/+86
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* AllowEditPost and PostEditTimeLimit migration * Not set EDIT_POST permission to sysadmin_role if ALLOW_EDIT_POST is configured to NEVER * Remove a bit of code duplication
* \| \|	XYZ-80: Add CreateAt/UpdateAt/DeleteAt fields to roles table. (#8223)	George Goldberg	2018-02-08	2	-0/+15
\| \| \|
* \| \|	XYZ-76: Add license check to patchRoles endpoint. (#8224)	George Goldberg	2018-02-08	4	-3/+99
\| \| \|
* \| \|	XYZ-59: Implement redis caching layer for Role store. (#8207)	George Goldberg	2018-02-07	4	-67/+148
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* XYZ-59: Implement redis caching layer for Role store. * Use variable for key where used more than once.