chat - chat

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fixing merge	=Corey Hulen	2015-09-24	1	-4/+3
\|\
\| *	Removed smilies that start with a semicolon	hmhealey	2015-09-24	1	-4/+3
\| \|
* \|	Removing old valet crud	=Corey Hulen	2015-09-24	1	-17/+0
\|/
*	plt-363 - Adding organisation theme	Asaad Mahmood	2015-09-24	2	-21/+27
\|
*	Merge pull request #765 from mattermost/PLT-349	Christopher Speller	2015-09-24	3	-1/+56
\|\ \| \| \| \|	PLT-349 adding team mgt to admin console
\| *	Fixing merge	=Corey Hulen	2015-09-23	5	-97/+499
\| \|\
\| * \|	PLT-349 adding team mgt to admin console	=Corey Hulen	2015-09-23	3	-2/+57
\| \| \|
* \| \|	Merge pull request #769 from hmhealey/plt334	Joram Wilander	2015-09-24	1	-0/+16
\|\ \ \ \| \| \| \| \| \| \| \|	PLT-334 Restricted markdown output to only appear on one line when in singleline mode
\| * \| \|	Restricted markdown output to only appear on one line when in singleline mode	hmhealey	2015-09-23	1	-0/+16
\| \| \|/ \| \|/\|
* / \|	Changed Markdown links to open in a new tab	hmhealey	2015-09-23	1	-1/+1
\|/ /
* \|	Merge branch 'master' into PLT-11-email	=Corey Hulen	2015-09-23	5	-97/+499
\|\ \ \| \|/ \|/\|
\| *	Merge pull request #759 from mattermost/plt-242-3	Harrison Healey	2015-09-23	2	-45/+282
\| \|\ \| \| \| \| \| \|	PLT-242 Implement custom UI theme colors.
\| \| *	Implement UI theme colors.	JoramWilander	2015-09-23	2	-45/+282
\| \| \|
\| * \|	Added CSS classes to markdown headings, links, and tables	hmhealey	2015-09-23	1	-1/+12
\| \| \|
\| * \|	Merge pull request #740 from asaadmahmoodspin/ui-improvements	Joram Wilander	2015-09-23	1	-1/+2
\| \|\ \ \| \| \| \| \| \| \| \|	UI Modifications for multiple tickets
\| \| * \|	UI Modifications for multiple tickets	Asaad Mahmood	2015-09-22	1	-1/+2
\| \| \| \|
\| * \| \|	Merge pull request #751 from hmhealey/plt344	Christopher Speller	2015-09-23	3	-50/+203
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \|	PLT-344 Restore emoticon handling to text_formatting.jsx and fix it's interaction with other formatting
\| \| * \|	Removed extra handling of markdown links when doing autolinking	hmhealey	2015-09-22	1	-31/+5
\| \| \| \|
\| \| * \|	Moved text formatting code to only occur inside of markdown text nodes	hmhealey	2015-09-22	2	-19/+33
\| \| \| \|
\| \| * \|	Changed hashtag regex to only accept hashtags that begin with a letter	hmhealey	2015-09-22	1	-1/+1
\| \| \| \|
\| \| * \|	Moved emoticon parsing to happen after url parsing so that we don't have ↵	hmhealey	2015-09-22	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	smilies accidentally occuring in urls
\| \| * \|	Restored changes which remove emojify and switch to our own version	hmhealey	2015-09-22	2	-0/+165
\| \| \| \|
* \| \| \|	Fixing merge conflict	=Corey Hulen	2015-09-22	1	-55/+98
\|\\| \| \|
\| * \| \|	Merge pull request #715 from mattermost/plt-27	Joram Wilander	2015-09-22	1	-55/+98
\| \|\ \ \ \| \| \|/ / \| \|/\| \|	PLT-27 Implement incoming webhooks.
\| \| * \|	Implement incoming webhooks.	JoramWilander	2015-09-21	1	-55/+98
\| \| \| \|
\| * \| \|	Revert "PLT-289 Added parsing for named emojis to TextFormatting and removed ↵	Christopher Speller	2015-09-22	2	-165/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	emojify"
\| * \| \|	Added parsing for named emojis to TextFormatting and removed dependency on ↵	hmhealey	2015-09-22	2	-0/+165
\| \| \|/ \| \|/\| \| \| \| \| \| \|	emojify
* \| \|	Adding service settings to admin console	=Corey Hulen	2015-09-22	1	-2/+0
\| \| \|
* \| \|	Adding email to admin console	=Corey Hulen	2015-09-21	1	-0/+15
\|/ /
* \|	Added theme class to markdown links	hmhealey	2015-09-21	1	-1/+7
\| \|
* \|	Cleaned up markdown formatting code and removed debug statements	hmhealey	2015-09-19	2	-7/+9
\| \|
* \|	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	1	-0/+9
\| \|
* \|	Removed underscores surrounding formatting tokens since they won't work with ↵	hmhealey	2015-09-19	1	-8/+8
\| \| \| \| \| \| \| \|	markdown
* \|	Removed unnecessary conversion of newlines to html line breaks	hmhealey	2015-09-19	1	-6/+4
\|/
*	merging	=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
\| \|
* \|	PLT-11 adding config for logs to UI	=Corey Hulen	2015-09-17	1	-0/+23
\| \|
* \|	PLT-11 Adding ability to save config file	=Corey Hulen	2015-09-17	2	-1/+56
\|/
*	Merge pull request #693 from mattermost/mm-1419	Christopher Speller	2015-09-16	1	-0/+33
\|\ \| \| \| \|	Implement OAuth2 service provider functionality.
\| *	Implement OAuth2 service provider functionality.	JoramWilander	2015-09-16	1	-0/+33
\| \|
* \|	Merge pull request #695 from hmhealey/startswith	Corey Hulen	2015-09-16	1	-2/+2
\|\ \ \| \|/ \|/\|	Replaced instances of startsWith with lastIndexOf in TextFormatting
\| *	Replaced instances of startsWith with lastIndexOf in TextFormatting	hmhealey	2015-09-16	1	-2/+2
\| \|
* \|	Finished removing some of the last bits of client side config	=Corey Hulen	2015-09-15	2	-39/+1
\| \|
* \|	Removing old config stuff	=Corey Hulen	2015-09-15	1	-15/+0
\| \|
* \|	PLT-93 cleaing up client side configs	=Corey Hulen	2015-09-15	2	-33/+3
\| \|
* \|	removing loggly	=Corey Hulen	2015-09-15	2	-7/+0
\|/
*	Merge pull request #681 from mattermost/PLT-12-log	Christopher Speller	2015-09-15	3	-1/+43
\|\ \| \| \| \|	PLT-12 Adding server logs viewer to admin console