chat - chat

	Commit message (Expand)	Author	Age	Files	Lines
*	Deferred to marked.js's html sanitization when markdown is enabled	hmhealey	2015-09-19	1	-2/+12
*	Changed markdown link parsing to automatically add an explicit protocol to urls	hmhealey	2015-09-19	2	-1/+16
*	Prevented our url autolinking from breaking markdown links	hmhealey	2015-09-19	1	-6/+34
*	Added marked library to text_formatting.jsx	hmhealey	2015-09-19	3	-3/+13
*	Removed underscores surrounding formatting tokens since they won't work with ...	hmhealey	2015-09-19	1	-8/+8
*	Removed unnecessary conversion of newlines to html line breaks	hmhealey	2015-09-19	1	-6/+4
*	Merge pull request #720 from mattermost/it33-patch-4	Corey Hulen	2015-09-18	1	-1/+1
\|\
\| *	Adjusting description of emoji codes feature	it33	2015-09-18	1	-1/+1
* \|	Merge pull request #709 from mattermost/PLT-11	Harrison Healey	2015-09-18	28	-531/+993
\|\ \
\| * \	merging	=Corey Hulen	2015-09-18	22	-27/+515
\| \|\ \
\| * \ \	fixing merge	=Corey Hulen	2015-09-18	5	-10/+19
\| \|\ \ \
\| * \| \| \|	Moving logout item	=Corey Hulen	2015-09-17	1	-6/+6
\| * \| \| \|	PLT-11 adding config for logs to UI	=Corey Hulen	2015-09-17	17	-293/+208
\| * \| \| \|	PLT-11 Adding ability to save config file	=Corey Hulen	2015-09-17	14	-295/+842
* \| \| \| \|	Merge pull request #718 from mattermost/it33-patch-3	Corey Hulen	2015-09-18	1	-2/+4
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	Adding build status indicator to README.md	it33	2015-09-18	1	-2/+4
* \| \| \| \|	Merge pull request #719 from lfbrock/patch-8	it33	2015-09-18	1	-2/+17
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Updated changlog to include new contributors and features	lfbrock	2015-09-18	1	-2/+17
\|/ / / /
* \| \| \|	Merge pull request #717 from mattermost/fix-loadtest	Corey Hulen	2015-09-18	2	-3/+4
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Fix authentication for loadtests.	JoramWilander	2015-09-18	2	-3/+4
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #699 from mattermost/PLT-92	Joram Wilander	2015-09-18	21	-28/+500
\|\ \ \
\| * \| \|	moving to security tab	=Corey Hulen	2015-09-17	2	-12/+11
\| * \| \|	fixing versioning	=Corey Hulen	2015-09-17	1	-3/+3
\| * \| \|	Making changes to versioning	=Corey Hulen	2015-09-17	13	-69/+86
\| * \| \|	Merge branch 'master' into PLT-92	=Corey Hulen	2015-09-17	973	-55/+89408
\| \|\ \ \
\| * \| \| \|	Fixing postgres issue and bumping version number	=Corey Hulen	2015-09-16	2	-3/+50
\| * \| \| \|	Adding version to UI	=Corey Hulen	2015-09-16	2	-1/+13
\| * \| \| \|	Adding database schema version	=Corey Hulen	2015-09-16	7	-3/+222
\| * \| \| \|	Outputing version to logs on server start	=Corey Hulen	2015-09-16	1	-0/+1
\| * \| \| \|	fixing build	=Corey Hulen	2015-09-16	2	-1/+2
\| * \| \| \|	PLT-92 Adding server side versioning to the binary	=Corey Hulen	2015-09-16	13	-23/+199
* \| \| \| \|	Merge pull request #716 from hmhealey/plt299	Corey Hulen	2015-09-18	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Fixed incorrect check if a url starts with an explicit protocol	hmhealey	2015-09-18	1	-1/+1
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #714 from mattermost/test-matrix	Corey Hulen	2015-09-18	2	-0/+16
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Adding go 1.5.1 and postgress to travis build	Christopher Speller	2015-09-18	2	-0/+16
* \| \| \| \|	Merge pull request #713 from mattermost/it33-patch-3	Christopher Speller	2015-09-18	1	-1/+6
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Adding template for contributor list request	it33	2015-09-18	1	-1/+6
* \| \| \| \|	Merge pull request #712 from mattermost/postgres-oauth-fix	Christopher Speller	2015-09-18	1	-0/+4
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Return false when checking if column exists, if the table does not exist with...	JoramWilander	2015-09-18	1	-0/+4
\|/ / / /
* \| \| \|	Merge pull request #665 from chengweiv5/fix-coding-style	Christopher Speller	2015-09-18	4	-10/+10
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Fix coding style: replace tab with whitespace in mattermost config	Chengwei Yang	2015-09-13	4	-10/+10
* \| \| \|	Merge pull request #705 from esethna/patch-1	Corey Hulen	2015-09-17	1	-1/+1
\|\ \ \ \
\| * \| \| \|	Grammar change to New Channel ui text	esethna	2015-09-17	1	-1/+1
* \| \| \| \|	Merge pull request #706 from lindy65/patch-2	Joram Wilander	2015-09-17	1	-1/+1
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	Fixing URL for "Developer Machine Setup"	lindy65	2015-09-17	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #704 from hmhealey/freetype	Christopher Speller	2015-09-17	75	-7/+89256
\|\ \ \ \
\| * \| \| \|	Updated godep workspace and freetype library so that godep save and restore w...	hmhealey	2015-09-17	75	-7/+89256
* \| \| \| \|	Merge pull request #701 from mattermost/PLT-40	Joram Wilander	2015-09-17	885	-2/+42
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Fixing css	=Corey Hulen	2015-09-16	4	-9/+7
\| * \| \| \|	PLT-40 adding experimental support for emojis	=Corey Hulen	2015-09-16	886	-2/+44
\| \| \|_\|/ \| \|/\| \|