summaryrefslogtreecommitdiffstats
path: root/web/react/components
Commit message (Expand)AuthorAgeFilesLines
* Removing console.logAsaad Mahmood2015-08-051-1/+0
* Fixing mentions scroll again due to merge conflictAsaad Mahmood2015-08-051-0/+7
* Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-08-0510-295/+352
|\
| * Merge pull request #326 from nickago/MM-1754Christopher Speller2015-08-046-6/+6
| |\
| | * Added closing on ESC key pressnickago2015-08-046-6/+6
| * | Merge pull request #321 from rgarmsen2295/mm-1611Christopher Speller2015-08-041-84/+96
| |\ \
| | * | Cosmetic changes to better follow style guideReed Garmsen2015-08-031-75/+95
| | * | Removes ability for the mention list to cycle from top to bottom and vice-versaReed Garmsen2015-08-031-13/+5
| * | | Merge pull request #310 from nickago/MM-1671Christopher Speller2015-08-041-62/+70
| |\ \ \
| | * | | Cosmetic Refactoringnickago2015-08-041-59/+67
| | * | | Changed 'Close' to 'Cancel'nickago2015-08-041-2/+2
| | * | | Placed button inside of form to allow for submission on strike of enter keynickago2015-08-041-8/+8
| | | |/ | | |/|
| * | | Merge pull request #325 from rgarmsen2295/mm-1618Christopher Speller2015-08-041-19/+30
| |\ \ \
| | * | | Fixed help text rendering on mobileReed Garmsen2015-08-041-6/+7
| | * | | Added help text informing the user that the team invite link has been copied ...Reed Garmsen2015-08-031-18/+28
| | | |/ | | |/|
| * | | Merge pull request #323 from rgarmsen2295/mm-1554Christopher Speller2015-08-041-119/+151
| |\ \ \
| | * | | Cosmetic refactoring to better fit style guideReed Garmsen2015-08-041-121/+151
| | * | | The first field of the 'Invite New Member' field can no longer be cleared or ...Reed Garmsen2015-08-031-0/+2
| | |/ /
* | | | Updating channel header tooltip placementAsaad Mahmood2015-08-041-1/+1
* | | | Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-08-042-190/+223
|\| | |
| * | | Merge pull request #318 from rgarmsen2295/mm-1592Christopher Speller2015-08-041-81/+99
| |\ \ \
| | * | | Cosmetic refactoring to be inline with the style guideReed Garmsen2015-08-021-84/+95
| | * | | Searching for recent mentions no longer includes all or channel if those opti...Reed Garmsen2015-08-021-1/+8
| | |/ /
| * | | Merge pull request #322 from nickago/MM-1679Christopher Speller2015-08-041-109/+124
| |\ \ \ | | |_|/ | |/| |
| | * | Fixed variable naming conflict with msg and added cosmetic refactorsnickago2015-08-031-6/+6
| | * | Changed private channel list to use username and did semi-cosmetic refactoringnickago2015-08-031-108/+123
| | |/
* | | Fixing scrolling of mention box in RHSAsaad Mahmood2015-08-041-1/+3
* | | Adding bootstrap tooltip for channel membersAsaad Mahmood2015-08-041-1/+1
* | | UI ImprovementsAsaad Mahmood2015-08-044-8/+22
|/ /
* | Merge pull request #309 from nickago/MM-1691Christopher Speller2015-08-042-4/+14
|\ \ | |/ |/|
| * User Settings modal resets to General tab with nothing open on closenickago2015-07-312-4/+14
* | Merge pull request #312 from mattermost/mm-1784Corey Hulen2015-08-021-1/+2
|\ \
| * | switching to a new PM channel now works in the more modalJoramWilander2015-07-311-1/+2
* | | Merge pull request #302 from hmhealey/mm1788Corey Hulen2015-08-023-101/+5
|\ \ \
| * | | Removed ^replying in preparation for 0.6.0hmhealey2015-07-303-101/+5
* | | | Merge pull request #301 from lfbrock/patch-1Corey Hulen2015-08-021-1/+1
|\ \ \ \
| * | | | MM-1841 Corrected help textlfbrock2015-07-301-1/+1
| |/ / /
* | | | Merge pull request #276 from mattermost/mm-1688Corey Hulen2015-08-021-1/+2
|\ \ \ \
| * | | | reset number of posts to fetch on channel switch and fresh page loadJoramWilander2015-07-291-1/+2
* | | | | Merge pull request #274 from mattermost/mm-1497Corey Hulen2015-08-021-0/+11
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | center small thumbnails and top left larger thumbnailsJoramWilander2015-07-311-0/+11
| | |_|/ | |/| |
* | | | Merge pull request #299 from nickago/MM-1734Christopher Speller2015-07-311-24/+22
|\ \ \ \
| * | | | Updated actual text of error messagenickago2015-07-311-1/+1
| * | | | Changed language in error message to reflect better English and did cosmetic ...nickago2015-07-301-24/+22
* | | | | Merge pull request #306 from nickago/MM-1660Christopher Speller2015-07-311-91/+112
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Added singlequotes around 'Edit' and did cosmetic refactoringnickago2015-07-311-91/+112
| | |_|/ | |/| |
* | | | Merge pull request #271 from hmhealey/mm1656Joram Wilander2015-07-315-302/+326
|\ \ \ \
| * | | | Cleaned up ViewImageModal and FileAttachment and added some extra commentshmhealey2015-07-293-11/+27
| * | | | Updated ViewImage modal dialog to include details about non-image fileshmhealey2015-07-292-57/+81
| * | | | Added check to make sure that FileAttachment is mounted before asynchronously...hmhealey2015-07-291-2/+11