chat - chat

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #1556 from npcode/sso-github-ent	Joram Wilander	2015-12-02	2	-1/+26
\|\ \| \| \| \|	Make the Gitlab SSO Support compatible with Github Enterprise
\| *	Note that the Github Enterprise SSO is unofficial	Yi EungJun	2015-12-02	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since the GitLab SSO UI is used for GitHub Enterprise SSO, it's potentially confusing. Suggested-by: it33 <iantien@gmail.com>
\| *	Make the Gitlab SSO Support compatible with Github Enterprise	Yi EungJun	2015-12-02	2	-1/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	See doc/integrations/Single-Sign-On/Github.md for the usage. Note: I thought it should work also with Github.com but it failed with "Bad token type" error.
* \|	Merge pull request #1563 from esethna/patch-33	Corey Hulen	2015-12-01	1	-0/+18
\|\ \ \| \| \| \| \| \|	Create README.md
\| * \|	Create README.md	Eric Sethna	2015-12-01	1	-0/+18
\| \| \| \| \| \| \| \| \|	Instructions on how to use the test .md files.
* \| \|	Merge pull request #1566 from esethna/patch-34	Corey Hulen	2015-12-01	1	-0/+177
\|\ \ \ \| \| \| \| \| \| \| \|	Create test-markdown-lists.md
\| * \| \|	Create test-markdown-lists.md	Eric Sethna	2015-12-01	1	-0/+177
\| \| \| \| \| \| \| \| \| \| \| \|	Tests for Numbered and Bulleted Lists.
* \| \| \|	Merge pull request #1567 from esethna/patch-36	Corey Hulen	2015-12-01	2	-25/+139
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Update test-markdown.md
\| * \| \|	Update test-markdown.md	Eric Sethna	2015-12-01	2	-25/+139
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	1) Add many corner cases we've hit in the past 2) Remove tables to put it in it's own .md test file 3) Remove lists as I've submitted a PR for a new .md file for those cases
* \| \|	Merge pull request #1565 from mattermost/plt-1270	Joram Wilander	2015-12-01	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Minor fix
\| * \| \|	Minor fix	JoramWilander	2015-12-01	1	-1/+1
\| \| \| \|
* \| \| \|	Merge pull request #1560 from mattermost/plt-1270	Christopher Speller	2015-12-01	1	-5/+7
\|\\| \| \| \| \| \| \| \| \| \| \|	PLT-1270 Fix channel creation errors
\| * \| \|	Fix channel creation errors	JoramWilander	2015-12-01	1	-5/+7
\| \| \| \|
* \| \| \|	Merge pull request #1562 from asaadmahmoodspin/ui-improvements	Corey Hulen	2015-12-01	6	-11/+11
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Multiple UI Improvements
\| * \| \| \|	Multiple UI Improvements	Asaad Mahmood	2015-12-01	6	-11/+11
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #1559 from mattermost/plt-510	Harrison Healey	2015-12-01	5	-73/+142
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	PLT-510 Updated OAuth2 app register modal
\| * \| \| \|	Updated oauth2 app register modal	JoramWilander	2015-12-01	5	-73/+142
\| \| \| \| \|
* \| \| \| \|	Merge pull request #1522 from tamtamchik/patch-1	Joram Wilander	2015-12-01	1	-15/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Update Setup.md
\| * \| \| \| \|	fix new lines	Yuri Tkachenko	2015-11-30	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	easier node install for ubuntu from	Yuri Tkachenko	2015-11-30	1	-6/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/nodesource/distributions#debinstall
\| * \| \| \| \|	removed installation of Godep	Yuri Tkachenko	2015-11-30	1	-7/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PR #1532 need to be merged first
\| * \| \| \| \|	Merge remote-tracking branch 'mattermost/master' into patch-1	Yuri Tkachenko	2015-11-30	402	-90386/+18788
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Update Setup.md	Yuriy Tkachenko	2015-11-26	1	-4/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed process for Mac OS X, makes it easier to install that way
* \| \| \| \| \| \|	Merge pull request #1561 from florianorben/PLT-1182	Harrison Healey	2015-12-01	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / \|/\| \| \| \| \| \|	PLT-1182: "Recent Mention" search brings up username as "[username]undefined
\| * \| \| \| \| \|	PLT-1182: "Recent Mention" search brings up username as "[username]undefined"	Florian Orben	2015-12-01	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #1512 from rgarmsen2295/plt-995b	Joram Wilander	2015-12-01	8	-44/+52
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PLT-995 Applies name display preference setting in more places
\| * \| \| \| \| \|	Enabled name display settings in more places	Reed Garmsen	2015-12-01	8	-44/+52
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #1558 from mattermost/lfbrock-patch-3	Corey Hulen	2015-12-01	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update overview.md
\| * \| \| \| \| \|	Update overview.md	lfbrock	2015-12-01	1	-1/+1
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #1555 from mattermost/PLT-902	Corey Hulen	2015-12-01	11	-62/+182
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|	PLT-902 switching to push proxy server
\| * \| \| \| \|	fixing other configs	=Corey Hulen	2015-11-30	2	-6/+4
\| \| \| \| \| \|
\| * \| \| \| \|	PLT-902 switching to push proxy server	=Corey Hulen	2015-11-30	9	-56/+178
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #1548 from mattermost/plt-1268	Christopher Speller	2015-12-01	2	-9/+40
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	PLT-1268 Fix webhook post aggregation and pending/failed post aggregation
\| * \| \| \| \|	Fix webhook post aggregation and pending/failed post aggregation	JoramWilander	2015-11-30	2	-9/+40
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #1546 from mattermost/plt-1281	Christopher Speller	2015-12-01	2	-2/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PLT-1281 Make sure to have latest posts for the view when switching to a channel
\| * \| \| \| \| \|	Make sure to have latests posts for the view whhen switching to a channel	JoramWilander	2015-11-30	2	-2/+4
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #1532 from hmhealey/prepare	Christopher Speller	2015-12-01	2	-8/+14
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|	Added .prepare step to make test
\| * \| \| \| \| \|	Split .prepare step into .prepare-jsx and .prepare-go	hmhealey	2015-11-30	2	-7/+13
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Added .prepare step to make test	hmhealey	2015-11-30	1	-2/+2
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #1553 from esethna/patch-32	Corey Hulen	2015-11-30	1	-1/+12
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Configuration-Settings.md
\| * \| \| \| \| \|	Update Configuration-Settings.md	Eric Sethna	2015-11-30	1	-1/+12
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|	Add EnableOutgoingWebhooks, EnableTeamListing, restrictTeamNames
* \| \| \| \| \|	Merge pull request #1551 from esethna/patch-30	Corey Hulen	2015-11-30	1	-5/+10
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update README.md
\| * \| \| \| \| \|	Update README.md	Eric Sethna	2015-11-30	1	-5/+10
\| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	1) Fix broken links 2) Add new documentation links
* \| \| \| \| \|	Merge pull request #1547 from asaadmahmoodspin/ui-improvements	Corey Hulen	2015-11-30	4	-28/+56
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ui improvements
\| * \| \| \| \| \|	Improving image modal and removing console log	Asaad Mahmood	2015-11-30	2	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fixing LHS scroll and Image previews	Asaad Mahmood	2015-11-30	4	-27/+55
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #1543 from florianorben/GFM-Tasklist	Corey Hulen	2015-11-30	2	-0/+15
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support Tasklists like GitHub does
\| * \| \| \| \| \|	refactor not to use nested ternary statements	Florian Orben	2015-11-30	1	-3/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	support gfm tasklists	Florian Orben	2015-11-30	2	-0/+13
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #1538 from florianorben/PLT-199	Corey Hulen	2015-11-30	1	-1/+3
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PLT-199: Add scroll bar to center channel