summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Collapse)AuthorAgeFilesLines
* Fix theme images 404ing.JoramWilander2015-09-231-1/+1
|
* Merge pull request #761 from mattermost/plt-356Harrison Healey2015-09-231-15/+36
|\ | | | | PLT-356 Fix post not rendering properly in some cases.
| * Fix post not rendering properly in some cases.JoramWilander2015-09-231-15/+36
| |
* | Merge pull request #759 from mattermost/plt-242-3Harrison Healey2015-09-2316-177/+827
|\ \ | | | | | | PLT-242 Implement custom UI theme colors.
| * | Implement UI theme colors.JoramWilander2015-09-2316-177/+827
| | |
* | | Merge pull request #753 from hmhealey/plt341Corey Hulen2015-09-231-1/+12
|\ \ \ | |_|/ |/| | PLT-341 Added CSS classes to markdown headings, links, and tables
| * | Added CSS classes to markdown headings, links, and tableshmhealey2015-09-231-1/+12
| | |
* | | PLT-126: Change 'Private Messages' to 'Direct Messages'Chengwei Yang2015-09-236-10/+10
|/ / | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>
* | Merge pull request #740 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-09-235-8/+15
|\ \ | | | | | | UI Modifications for multiple tickets
| * | Removing click event for channel description popoverAsaad Mahmood2015-09-221-1/+1
| | |
| * | UI Modifications for multiple ticketsAsaad Mahmood2015-09-224-7/+14
| | |
* | | 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-236-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 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-225-3/+165
| | | |
* | | | 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-232-3/+12
|\ \ \ \ | |_|/ / |/| | | PLT-39 Clicking "Resend email" on the verification page now confirms email was sent
| * | | Minor changes to how resend status is passedReed Garmsen2015-09-212-5/+8
| | | |
| * | | Added confirmation when users request another verification email; users are ↵Reed Garmsen2015-09-211-1/+7
| | |/ | |/| | | | | | | no longer redirected after requesting another verification email
* | | Merge pull request #715 from mattermost/plt-27Joram Wilander2015-09-2211-84/+414
|\ \ \ | |_|/ |/| | PLT-27 Implement incoming webhooks.
| * | Implement incoming webhooks.JoramWilander2015-09-2111-84/+414
| | |
* | | Revert "PLT-289 Added parsing for named emojis to TextFormatting and removed ↵Christopher Speller2015-09-225-165/+3
| | | | | | | | | | | | emojify"
* | | Merge pull request #737 from hmhealey/plt289Harrison Healey2015-09-225-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 ↵hmhealey2015-09-225-3/+165
| | |/ | |/| | | | | | | emojify
* | | 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
| * | Added theme class to markdown linkshmhealey2015-09-211-1/+7
| | |
* | | Merge pull request #732 from mattermost/plt-243Joram Wilander2015-09-211-8/+13
|\ \ \ | | | | | | | | PLT-243 Adding new create channel modal to the more menu
| * | | Adding new create channel modal to the more menuChristopher Speller2015-09-211-8/+13
| |/ /
* / / Wrapped comment messages in divs like posts in the center panehmhealey2015-09-212-2/+2
|/ /
* | Merge pull request #722 from hmhealey/timestampJoram Wilander2015-09-213-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 ↵hmhealey2015-09-193-3/+16
| |/ | | | | | | created
* | Merge pull request #731 from asaadmahmoodspin/new-channelChristopher Speller2015-09-211-5/+5
|\ \ | | | | | | Updating new channel UI
| * | Updating new channel UIAsaad Mahmood2015-09-211-5/+5
| |/
* | Cleaned up markdown formatting code and removed debug statementshmhealey2015-09-192-7/+9
| |