224 Commits

Author	SHA1	Message	Date
hmhealey	1afa1d37c7	Moved text formatting code to only occur inside of markdown text nodes	2015-09-22 14:30:50 -04:00
hmhealey	d025da5da9	Changed hashtag regex to only accept hashtags that begin with a letter	2015-09-22 14:28:43 -04:00
hmhealey	1709532ae6	Moved emoticon parsing to happen after url parsing so that we don't have smilies accidentally occuring in urls	2015-09-22 14:14:54 -04:00
hmhealey	ffe34aa154	Restored changes which remove emojify and switch to our own version	2015-09-22 13:53:43 -04:00
Christopher Speller	e7d408585a	Revert "PLT-289 Added parsing for named emojis to TextFormatting and removed emojify"	2015-09-22 13:21:58 -04:00
hmhealey	251d33ad23	Added parsing for named emojis to TextFormatting and removed dependency on emojify	2015-09-22 09:22:49 -04:00
hmhealey	a2e3446e37	Added theme class to markdown links	2015-09-21 11:46:29 -04:00
hmhealey	144a277a44	Cleaned up markdown formatting code and removed debug statements	2015-09-19 11:18:37 -04:00
hmhealey	5f18c71d07	Deferred to marked.js's html sanitization when markdown is enabled	2015-09-19 11:18:32 -04:00
hmhealey	2eb320f48a	Changed markdown link parsing to automatically add an explicit protocol to urls	2015-09-19 10:39:55 -04:00
hmhealey	efb3462a68	Prevented our url autolinking from breaking markdown links	2015-09-19 10:39:51 -04:00
hmhealey	bb330b662a	Added marked library to text_formatting.jsx	2015-09-19 10:08:59 -04:00
hmhealey	ae5a1e3ea8	Removed underscores surrounding formatting tokens since they won't work with markdown	2015-09-19 10:08:59 -04:00
hmhealey	208bf914b8	Removed unnecessary conversion of newlines to html line breaks	2015-09-19 10:08:59 -04:00
=Corey Hulen	cdf813f07b	merging	2015-09-18 09:25:47 -07:00
hmhealey	bc8e69d99f	Fixed incorrect check if a url starts with an explicit protocol	2015-09-18 11:56:23 -04:00
=Corey Hulen	804b696bdc	PLT-11 adding config for logs to UI	2015-09-17 22:00:33 -07:00
=Corey Hulen	44714dfcb1	PLT-11 Adding ability to save config file	2015-09-17 21:00:59 -07:00
Christopher Speller	b1f26540ce	Merge pull request #693 from mattermost/mm-1419 ... Implement OAuth2 service provider functionality.	2015-09-16 16:26:56 -04:00
JoramWilander	47e6a33a45	Implement OAuth2 service provider functionality.	2015-09-16 15:49:12 -04:00
Corey Hulen	4e11fa23d7	Merge pull request #695 from hmhealey/startswith ... Replaced instances of startsWith with lastIndexOf in TextFormatting	2015-09-16 11:17:25 -07:00
hmhealey	60d2cff723	Replaced instances of startsWith with lastIndexOf in TextFormatting	2015-09-16 14:08:10 -04:00
=Corey Hulen	d625e62d96	Finished removing some of the last bits of client side config	2015-09-15 19:29:00 -07:00
=Corey Hulen	5e2f701e6c	Removing old config stuff	2015-09-15 19:09:50 -07:00
=Corey Hulen	b2a679c25d	PLT-93 cleaing up client side configs	2015-09-15 18:59:14 -07:00
=Corey Hulen	788fc4373b	removing loggly	2015-09-15 14:20:25 -07:00
Christopher Speller	1bbb5265be	Merge pull request #681 from mattermost/PLT-12-log ... PLT-12 Adding server logs viewer to admin console	2015-09-15 15:59:29 -04:00
Joram Wilander	125094b21b	Merge pull request #682 from mattermost/nc-patch ... Fixing cutoff team name in new channel modal.	2015-09-15 11:16:31 -04:00
Joram Wilander	4a9984d166	Merge pull request #676 from hmhealey/mm1900b ... MM-1900 Removed textToJsx	2015-09-15 08:20:01 -04:00
Christopher Speller	edecf835ed	Fixing cutoff team name in new channel modal	2015-09-15 08:11:00 -04:00
=Corey Hulen	3bd350dcaf	Merge branch 'master' into PLT-12-log	2015-09-14 16:59:24 -07:00
Corey Hulen	bfebb41bc0	Merge pull request #678 from mattermost/mm-1589 ... PLT-171 MM-1589 New add channel modal using react-bootstrap.	2015-09-14 16:57:54 -07:00
hmhealey	4c9ae22b62	Renamed text formatting tokens so that there should be significantly less chance of having conflicting tokens	2015-09-14 15:08:13 -04:00
Christopher Speller	0ea0233c50	New add channel modal using react-bootstrap.	2015-09-14 13:56:58 -04:00
hmhealey	d8779efc99	Removed textToJsx!	2015-09-14 12:22:02 -04:00
hmhealey	3e3b52554a	Cleaned up TextFormatting and added a default click handler for hashtags and @mentions	2015-09-14 12:21:58 -04:00
Michael Leer	90ef55b428	replace lowerName with name	2015-09-14 16:10:31 +01:00
Michael Leer	5fbd1e9860	PLT-41 ... Removed lowercase from the error wording. Removed additional toLowerCase within validator.	2015-09-14 15:15:48 +01:00
hmhealey	214e48835a	Added highlighting of search terms to the new text formatting	2015-09-14 09:19:27 -04:00
hmhealey	e1797c7d55	Added autolinking of hashtags to the new text formatting	2015-09-14 09:19:27 -04:00
hmhealey	3ab2814af3	Added autolinking of urls to the new text formatting	2015-09-14 09:19:26 -04:00
hmhealey	5d28ffa444	Added highlighting when the current user is mentioned to the new text formatting	2015-09-14 09:19:26 -04:00
hmhealey	91f258c725	Added handling for @mentions to the new text formatting	2015-09-14 09:19:26 -04:00
hmhealey	2d2939576c	Added skeleton for new text formatting code which will replace textToJsx	2015-09-14 09:19:26 -04:00
=Corey Hulen	e06e292be7	PLT-12 adding log viewer	2015-09-10 18:32:22 -07:00
Christopher Speller	b15b297bb3	Merge pull request #623 from mattermost/plt-35 ... PLT-35 Add post list container to hold mounted post lists for faster rendering/channel switching.	2015-09-09 08:22:06 -04:00
Joram Wilander	05eb81638d	Merge pull request #602 from mattermost/mm-1409 ... MM-1409 Adding ability to export data from mattermost	2015-09-08 11:55:37 -04:00
JoramWilander	5c0680397d	Add post list container to hold mounted post lists for faster rendering/channel switching.	2015-09-08 10:11:57 -04:00
hmhealey	45b034053a	Fixed @mentions containing uppercase characters	2015-09-04 12:34:55 -04:00
Christopher Speller	f0fd9a9e8b	Adding ability to export data from mattermost	2015-09-04 11:11:38 -04:00