summaryrefslogtreecommitdiffstats
path: root/web/react/components
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #757 from chengweiv5/PLT-168Joram Wilander2015-09-231-3/+4
|\
| * PLT-168: check email used to reset password strictlyChengwei Yang2015-09-231-3/+4
* | Merge pull request #755 from rgarmsen2295/plt-164Christopher Speller2015-09-232-24/+27
|\ \
| * | 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-233-3/+0
|\ \
| * | Restored changes which remove emojify and switch to our own versionhmhealey2015-09-223-3/+0
* | | Merge pull request #748 from hmhealey/plt233Christopher Speller2015-09-231-8/+1
|\ \ \
| * | | Removed click handler from RHS [...] menuhmhealey2015-09-221-8/+1
| |/ /
* | | Merge pull request #739 from rgarmsen2295/plt-39Christopher Speller2015-09-231-3/+11
|\ \ \ | |_|/ |/| |
| * | Minor changes to how resend status is passedReed Garmsen2015-09-211-5/+7
| * | Added confirmation when users request another verification email; users are n...Reed Garmsen2015-09-211-1/+7
* | | Merge pull request #715 from mattermost/plt-27Joram Wilander2015-09-229-28/+315
|\ \ \ | |_|/ |/| |
| * | Implement incoming webhooks.JoramWilander2015-09-219-28/+315
* | | Revert "PLT-289 Added parsing for named emojis to TextFormatting and removed ...Christopher Speller2015-09-223-0/+3
* | | Merge pull request #737 from hmhealey/plt289Harrison Healey2015-09-223-3/+0
|\ \ \
| * | | Added parsing for named emojis to TextFormatting and removed dependency on em...hmhealey2015-09-223-3/+0
| | |/ | |/|
* | | Merge pull request #730 from mattermost/shorten-description-help-textCorey Hulen2015-09-221-1/+1
|\ \ \ | |/ / |/| |
| * | Adjusting sentenceit332015-09-211-1/+1
| * | Shorten description help textit332015-09-201-1/+1
| |/
* | Fix first channel load scrolling issue on Windows and iOS and add emoji to RHS.JoramWilander2015-09-214-3/+7
* | Merge pull request #732 from mattermost/plt-243Joram Wilander2015-09-211-8/+13
|\ \
| * | 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 cr...hmhealey2015-09-193-3/+16
| |/
* | Merge pull request #731 from asaadmahmoodspin/new-channelChristopher Speller2015-09-211-5/+5
|\ \
| * | Updating new channel UIAsaad Mahmood2015-09-211-5/+5
| |/
* / Added marked library to text_formatting.jsxhmhealey2015-09-191-2/+2
|/
* merging=Corey Hulen2015-09-181-0/+11
|\
| * Merge pull request #699 from mattermost/PLT-92Joram Wilander2015-09-181-0/+11
| |\
| | * moving to security tab=Corey Hulen2015-09-172-12/+11
| | * Making changes to versioning=Corey Hulen2015-09-171-5/+4
| | * Merge branch 'master' into PLT-92=Corey Hulen2015-09-174-36/+100
| | |\
| | * | Adding version to UI=Corey Hulen2015-09-161-0/+13
* | | | Moving logout item=Corey Hulen2015-09-171-6/+6
* | | | PLT-11 adding config for logs to UI=Corey Hulen2015-09-1715-292/+184
* | | | PLT-11 Adding ability to save config file=Corey Hulen2015-09-175-130/+403
|/ / /
* | | Merge pull request #705 from esethna/patch-1Corey Hulen2015-09-171-1/+1
|\ \ \ | |_|/ |/| |
| * | Grammar change to New Channel ui textesethna2015-09-171-1/+1
* | | Merge pull request #701 from mattermost/PLT-40Joram Wilander2015-09-171-2/+26
|\ \ \ | |/ / |/| |
| * | Fixing css=Corey Hulen2015-09-161-2/+2
| * | PLT-40 adding experimental support for emojis=Corey Hulen2015-09-161-2/+26
| |/
* | Merge pull request #702 from mattermost/oauth-switch-fixJoram Wilander2015-09-171-1/+1
|\ \
| * | Properly check if OAuth providing is enabled on the client.JoramWilander2015-09-171-1/+1
| |/
* | Cleaned up logic for the unread indicatorsChristopher Speller2015-09-163-108/+100
* | Moved unread channel indicators into their own React component and filehmhealey2015-09-162-70/+112
* | Properly hide unread channel indicators when there are no unread channelshmhealey2015-09-161-5/+11
|/
* Implement OAuth2 service provider functionality.JoramWilander2015-09-166-5/+432