summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* PLT-126: Change 'Private Messages' to 'Direct Messages'Chengwei Yang2015-09-237-11/+11
| | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>
* Merge pull request #740 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-09-236-8/+16
|\ | | | | UI Modifications for multiple tickets
| * Removing click event for channel description popoverAsaad Mahmood2015-09-221-1/+1
| |
| * UI Modifications for multiple ticketsAsaad Mahmood2015-09-225-7/+15
| |
* | Merge pull request #756 from rgarmsen2295/plt-165Joram Wilander2015-09-231-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 Garmsen2015-09-221-8/+15
| | | | | | | | | | | | public link
* | | Merge pull request #757 from chengweiv5/PLT-168Joram Wilander2015-09-231-3/+4
|\ \ \ | | | | | | | | PLT-168: check email used to reset password strictly
| * | | PLT-168: check email used to reset password strictlyChengwei Yang2015-09-231-3/+4
| | | | | | | | | | | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>
* | | | Merge pull request #755 from rgarmsen2295/plt-164Christopher Speller2015-09-232-24/+27
|\ \ \ \ | | | | | | | | | | PLT-164 Post drafts containing only files are now recognized properly
| * | | | Functionalized draft checkingReed Garmsen2015-09-221-24/+26
| | | | |
| * | | | Post drafts are now displayed when they contain only files and no textReed Garmsen2015-09-221-2/+2
| | | | |
| * | | | Small change to remove react warningReed Garmsen2015-09-221-0/+1
| | |/ / | |/| |
* | | | Merge pull request #751 from hmhealey/plt344Christopher Speller2015-09-238-62/+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 autolinkinghmhealey2015-09-221-31/+5
| | | | |
| * | | | Moved text formatting code to only occur inside of markdown text nodeshmhealey2015-09-222-19/+33
| | | | |
| * | | | Changed hashtag regex to only accept hashtags that begin with a letterhmhealey2015-09-221-1/+1
| | | | |
| * | | | Moved emoticon parsing to happen after url parsing so that we don't have ↵hmhealey2015-09-221-4/+4
| | | | | | | | | | | | | | | | | | | | smilies accidentally occuring in urls
| * | | | Restored changes which remove emojify and switch to our own versionhmhealey2015-09-227-12/+165
| | | | |
* | | | | Merge pull request #758 from sjmog/readme-fixit332015-09-231-1/+1
|\ \ \ \ \ | | | | | | | | | | | | fix README typo
| * | | | | fix README typoSam Morgan2015-09-231-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #748 from hmhealey/plt233Christopher Speller2015-09-231-8/+1
|\ \ \ \ \ | | | | | | | | | | | | PLT-233 Removed click handler from RHS [...] menu
| * | | | | Removed click handler from RHS [...] menuhmhealey2015-09-221-8/+1
| | | | | |
* | | | | | Merge pull request #739 from rgarmsen2295/plt-39Christopher Speller2015-09-233-4/+17
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | PLT-39 Clicking "Resend email" on the verification page now confirms email was sent
| * | | | | Minor changes to how resend status is passedReed Garmsen2015-09-213-7/+11
| | | | | |
| * | | | | Added confirmation when users request another verification email; users are ↵Reed Garmsen2015-09-212-2/+11
| | |_|_|/ | |/| | | | | | | | | | | | | no longer redirected after requesting another verification email
* | | | | Merge pull request #754 from mattermost/it33-patch-1Corey Hulen2015-09-221-19/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | | Removing CLA templates response
| * | | | Removing CLA templates responseit332015-09-221-19/+0
|/ / / / | | | | | | | | Clutters the rest of the instructions...
* | | | Merge pull request #715 from mattermost/plt-27Joram Wilander2015-09-2231-102/+1284
|\ \ \ \ | | | | | | | | | | PLT-27 Implement incoming webhooks.
| * | | | Implement incoming webhooks.JoramWilander2015-09-2131-102/+1284
| | | | |
* | | | | Merge pull request #710 from jdeng/masterJoram Wilander2015-09-221-1/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | content type for getFile()
| * | | | fix conflictJack2015-09-22110-641/+9061
| |\ \ \ \
| * | | | | go fmtJack2015-09-171-1/+1
| | | | | |
| * | | | | content type for getFileJack2015-09-171-1/+2
| | | | | |
* | | | | | Merge pull request #747 from mattermost/revert-742-plt289Christopher Speller2015-09-221-0/+5
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Revert "PLT-289 Properly removed lingering references to emojify"
| * | | | | Revert "PLT-289 Properly removed lingering references to emojify"Christopher Speller2015-09-221-0/+5
|/ / / / /
* | | | | Merge pull request #746 from mattermost/revert-737-plt289Christopher Speller2015-09-226-165/+7
|\ \ \ \ \ | | | | | | | | | | | | Revert "PLT-289 Added parsing for named emojis to TextFormatting and …
| * | | | | Revert "PLT-289 Added parsing for named emojis to TextFormatting and removed ↵Christopher Speller2015-09-226-165/+7
|/ / / / / | | | | | | | | | | | | | | | emojify"
* | | | | Merge pull request #742 from hmhealey/plt289Christopher Speller2015-09-221-5/+0
|\ \ \ \ \ | |_|/ / / |/| | | | PLT-289 Properly removed lingering references to emojify
| * | | | Properly removed lingering references to emojifyhmhealey2015-09-221-5/+0
| | | | |
* | | | | Merge pull request #737 from hmhealey/plt289Harrison Healey2015-09-226-7/+165
|\| | | | | | | | | | | | | | PLT-289 Added parsing for named emojis to TextFormatting and removed emojify
| * | | | Added parsing for named emojis to TextFormatting and removed dependency on ↵hmhealey2015-09-226-7/+165
| | |_|/ | |/| | | | | | | | | | emojify
* | | | Merge pull request #725 from mattermost/it33-patch-3Corey Hulen2015-09-221-8/+13
|\ \ \ \ | | | | | | | | | | Adjust CLA request template
| * | | | Correcting typoit332015-09-211-1/+1
| | | | |
| * | | | Adjust CLA request templateit332015-09-191-8/+13
| | |_|/ | |/| |
* | | | Merge pull request #730 from mattermost/shorten-description-help-textCorey Hulen2015-09-221-1/+1
|\ \ \ \ | |_|/ / |/| | | Shorten description help text
| * | | Adjusting sentenceit332015-09-211-1/+1
| | | |
| * | | Shorten description help textit332015-09-201-1/+1
| |/ / | | | | | | Currently it word wraps, this prevents word-wrapping
* | | Merge pull request #734 from mattermost/plt-206Christopher Speller2015-09-214-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.JoramWilander2015-09-214-3/+7
| | | |
* | | | Merge pull request #736 from hmhealey/plt312Joram Wilander2015-09-211-1/+7
|\ \ \ \ | |/ / / |/| | | PLT-312 Added theme class to markdown links
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-14 09:05:22 +0000