Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | 5 | -8/+15 |
|\ | | | | | UI Modifications for multiple tickets | ||||
| * | Removing click event for channel description popover | Asaad Mahmood | 2015-09-22 | 1 | -1/+1 |
| | | |||||
| * | UI Modifications for multiple tickets | Asaad Mahmood | 2015-09-22 | 4 | -7/+14 |
| | | |||||
* | | Merge pull request #756 from rgarmsen2295/plt-165 | Joram Wilander | 2015-09-23 | 1 | -8/+15 |
|\ \ | | | | | | | PLT-165 Prevents users from signing up via a public link using a non-valid email address | ||||
| * | | Adds a check for email validity client-side when joining a team using a ↵ | Reed Garmsen | 2015-09-22 | 1 | -8/+15 |
| | | | | | | | | | | | | public link | ||||
* | | | Merge pull request #757 from chengweiv5/PLT-168 | Joram Wilander | 2015-09-23 | 1 | -3/+4 |
|\ \ \ | | | | | | | | | PLT-168: check email used to reset password strictly | ||||
| * | | | PLT-168: check email used to reset password strictly | Chengwei Yang | 2015-09-23 | 1 | -3/+4 |
| |/ / | | | | | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com> | ||||
* | | | Merge pull request #755 from rgarmsen2295/plt-164 | Christopher Speller | 2015-09-23 | 2 | -24/+27 |
|\ \ \ | | | | | | | | | PLT-164 Post drafts containing only files are now recognized properly | ||||
| * | | | Functionalized draft checking | Reed Garmsen | 2015-09-22 | 1 | -24/+26 |
| | | | | |||||
| * | | | Post drafts are now displayed when they contain only files and no text | Reed Garmsen | 2015-09-22 | 1 | -2/+2 |
| | | | | |||||
| * | | | Small change to remove react warning | Reed Garmsen | 2015-09-22 | 1 | -0/+1 |
| |/ / | |||||
* | | | Merge pull request #751 from hmhealey/plt344 | Christopher Speller | 2015-09-23 | 6 | -53/+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 | 5 | -3/+165 |
| | | | | |||||
* | | | | Merge pull request #748 from hmhealey/plt233 | Christopher Speller | 2015-09-23 | 1 | -8/+1 |
|\ \ \ \ | | | | | | | | | | | PLT-233 Removed click handler from RHS [...] menu | ||||
| * | | | | Removed click handler from RHS [...] menu | hmhealey | 2015-09-22 | 1 | -8/+1 |
| |/ / / | |||||
* | | | | Merge pull request #739 from rgarmsen2295/plt-39 | Christopher Speller | 2015-09-23 | 2 | -3/+12 |
|\ \ \ \ | |_|/ / |/| | | | PLT-39 Clicking "Resend email" on the verification page now confirms email was sent | ||||
| * | | | Minor changes to how resend status is passed | Reed Garmsen | 2015-09-21 | 2 | -5/+8 |
| | | | | |||||
| * | | | Added confirmation when users request another verification email; users are ↵ | Reed Garmsen | 2015-09-21 | 1 | -1/+7 |
| | |/ | |/| | | | | | | | no longer redirected after requesting another verification email | ||||
* | | | Merge pull request #715 from mattermost/plt-27 | Joram Wilander | 2015-09-22 | 11 | -84/+414 |
|\ \ \ | |_|/ |/| | | PLT-27 Implement incoming webhooks. | ||||
| * | | Implement incoming webhooks. | JoramWilander | 2015-09-21 | 11 | -84/+414 |
| | | | |||||
* | | | Revert "PLT-289 Added parsing for named emojis to TextFormatting and removed ↵ | Christopher Speller | 2015-09-22 | 5 | -165/+3 |
| | | | | | | | | | | | | emojify" | ||||
* | | | Merge pull request #737 from hmhealey/plt289 | Harrison Healey | 2015-09-22 | 5 | -3/+165 |
|\ \ \ | | | | | | | | | PLT-289 Added parsing for named emojis to TextFormatting and removed emojify | ||||
| * | | | Added parsing for named emojis to TextFormatting and removed dependency on ↵ | hmhealey | 2015-09-22 | 5 | -3/+165 |
| | |/ | |/| | | | | | | | emojify | ||||
* | | | Merge pull request #730 from mattermost/shorten-description-help-text | Corey Hulen | 2015-09-22 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Shorten description help text | ||||
| * | | Adjusting sentence | it33 | 2015-09-21 | 1 | -1/+1 |
| | | | |||||
| * | | Shorten description help text | it33 | 2015-09-20 | 1 | -1/+1 |
| |/ | | | | | Currently it word wraps, this prevents word-wrapping | ||||
* | | Merge pull request #734 from mattermost/plt-206 | Christopher Speller | 2015-09-21 | 4 | -3/+7 |
|\ \ | | | | | | | PLT-206 Fix first channel load scrolling issue on Windows and iOS and add emoji to RHS. | ||||
| * | | Fix first channel load scrolling issue on Windows and iOS and add emoji to RHS. | JoramWilander | 2015-09-21 | 4 | -3/+7 |
| | | | |||||
* | | | Merge pull request #736 from hmhealey/plt312 | Joram Wilander | 2015-09-21 | 1 | -1/+7 |
|\ \ \ | |/ / |/| | | PLT-312 Added theme class to markdown links | ||||
| * | | Added theme class to markdown links | hmhealey | 2015-09-21 | 1 | -1/+7 |
| | | | |||||
* | | | Merge pull request #732 from mattermost/plt-243 | Joram Wilander | 2015-09-21 | 1 | -8/+13 |
|\ \ \ | | | | | | | | | PLT-243 Adding new create channel modal to the more menu | ||||
| * | | | Adding new create channel modal to the more menu | Christopher Speller | 2015-09-21 | 1 | -8/+13 |
| |/ / | |||||
* / / | Wrapped comment messages in divs like posts in the center pane | hmhealey | 2015-09-21 | 2 | -2/+2 |
|/ / | |||||
* | | Merge pull request #722 from hmhealey/timestamp | Joram Wilander | 2015-09-21 | 3 | -3/+16 |
|\ \ | | | | | | | Added a tooltip to post timestamps displaying the actual time the post was created | ||||
| * | | Added a tooltip to post timestamps displaying the actual time the post was ↵ | hmhealey | 2015-09-19 | 3 | -3/+16 |
| |/ | | | | | | | created | ||||
* | | Merge pull request #731 from asaadmahmoodspin/new-channel | Christopher Speller | 2015-09-21 | 1 | -5/+5 |
|\ \ | | | | | | | Updating new channel UI | ||||
| * | | Updating new channel UI | Asaad Mahmood | 2015-09-21 | 1 | -5/+5 |
| |/ | |||||
* | | 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 | 3 | -3/+13 |
| | | |||||
* | | 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 | 3 | -6/+14 |
|\ |