chat - chat

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' into PLT-11-email	=Corey Hulen	2015-09-22	3	-10/+16
\|\
\| *	Merge pull request #710 from jdeng/master	Joram Wilander	2015-09-22	1	-1/+2
\| \|\
\| \| *	fix conflict	Jack	2015-09-22	110	-641/+9061
\| \| \|\
\| \| * \|	go fmt	Jack	2015-09-17	1	-1/+1
\| \| * \|	content type for getFile	Jack	2015-09-17	1	-1/+2
\| * \| \|	Merge pull request #747 from mattermost/revert-742-plt289	Christopher Speller	2015-09-22	1	-0/+5
\| \|\ \ \
\| \| * \| \|	Revert "PLT-289 Properly removed lingering references to emojify"	Christopher Speller	2015-09-22	1	-0/+5
\| \|/ / /
\| * \| \|	Merge pull request #746 from mattermost/revert-737-plt289	Christopher Speller	2015-09-22	6	-165/+7
\| \|\ \ \
\| \| * \| \|	Revert "PLT-289 Added parsing for named emojis to TextFormatting and removed ...	Christopher Speller	2015-09-22	6	-165/+7
\| \|/ / /
\| * \| \|	Merge pull request #742 from hmhealey/plt289	Christopher Speller	2015-09-22	1	-5/+0
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|
\| \| * \|	Properly removed lingering references to emojify	hmhealey	2015-09-22	1	-5/+0
\| * \| \|	Merge pull request #737 from hmhealey/plt289	Harrison Healey	2015-09-22	6	-7/+165
\| \|\\| \|
\| \| * \|	Added parsing for named emojis to TextFormatting and removed dependency on em...	hmhealey	2015-09-22	6	-7/+165
\| * \| \|	Merge pull request #725 from mattermost/it33-patch-3	Corey Hulen	2015-09-22	1	-8/+13
\| \|\ \ \
\| \| * \| \|	Correcting typo	it33	2015-09-21	1	-1/+1
\| \| * \| \|	Adjust CLA request template	it33	2015-09-19	1	-8/+13
\| * \| \| \|	Merge pull request #730 from mattermost/shorten-description-help-text	Corey Hulen	2015-09-22	1	-1/+1
\| \|\ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| \| * \| \|	Adjusting sentence	it33	2015-09-21	1	-1/+1
\| \| * \| \|	Shorten description help text	it33	2015-09-20	1	-1/+1
\| \| \|/ /
* \| \| \|	Adding service settings to admin console	=Corey Hulen	2015-09-22	37	-289/+623
* \| \| \|	Adding team settings to admin console	=Corey Hulen	2015-09-22	23	-313/+344
* \| \| \|	Adding SQL settings to admin console	=Corey Hulen	2015-09-22	9	-19/+608
* \| \| \|	Fixing unit tests	=Corey Hulen	2015-09-21	7	-86/+75
* \| \| \|	Adding rate limiter settings to the admin console	=Corey Hulen	2015-09-21	7	-42/+317
* \| \| \|	Adding privacy to admin console	=Corey Hulen	2015-09-21	5	-4/+175
* \| \| \|	Fixing eslint errors	=Corey Hulen	2015-09-21	2	-4/+2
* \| \| \|	Adding image properties	=Corey Hulen	2015-09-21	12	-98/+524
* \| \| \|	Fixing broken signup pages	=Corey Hulen	2015-09-21	9	-14/+24
* \| \| \|	Fixing button	=Corey Hulen	2015-09-21	1	-0/+1
* \| \| \|	Adding email to admin console	=Corey Hulen	2015-09-21	23	-344/+554
\|/ / /
* \| \|	Merge pull request #734 from mattermost/plt-206	Christopher Speller	2015-09-21	4	-3/+7
\|\ \ \
\| * \| \|	Fix first channel load scrolling issue on Windows and iOS and add emoji to RHS.	JoramWilander	2015-09-21	4	-3/+7
* \| \| \|	Merge pull request #736 from hmhealey/plt312	Joram Wilander	2015-09-21	1	-1/+7
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Added theme class to markdown links	hmhealey	2015-09-21	1	-1/+7
* \| \| \|	Merge pull request #732 from mattermost/plt-243	Joram Wilander	2015-09-21	1	-8/+13
\|\ \ \ \
\| * \| \| \|	Adding new create channel modal to the more menu	Christopher Speller	2015-09-21	1	-8/+13
\| \|/ / /
* \| \| \|	Merge pull request #733 from hmhealey/plt310	Joram Wilander	2015-09-21	2	-2/+2
\|\ \ \ \
\| * \| \| \|	Wrapped comment messages in divs like posts in the center pane	hmhealey	2015-09-21	2	-2/+2
\| \|/ / /
* \| \| \|	Merge pull request #708 from hmhealey/plt173	Christopher Speller	2015-09-21	43	-11/+7183
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Added constants for EXIF orientations	hmhealey	2015-09-21	1	-9/+31
\| * \| \|	PLT-173 Changed thumbnails and previews to generate correctly for images with...	hmhealey	2015-09-18	1	-11/+64
\| * \| \|	PLT-173 Added graphics-go and goexif libraries for image manipulation	hmhealey	2015-09-17	42	-0/+7097
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #722 from hmhealey/timestamp	Joram Wilander	2015-09-21	3	-3/+16
\|\ \ \
\| * \| \|	Added a tooltip to post timestamps displaying the actual time the post was cr...	hmhealey	2015-09-19	3	-3/+16
* \| \| \|	Merge pull request #729 from mattermost/rename-handle	Joram Wilander	2015-09-21	2	-4/+4
\|\ \ \ \
\| * \| \| \|	Renaming "Handle" to "Channel URL" or "URL"	it33	2015-09-20	1	-2/+2
\| * \| \| \|	Renaming "Handle" to "Channel URL" or "URL"	it33	2015-09-20	1	-2/+2
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge pull request #731 from asaadmahmoodspin/new-channel	Christopher Speller	2015-09-21	2	-6/+10
\|\ \ \ \
\| * \| \| \|	Updating new channel UI	Asaad Mahmood	2015-09-21	2	-6/+10
\| \|/ / /
* \| \| \|	Merge pull request #723 from hmhealey/plt17	Christopher Speller	2015-09-21	4	-21/+84
\|\ \ \ \ \| \|/ / / \|/\| \| \|