chat - chat

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into mm-1619	=Corey Hulen	2015-08-02	210	-24938/+8377
\|\
\| *	Fixing upgrade	=Corey Hulen	2015-08-02	1	-1/+1
\| \|
\| *	Merge pull request #278 from mattermost/mm-1702	Corey Hulen	2015-08-02	7	-28/+185
\| \|\ \| \| \| \| \| \|	MM-1702 Adding etag to channel extra_info api call.
\| \| *	Moving the handing of extra_info etag before the extra info is retrieved ↵	Christopher Speller	2015-07-30	1	-10/+14
\| \| \| \| \| \| \| \| \| \| \| \|	from the database
\| \| *	Adding etag to channel extra_info api call.	Christopher Speller	2015-07-29	7	-23/+176
\| \| \|
\| * \|	Merge pull request #273 from mattermost/mm-1355	Corey Hulen	2015-08-02	142	-24159/+7277
\| \|\ \ \| \| \| \| \| \| \| \|	Fixes mm-1355 adds rate limiting apis
\| \| * \	Merge branch 'master' into mm-1355	=Corey Hulen	2015-07-30	41	-365/+1110
\| \| \|\ \
\| \| * \| \|	Fixing code review feedback	=Corey Hulen	2015-07-30	3	-3/+8
\| \| \| \| \|
\| \| * \| \|	Merge branch 'master' into mm-1355	=Corey Hulen	2015-07-29	40	-118/+290
\| \| \|\ \ \
\| \| * \| \| \|	Fixes mm-1355 adds rate limiting apis	=Corey Hulen	2015-07-29	142	-24158/+7271
\| \| \| \| \| \|
\| * \| \| \| \|	Merge pull request #312 from mattermost/mm-1784	Corey Hulen	2015-08-02	1	-1/+2
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MM-1784 switching to a new PM channel now works in the more modal
\| \| * \| \| \| \|	switching to a new PM channel now works in the more modal	JoramWilander	2015-07-31	1	-1/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #305 from nickago/MM-1681	Corey Hulen	2015-08-02	14	-46/+47
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MM-1681 Fixed regression of static images not displaying in emails
\| \| * \| \| \| \| \|	Changed all templates to use site url instead of team url for finding the ↵	nickago	2015-07-31	14	-46/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'static' directory
\| * \| \| \| \| \| \|	Merge pull request #302 from hmhealey/mm1788	Corey Hulen	2015-08-02	6	-125/+5
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MM-1788 Removed ^replying in preparation for 0.6.0
\| \| * \| \| \| \| \| \|	Removed ^replying in preparation for 0.6.0	hmhealey	2015-07-30	6	-125/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge pull request #301 from lfbrock/patch-1	Corey Hulen	2015-08-02	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MM-1841 Corrected help text
\| \| * \| \| \| \| \| \| \|	MM-1841 Corrected help text	lfbrock	2015-07-30	1	-1/+1
\| \| \|/ / / / / / /
\| * \| \| \| \| \| \| \|	Merge pull request #300 from hmhealey/ubuntudev	Corey Hulen	2015-08-02	1	-33/+73
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated developer setup instructions for Ubuntu
\| \| * \| \| \| \| \| \| \|	Updated developer setup instructions to include Ubuntu setup	Harrison Healey	2015-07-31	1	-33/+73
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #291 from mattermost/mm-1758	Corey Hulen	2015-08-02	2	-1/+6
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MM-1758 partially fixed postgres search so that multiple search terms work
\| \| * \| \| \| \| \| \| \| \|	partially fixed postgres search so that multiple search terms work	JoramWilander	2015-07-30	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #276 from mattermost/mm-1688	Corey Hulen	2015-08-02	4	-5/+13
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MM-1688 reset number of posts to fetch on channel switch and fresh page load
\| \| * \| \| \| \| \| \| \| \| \|	removed ternary operator to make if statement clearer	JoramWilander	2015-07-30	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	reset number of posts to fetch on channel switch and fresh page load	JoramWilander	2015-07-29	4	-5/+10
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #274 from mattermost/mm-1497	Corey Hulen	2015-08-02	6	-8/+33
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MM-1497 image thumbnails now scale appropriately so there is no whitespace
\| \| * \| \| \| \| \| \| \| \| \| \|	center small thumbnails and top left larger thumbnails	JoramWilander	2015-07-31	1	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	removed uneccessary utils loadThumbnails function	JoramWilander	2015-07-31	1	-44/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	updated docker config thumbnail width/height	JoramWilander	2015-07-31	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	image thumbnails now scale appropriately so there is no whitespace, also ↵	JoramWilander	2015-07-31	5	-6/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	generalized some thumbnail loading code
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #313 from mattermost/it33-patch-3	Joram Wilander	2015-08-01	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|	Update to give credit to MongoDB on licensing
\| \| * \| \| \| \| \| \| \| \| \| \|	Update to give credit to MongoDB on licensing	it33	2015-07-31	1	-1/+1
\| \|/ / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #298 from mattermost/mm-1789	Joram Wilander	2015-07-31	1	-9/+19
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MM-1789 update readme with basic config settings setup information
\| \| * \| \| \| \| \| \| \| \| \| \|	replaced 'fiddle' with 'adjust' to be more clear	JoramWilander	2015-07-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	update readme with basic config settings setup information	JoramWilander	2015-07-30	1	-9/+19
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #299 from nickago/MM-1734	Christopher Speller	2015-07-31	1	-24/+22
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MM-1734 Changed language in error message and did cosmetic refactoring
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Updated actual text of error message	nickago	2015-07-31	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Changed language in error message to reflect better English and did cosmetic ↵	nickago	2015-07-30	1	-24/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	refactoring
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #303 from nickago/MM-1642	Christopher Speller	2015-07-31	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MM-1642 Updated the password error
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Updated error message for an incorrect password	nickago	2015-07-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #306 from nickago/MM-1660	Christopher Speller	2015-07-31	1	-91/+112
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	MM-1660 Added singlequotes around 'Edit' and did cosmetic refactoring
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Added singlequotes around 'Edit' and did cosmetic refactoring	nickago	2015-07-31	1	-91/+112
\| \| \| \|_\|_\|_\|_\|_\|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #307 from mattermost/revert-304-mm1706	Joram Wilander	2015-07-31	1	-7/+7
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	Revert "MM-1706 Changed mention highlighting code to split words on a…
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Revert "MM-1706 Changed mention highlighting code to split words on all ↵	Joram Wilander	2015-07-31	1	-7/+7
\| \|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	non-word characters"
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #271 from hmhealey/mm1656	Joram Wilander	2015-07-31	18	-335/+473
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MM-1656 Updated file UI
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Changed file API to not write response data on a HEAD request	hmhealey	2015-07-29	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Cleaned up ViewImageModal and FileAttachment and added some extra comments	hmhealey	2015-07-29	3	-11/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Changed flexbox styles to be compatible with all browsers	hmhealey	2015-07-29	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Updated ViewImage modal dialog to include details about non-image files	hmhealey	2015-07-29	4	-57/+119
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Added check to make sure that FileAttachment is mounted before ↵	hmhealey	2015-07-29	1	-2/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	asynchronously setting state to avoid warning messages.