chat - chat

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \|	Added api to get and set preferences	hmhealey	2015-10-13	5	-0/+278
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Added Preferences table to store user preferences	hmhealey	2015-10-13	5	-13/+325
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Added model class for user preferences object	hmhealey	2015-10-13	2	-0/+136
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #1034 from mattermost/PRs-to-master	Corey Hulen	2015-10-13	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarifying PRs should go to master
\| * \| \| \| \| \| \| \| \|	Update Code-Contribution-Guidelines.md	it33	2015-10-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update Code-Contribution-Guidelines.md	it33	2015-10-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Clarifying PRs should go to master	it33	2015-10-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #1030 from mattermost/Slack-import-UI-update	Christopher Speller	2015-10-13	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Slack Import changing "Preview" label to "Beta"
\| * \| \| \| \| \| \| \| \| \|	Slack Import changing "Preview" label to "Beta"	it33	2015-10-13	1	-3/+3
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #1029 from mattermost/Slack-import-help-update	Christopher Speller	2015-10-13	1	-5/+9
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update help text for Slack Import
\| * \| \| \| \| \| \| \| \| \|	Update help text for Slack Import	it33	2015-10-13	1	-5/+9
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #1037 from hmhealey/revert987	Joram Wilander	2015-10-13	2	-39/+8
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Revert #987
\| * \| \| \| \| \| \| \| \| \|	Revert "Modified markdown lexer to not break up words written in snake_case"	hmhealey	2015-10-13	2	-39/+8
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 787d2ef7bca7f411b18d1d13561d61d7e95c81a7.
* \| \| \| \| \| \| \| \| \|	Merge pull request #1039 from mattermost/incoming-doc	Joram Wilander	2015-10-13	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Minor updates to incoming webhook documenatation
\| * \| \| \| \| \| \| \| \|	Minor updates to incoming webhook documenatation	JoramWilander	2015-10-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #1027 from mattermost/check-https	Corey Hulen	2015-10-13	3	-13/+15
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updating SSO help on HTTP/HTTPS
\| * \| \| \| \| \| \| \| \| \|	Update Configuration-Settings.md	it33	2015-10-13	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Update gitlab_settings.jsx	it33	2015-10-13	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Update Gitlab.md	it33	2015-10-13	1	-5/+7
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #1033 from mattermost/trouble-shooting	Corey Hulen	2015-10-13	1	-0/+7
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Create Troubleshooting.md
\| * \| \| \| \| \| \| \| \| \|	Create Troubleshooting.md	it33	2015-10-13	1	-0/+7
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #1035 from mattermost/incoming-doc	Joram Wilander	2015-10-13	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor changes to incoming webhook doc
\| * \| \| \| \| \| \| \| \| \|	Minor changes to incoming webhook doc	JoramWilander	2015-10-13	1	-1/+1
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #1032 from mattermost/incoming-doc	Joram Wilander	2015-10-13	1	-27/+39
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Update incoming webhook documentation
\| * \| \| \| \| \| \| \| \|	Minor doc updates	JoramWilander	2015-10-13	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update incoming webhook doc	JoramWilander	2015-10-13	1	-27/+39
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #1026 from asaadmahmoodspin/master	Joram Wilander	2015-10-13	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|	Fixing code block markdown
\| * \| \| \| \| \| \| \|	Fixing code block markdown	Asaad Mahmood	2015-10-13	1	-0/+1
\| \| \|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #1007 from florianorben/PLT-486	Joram Wilander	2015-10-13	14	-0/+19
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PLT-486: Remove spell check feature from input boxes during signup flow
\| * \| \| \| \| \| \| \|	PLT-486: Remove spell check feature from input boxes during signup flow	Florian Orben	2015-10-12	14	-0/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add spellcheck="false" attribute to login and signup form inputs
* \| \| \| \| \| \| \| \|	Merge pull request #987 from hmhealey/plt521	Joram Wilander	2015-10-13	2	-8/+39
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PLT-521 Modified markdown lexer to not break up words written in snake_case
\| * \| \| \| \| \| \| \| \|	Modified markdown lexer to not break up words written in snake_case	hmhealey	2015-10-09	2	-8/+39
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge release branch 'release-1.1.0'	Christopher Speller	2015-10-13	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| / \| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	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 #1013 from optimistiks/PLT-590	Joram Wilander	2015-10-13	5	-8/+8
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \|	PLT-590: Change "Manage Team" to "Manage Members"
\| * \| \| \| \| \| \| \|	Merge branch 'master' into PLT-590	Maxim	2015-10-13	42	-132/+533
\| \|\ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #1024 from mattermost/release-1.1.0	Corey Hulen	2015-10-12	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|	Merging docs Release 1.1.0rc
\| * \| \| \| \| \| \| \|	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
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Update Configuration-Settings.md	it33	2015-10-12	1	-72/+72
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adjusting format so variables are on their own line
* \| \| \| \| \| \| \| \|	Update Configuration-Settings.md	it33	2015-10-12	1	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Minor corrections
* \| \| \| \| \| \| \| \|	Update Configuration-Settings.md	it33	2015-10-12	1	-36/+22
\| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Clarifying config.json settings not in System Console and updating formatting.
* \| \| \| \| \| \| \|	Merge pull request #1022 from mattermost/release-1.1.0	Corey Hulen	2015-10-12	16	-77/+453
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Release 1.1.0rc merging to master
\| * \| \| \| \| \| \|	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
\| \| \| \|\ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|