summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #328 from asaadmahmoodspin/mm-1874Christopher Speller2015-08-053-4/+31
|\
| * Updating css for url input add-on and removing display flexAsaad Mahmood2015-08-052-3/+6
| * Fixing tooltip word-wrapAsaad Mahmood2015-08-051-0/+3
| * mm-1874 - Improving team url screen and fixing file attachments in IE 10Asaad Mahmood2015-08-043-2/+23
* | Fixed typo on landing page for sign-upReed Garmsen2015-08-031-1/+1
|/
* 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-026-125/+5
|\ \
| * | Removed ^replying in preparation for 0.6.0hmhealey2015-07-306-125/+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-023-1/+19
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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-313-1/+52
* | | | 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-3117-333/+468
|\ \ \ \
| * | | | Cleaned up ViewImageModal and FileAttachment and added some extra commentshmhealey2015-07-293-11/+27
| * | | | Changed flexbox styles to be compatible with all browsershmhealey2015-07-291-2/+4
| * | | | Updated ViewImage modal dialog to include details about non-image fileshmhealey2015-07-294-57/+119
| * | | | 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
| * | | | UI update for filesAsaad Mahmood2015-07-2911-10/+6
| * | | | 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-292-11/+29
| * | | | Removed unused custom-file CSS class that was being applied to non-image file...hmhealey2015-07-292-9/+1
| * | | | Fix ViewImageModals created by RHS posts so that their ids are distinct from ...hmhealey2015-07-294-16/+15
| * | | | Center image icons in attachment previews instead of stretching themhmhealey2015-07-291-20/+17
| * | | | 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-293-18/+98
| | |_|/ | |/| |
* | | | 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
| | |/ / | |/| |
* | | | Merge pull request #293 from rgarmsen2295/mm-1725Christopher Speller2015-07-311-24/+28
|\ \ \ \
| * | | | Added text to inform the user a session id is not available for a login attem...Reed Garmsen2015-07-301-24/+28
* | | | | Merge pull request #283 from mattermost/mm-1787Christopher Speller2015-07-315-21/+22
|\ \ \ \ \
| * | | | | Removing nickname parameter from FireAndForgetVerifyEmailChristopher Speller2015-07-301-1/+1
| * | | | | Fixing links for signup from team invite link. Enter now advances signup_user...Christopher Speller2015-07-305-21/+22
* | | | | | MM-1473 - Updating text for close buttonsAsaad Mahmood2015-07-315-5/+5