chat - chat

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #1115 from mattermost/salt-fix	Christopher Speller	2015-10-20	1	-8/+8
\|\ \| \| \| \|	Allowing salts longer than 32 chars
\| *	Allowing salts longer than 32 chars	=Corey Hulen	2015-10-19	1	-8/+8
\| \|
* \|	Merge pull request #1119 from mattermost/fix-db-upgrade	Harrison Healey	2015-10-20	3	-1/+19
\|\ \ \| \|/ \|/\|	Hotfix to allow db schema .7 to be upgraded to 1.1
\| *	Hotfix to allow .7 to be upgraded to 1.1	=Corey Hulen	2015-10-20	3	-1/+19
\|/
*	Fixing doc	=Corey Hulen	2015-10-14	1	-1/+1
\|
*	Merge pull request #1056 from esethna/patch-7	Corey Hulen	2015-10-14	1	-18/+23
\|\ \| \| \| \|	Update SMTP instructions
\| *	Update SMTP instructions	esethna	2015-10-14	1	-18/+23
\|/ \| \|	Needs dev review.
*	Updating dockerfile for release v1.1.0-rc3	Christopher Speller	2015-10-14	1	-1/+1
\|
*	Merge pull request #1041 from mattermost/plt-603	Christopher Speller	2015-10-14	2	-8/+40
\|\ \| \| \| \|	RC3 - PLT-603 Fix webhook name not overriding in RHS and update webhook help text.
\| *	Fix webhook name not overriding in LHS and update webhook help text.	JoramWilander	2015-10-13	2	-8/+40
\|/
*	Merge pull request #1040 from mattermost/plt-601	Christopher Speller	2015-10-13	1	-10/+10
\|\ \| \| \| \|	PLT-601 Fixing user settings modal general tab.
\| *	Merge branch 'release-1.1.0' into plt-601	Christopher Speller	2015-10-13	2	-5/+19
\| \|\ \| \|/ \|/\|
* \|	Merge pull request #1036 from mattermost/PLT-602	Christopher Speller	2015-10-13	2	-5/+19
\|\ \ \| \| \| \| \| \|	PLT-602 combining welcome and verify email
\| * \|	PLT-602 combining welcome and verify email	=Corey Hulen	2015-10-13	2	-5/+19
\|/ /
\| *	Fixing user settings dialog so it desn't ask you to check your email unless ↵	Christopher Speller	2015-10-13	1	-10/+10
\|/ \| \| \|	you changed it
*	Updating dockerfile for release v1.1.0-rc2	Christopher Speller	2015-10-13	1	-1/+1
\|
*	Merge pull request #1025 from mattermost/PLT-596	Christopher Speller	2015-10-13	1	-1/+1
\|\ \| \| \| \|	PLT-596 - Update to email verification title
\| *	PLT-596 - Update to email verification title	it33	2015-10-12	1	-1/+1
\|/
*	Merge pull request #1023 from mattermost/fix-config	Corey Hulen	2015-10-12	1	-111/+96
\|\ \| \| \| \|	Fixing document
\| *	Fixing document	=Corey Hulen	2015-10-12	1	-111/+96
\|/
*	Merge pull request #997 from mattermost/PLT-586	Corey Hulen	2015-10-12	14	-76/+135
\|\ \| \| \| \|	PLT-586 fixing issues with security alert
\| *	Merge branch 'release-1.1.0' into PLT-586	=Corey Hulen	2015-10-12	1	-1/+1
\| \|\ \| \|/ \|/\|
* \|	Merge pull request #999 from rgarmsen2295/plt-610	Corey Hulen	2015-10-12	1	-1/+1
\|\ \ \| \| \| \| \| \|	PLT-610 Fix broken image in change email verification email
\| * \|	Replaced change email verification email logo image with a static link	Reed Garmsen	2015-10-09	1	-1/+1
\| \| \|
\| \| *	Merge branch 'release-1.1.0' into PLT-586	=Corey Hulen	2015-10-12	1	-0/+317
\| \| \|\ \| \|_\|/ \|/\| \|
* \| \|	Merge pull request #1020 from mattermost/config-fix	Corey Hulen	2015-10-12	1	-0/+317
\|\ \ \ \| \| \| \| \| \| \| \|	Adding new config documentation
\| * \| \|	Adding new config documentation	=Corey Hulen	2015-10-12	1	-0/+317
\|/ / /
\| \| *	Fixing break	=Corey Hulen	2015-10-12	1	-2/+0
\| \| \|
\| \| *	Removing offical build check	=Corey Hulen	2015-10-12	2	-2/+2
\| \| \|
\| \| *	Merge branch 'release-1.1.0' into PLT-586	=Corey Hulen	2015-10-12	2	-2/+2
\| \| \|\ \| \|_\|/ \|/\| \|
* \| \|	Merge pull request #1001 from mattermost/missed-pr	it33	2015-10-11	2	-2/+2
\|\ \ \ \| \|/ / \|/\| \|	Missed PR - Help text update to webhooks
\| * \|	Update manage_incoming_hooks.jsx	it33	2015-10-09	1	-1/+1
\| \| \|
\| * \|	Update user_settings_integrations.jsx	it33	2015-10-09	1	-1/+1
\| \| \|
\| * \|	Update manage_incoming_hooks.jsx	it33	2015-10-09	1	-1/+1
\|/ /
\| *	PLT-586 fixing issues with security alert	=Corey Hulen	2015-10-09	14	-74/+135
\|/
*	Fixing broken travis release build	Christopher Speller	2015-10-08	2	-3/+14
\|
*	Adding release 1.1.0 version	Christopher Speller	2015-10-08	1	-0/+1
\|
*	Creating dockerfiles for release 1.1.0	Christopher Speller	2015-10-08	8	-105/+94
\|
*	Merge pull request #984 from hmhealey/linkfix	Corey Hulen	2015-10-08	1	-1/+1
\|\ \| \| \| \|	Fixed html used for autolinking
\| *	Fixed html used for autolinking	hmhealey	2015-10-08	1	-1/+1
\|/
*	Merge pull request #983 from mattermost/fix-db-upgrade	Harrison Healey	2015-10-08	4	-9/+3
\|\ \| \| \| \|	Fixing db upgrade for 1.1
\| *	Fixing db upgrade for 1.1	=Corey Hulen	2015-10-08	4	-9/+3
\| \|
* \|	Merge pull request #977 from mattermost/lfbrock-patch-1	Corey Hulen	2015-10-08	1	-0/+64
\|\ \ \| \|/ \|/\|	Updated to include v1.1.0
\| *	Update CHANGELOG.md	lfbrock	2015-10-08	1	-0/+1
\| \|
\| *	Update to include v1.1.0	lfbrock	2015-10-08	1	-0/+63
\| \|
* \|	Renaming SpinPunch, Inc. to Mattermost, Inc.	it33	2015-10-08	1	-2/+2
\| \|
* \|	Merge pull request #982 from hmhealey/plt547	Harrison Healey	2015-10-08	1	-24/+24
\|\ \ \| \| \| \| \| \|	PLT-547 Changed emoticons so that they must be surrounded by whitespace
\| * \|	Fixed parsing of :'( emoticon	hmhealey	2015-10-08	1	-1/+1
\| \| \|
\| * \|	Changed emoticons so that they much be surrounded by whitespace	hmhealey	2015-10-08	1	-24/+24
\| \| \|
\| * \|	Switched :p emoticon	hmhealey	2015-10-08	1	-1/+1
\| \| \|