Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | |||||
* | | | 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 | ||||
* | | 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 | ||||
| * | Merge branch 'master' into PLT-12-log | =Corey Hulen | 2015-09-14 | 1 | -4/+13 |
| |\ | |||||
| * | | PLT-12 adding log viewer | =Corey Hulen | 2015-09-10 | 3 | -1/+43 |
| | | | |||||
* | | | Merge pull request #682 from mattermost/nc-patch | Joram Wilander | 2015-09-15 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fixing cutoff team name in new channel modal. | ||||
| * | | | Fixing cutoff team name in new channel modal | Christopher Speller | 2015-09-15 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #676 from hmhealey/mm1900b | Joram Wilander | 2015-09-15 | 2 | -199/+268 |
|\ \ \ | |/ / |/| | | MM-1900 Removed textToJsx | ||||
| * | | Renamed text formatting tokens so that there should be significantly less ↵ | hmhealey | 2015-09-14 | 1 | -11/+11 |
| | | | | | | | | | | | | chance of having conflicting tokens | ||||
| * | | Removed textToJsx! | hmhealey | 2015-09-14 | 1 | -199/+0 |
| | | | |||||
| * | | Cleaned up TextFormatting and added a default click handler for hashtags and ↵ | hmhealey | 2015-09-14 | 1 | -47/+74 |
| | | | | | | | | | | | | @mentions | ||||
| * | | Added highlighting of search terms to the new text formatting | hmhealey | 2015-09-14 | 1 | -6/+41 |
| | | | |||||
| * | | Added autolinking of hashtags to the new text formatting | hmhealey | 2015-09-14 | 1 | -6/+48 |
| | | | |||||
| * | | Added autolinking of urls to the new text formatting | hmhealey | 2015-09-14 | 1 | -4/+35 |
| | | | |||||
| * | | Added highlighting when the current user is mentioned to the new text formatting | hmhealey | 2015-09-14 | 1 | -17/+69 |
| | | | |||||
| * | | Added handling for @mentions to the new text formatting | hmhealey | 2015-09-14 | 1 | -9/+54 |
| | | | |||||
| * | | Added skeleton for new text formatting code which will replace textToJsx | hmhealey | 2015-09-14 | 1 | -0/+36 |
| |/ |