Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | PLT-126: Change 'Private Messages' to 'Direct Messages' | Chengwei Yang | 2015-09-23 | 7 | -11/+11 |
* | Merge pull request #740 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2015-09-23 | 6 | -8/+16 |
|\ | |||||
| * | 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 | 5 | -7/+15 |
* | | Merge pull request #756 from rgarmsen2295/plt-165 | Joram Wilander | 2015-09-23 | 1 | -8/+15 |
|\ \ | |||||
| * | | Adds a check for email validity client-side when joining a team using a publi... | Reed Garmsen | 2015-09-22 | 1 | -8/+15 |
* | | | 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 | Chengwei Yang | 2015-09-23 | 1 | -3/+4 |
* | | | | Merge pull request #755 from rgarmsen2295/plt-164 | Christopher Speller | 2015-09-23 | 2 | -24/+27 |
|\ \ \ \ | |||||
| * | | | | 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 | 8 | -62/+203 |
|\ \ \ \ | |||||
| * | | | | 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 smil... | hmhealey | 2015-09-22 | 1 | -4/+4 |
| * | | | | Restored changes which remove emojify and switch to our own version | hmhealey | 2015-09-22 | 7 | -12/+165 |
* | | | | | Merge pull request #758 from sjmog/readme-fix | it33 | 2015-09-23 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | fix README typo | Sam Morgan | 2015-09-23 | 1 | -1/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #748 from hmhealey/plt233 | Christopher Speller | 2015-09-23 | 1 | -8/+1 |
|\ \ \ \ \ | |||||
| * | | | | | 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 | 3 | -4/+17 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Minor changes to how resend status is passed | Reed Garmsen | 2015-09-21 | 3 | -7/+11 |
| * | | | | | Added confirmation when users request another verification email; users are n... | Reed Garmsen | 2015-09-21 | 2 | -2/+11 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #754 from mattermost/it33-patch-1 | Corey Hulen | 2015-09-22 | 1 | -19/+0 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Removing CLA templates response | it33 | 2015-09-22 | 1 | -19/+0 |
|/ / / / | |||||
* | | | | Merge pull request #715 from mattermost/plt-27 | Joram Wilander | 2015-09-22 | 31 | -102/+1284 |
|\ \ \ \ | |||||
| * | | | | Implement incoming webhooks. | JoramWilander | 2015-09-21 | 31 | -102/+1284 |
* | | | | | Merge pull request #710 from jdeng/master | Joram Wilander | 2015-09-22 | 1 | -1/+2 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | fix conflict | Jack | 2015-09-22 | 110 | -641/+9061 |
| |\ \ \ \ | |||||
| * | | | | | go fmt | Jack | 2015-09-17 | 1 | -1/+1 |
| * | | | | | content type for getFile | Jack | 2015-09-17 | 1 | -1/+2 |
* | | | | | | Merge pull request #747 from mattermost/revert-742-plt289 | Christopher Speller | 2015-09-22 | 1 | -0/+5 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Revert "PLT-289 Properly removed lingering references to emojify" | Christopher Speller | 2015-09-22 | 1 | -0/+5 |
|/ / / / / | |||||
* | | | | | Merge pull request #746 from mattermost/revert-737-plt289 | Christopher Speller | 2015-09-22 | 6 | -165/+7 |
|\ \ \ \ \ | |||||
| * | | | | | Revert "PLT-289 Added parsing for named emojis to TextFormatting and removed ... | Christopher Speller | 2015-09-22 | 6 | -165/+7 |
|/ / / / / | |||||
* | | | | | Merge pull request #742 from hmhealey/plt289 | Christopher Speller | 2015-09-22 | 1 | -5/+0 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Properly removed lingering references to emojify | hmhealey | 2015-09-22 | 1 | -5/+0 |
* | | | | | Merge pull request #737 from hmhealey/plt289 | Harrison Healey | 2015-09-22 | 6 | -7/+165 |
|\| | | | | |||||
| * | | | | Added parsing for named emojis to TextFormatting and removed dependency on em... | hmhealey | 2015-09-22 | 6 | -7/+165 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #725 from mattermost/it33-patch-3 | Corey Hulen | 2015-09-22 | 1 | -8/+13 |
|\ \ \ \ | |||||
| * | | | | Correcting typo | it33 | 2015-09-21 | 1 | -1/+1 |
| * | | | | Adjust CLA request template | it33 | 2015-09-19 | 1 | -8/+13 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #730 from mattermost/shorten-description-help-text | Corey Hulen | 2015-09-22 | 1 | -1/+1 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Adjusting sentence | it33 | 2015-09-21 | 1 | -1/+1 |
| * | | | Shorten description help text | it33 | 2015-09-20 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #734 from mattermost/plt-206 | Christopher Speller | 2015-09-21 | 4 | -3/+7 |
|\ \ \ | |||||
| * | | | 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 |
|\ \ \ \ | |/ / / |/| | | |