summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Expand)AuthorAgeFilesLines
...
* | | | 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
| |/ /
* | | 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
| |/
* | 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-025-119/+5
|\ \ \
| * | | Removed ^replying in preparation for 0.6.0hmhealey2015-07-305-119/+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-024-5/+13
|\ \ \ \
| * | | | removed ternary operator to make if statement clearerJoramWilander2015-07-301-1/+4
| * | | | reset number of posts to fetch on channel switch and fresh page loadJoramWilander2015-07-294-5/+10
* | | | | Merge pull request #274 from mattermost/mm-1497Corey Hulen2015-08-022-0/+13
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | center small thumbnails and top left larger thumbnailsJoramWilander2015-07-311-0/+11
| * | | | removed uneccessary utils loadThumbnails functionJoramWilander2015-07-311-44/+0
| * | | | image thumbnails now scale appropriately so there is no whitespace, also gene...JoramWilander2015-07-312-0/+46
* | | | | 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
| | |_|_|/ | |/| | |
* | | | | Revert "MM-1706 Changed mention highlighting code to split words on all non-w...Joram Wilander2015-07-311-7/+7
| |_|/ / |/| | |
* | | | Merge pull request #271 from hmhealey/mm1656Joram Wilander2015-07-316-302/+391
|\ \ \ \
| * | | | 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-293-57/+87
| * | | | Added check to make sure that FileAttachment is mounted before asynchronously...hmhealey2015-07-291-2/+11
| * | | | Fixed FileAttachment component to not spam the server with requests when disp...hmhealey2015-07-291-3/+8
| * | | | Added utility function to get a file attachment's urlhmhealey2015-07-292-9/+14
| * | | | Changed the thumbnail for non-image file attachments to open the ViewImageMod...hmhealey2015-07-291-12/+6
| * | | | Added preview images for non-image fileshmhealey2015-07-292-18/+42
| * | | | Removed unused imgCount property from ViewImageModalhmhealey2015-07-292-21/+12
| * | | | Fixed race condition which could occur while requesting the file size for the...hmhealey2015-07-291-10/+28
| * | | | Removed unused custom-file CSS class that was being applied to non-image file...hmhealey2015-07-291-6/+1
| * | | | Fix ViewImageModals created by RHS posts so that their ids are distinct from ...hmhealey2015-07-294-16/+15
| * | | | Cleaned up references to the current post in post_right.jsxhmhealey2015-07-291-30/+33
| * | | | Reconcile the code to display attachment previews into a FileAttachmentList c...hmhealey2015-07-294-234/+176
| * | | | Add an info box next to image thumbnails which provides the name, type, and s...hmhealey2015-07-292-13/+71
| | |_|/ | |/| |
* | | | Merge pull request #304 from hmhealey/mm1706Joram Wilander2015-07-311-7/+7
|\ \ \ \
| * | | | Changed mention highlighting code to split words on all non-word charactershmhealey2015-07-301-7/+7
| | |/ / | |/| |