summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge pull request #274 from mattermost/mm-1497Corey Hulen2015-08-026-8/+33
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | center small thumbnails and top left larger thumbnailsJoramWilander2015-07-311-0/+11
| * | | | | | | | | | | | removed uneccessary utils loadThumbnails functionJoramWilander2015-07-311-44/+0
| * | | | | | | | | | | | updated docker config thumbnail width/heightJoramWilander2015-07-311-2/+2
| * | | | | | | | | | | | image thumbnails now scale appropriately so there is no whitespace, also gene...JoramWilander2015-07-315-6/+64
* | | | | | | | | | | | | Merge pull request #313 from mattermost/it33-patch-3Joram Wilander2015-08-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Update to give credit to MongoDB on licensingit332015-07-311-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #298 from mattermost/mm-1789Joram Wilander2015-07-311-9/+19
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | replaced 'fiddle' with 'adjust' to be more clearJoramWilander2015-07-311-1/+1
| * | | | | | | | | | | | update readme with basic config settings setup informationJoramWilander2015-07-301-9/+19
* | | | | | | | | | | | | 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 #303 from nickago/MM-1642Christopher Speller2015-07-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Updated error message for an incorrect passwordnickago2015-07-301-1/+1
* | | | | | | | | | | | | | | 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 #307 from mattermost/revert-304-mm1706Joram Wilander2015-07-311-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | 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-3118-335/+473
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Changed file API to not write response data on a HEAD requesthmhealey2015-07-291-1/+4
| * | | | | | | | | | | | | 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
| * | | | | | | | | | | | | Allow file access apis to respond to HEAD requestshmhealey2015-07-291-1/+1
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | 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-316-26/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Removing nickname parameter from FireAndForgetVerifyEmailChristopher Speller2015-07-302-4/+3
| * | | | | | | | | | | | | | Fixing links for signup from team invite link. Enter now advances signup_user...Christopher Speller2015-07-306-26/+27
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #294 from asaadmahmoodspin/masterJoram Wilander2015-07-317-11/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | MM-1473 - Updating text for close buttonsAsaad Mahmood2015-07-315-5/+5
| * | | | | | | | | | | | | Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-07-313-9/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #292 from mattermost/mm-1782Joram Wilander2015-07-301-3/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | |