summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Fixing code review feedback=Corey Hulen2015-07-303-3/+8
| | | | | |
| * | | | | Merge branch 'master' into mm-1355=Corey Hulen2015-07-2940-118/+290
| |\ \ \ \ \
| * | | | | | Fixes mm-1355 adds rate limiting apis=Corey Hulen2015-07-29142-24158/+7271
| | | | | | |
* | | | | | | Merge pull request #312 from mattermost/mm-1784Corey Hulen2015-08-021-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | MM-1784 switching to a new PM channel now works in the more modal
| * | | | | | | switching to a new PM channel now works in the more modalJoramWilander2015-07-311-1/+2
| | | | | | | |
* | | | | | | | Merge pull request #305 from nickago/MM-1681Corey Hulen2015-08-0214-46/+47
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | MM-1681 Fixed regression of static images not displaying in emails
| * | | | | | | | Changed all templates to use site url instead of team url for finding the ↵nickago2015-07-3114-46/+47
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 'static' directory
* | | | | | | | Merge pull request #302 from hmhealey/mm1788Corey Hulen2015-08-026-125/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | MM-1788 Removed ^replying in preparation for 0.6.0
| * | | | | | | | 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 text
| * | | | | | | | | MM-1841 Corrected help textlfbrock2015-07-301-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #300 from hmhealey/ubuntudevCorey Hulen2015-08-021-33/+73
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Updated developer setup instructions for Ubuntu
| * | | | | | | | | Updated developer setup instructions to include Ubuntu setupHarrison Healey2015-07-311-33/+73
| | | | | | | | | |
* | | | | | | | | | Merge pull request #291 from mattermost/mm-1758Corey Hulen2015-08-022-1/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | MM-1758 partially fixed postgres search so that multiple search terms work
| * | | | | | | | | | partially fixed postgres search so that multiple search terms workJoramWilander2015-07-302-1/+6
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #276 from mattermost/mm-1688Corey Hulen2015-08-024-5/+13
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | MM-1688 reset number of posts to fetch on channel switch and fresh page load
| * | | | | | | | | | | 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-026-8/+33
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | MM-1497 image thumbnails now scale appropriately so there is no whitespace
| * | | | | | | | | | | | 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 ↵JoramWilander2015-07-315-6/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generalized some thumbnail loading code
* | | | | | | | | | | | | Merge pull request #313 from mattermost/it33-patch-3Joram Wilander2015-08-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | Update to give credit to MongoDB on licensing
| * | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | MM-1789 update readme with basic config settings setup information
| * | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | MM-1734 Changed language in error message and did cosmetic refactoring
| * | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactoring
* | | | | | | | | | | | | | Merge pull request #303 from nickago/MM-1642Christopher Speller2015-07-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MM-1642 Updated the password error
| * | | | | | | | | | | | | | Updated error message for an incorrect passwordnickago2015-07-301-1/+1
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #306 from nickago/MM-1660Christopher Speller2015-07-311-91/+112
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | MM-1660 Added singlequotes around 'Edit' and did cosmetic refactoring
| * | | | | | | | | | | | | | 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 a…
| * | | | | | | | | | | | | Revert "MM-1706 Changed mention highlighting code to split words on all ↵Joram Wilander2015-07-311-7/+7
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-word characters"
* | | | | | | | | | | | | Merge pull request #271 from hmhealey/mm1656Joram Wilander2015-07-3118-335/+473
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | MM-1656 Updated file UI
| * | | | | | | | | | | | | 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 ↵hmhealey2015-07-291-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | asynchronously setting state to avoid warning messages.
| * | | | | | | | | | | | | Fixed FileAttachment component to not spam the server with requests when ↵hmhealey2015-07-291-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | displaying a zero byte file
| * | | | | | | | | | | | | 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 ↵hmhealey2015-07-291-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ViewImageModal on click like it does for image attachments
| * | | | | | | | | | | | | 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 ↵hmhealey2015-07-292-11/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the file attachment previews