Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | Merge pull request #307 from mattermost/revert-304-mm1706 | Joram Wilander | 2015-07-31 | 1 | -7/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Revert "MM-1706 Changed mention highlighting code to split words on all non-w... | Joram Wilander | 2015-07-31 | 1 | -7/+7 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #271 from hmhealey/mm1656 | Joram Wilander | 2015-07-31 | 18 | -335/+473 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Changed file API to not write response data on a HEAD request | hmhealey | 2015-07-29 | 1 | -1/+4 | |
| * | | | | | | | | | | | | | Cleaned up ViewImageModal and FileAttachment and added some extra comments | hmhealey | 2015-07-29 | 3 | -11/+27 | |
| * | | | | | | | | | | | | | Changed flexbox styles to be compatible with all browsers | hmhealey | 2015-07-29 | 1 | -2/+4 | |
| * | | | | | | | | | | | | | Updated ViewImage modal dialog to include details about non-image files | hmhealey | 2015-07-29 | 4 | -57/+119 | |
| * | | | | | | | | | | | | | Added check to make sure that FileAttachment is mounted before asynchronously... | hmhealey | 2015-07-29 | 1 | -2/+11 | |
| * | | | | | | | | | | | | | Fixed FileAttachment component to not spam the server with requests when disp... | hmhealey | 2015-07-29 | 1 | -3/+8 | |
| * | | | | | | | | | | | | | Added utility function to get a file attachment's url | hmhealey | 2015-07-29 | 2 | -9/+14 | |
| * | | | | | | | | | | | | | Changed the thumbnail for non-image file attachments to open the ViewImageMod... | hmhealey | 2015-07-29 | 1 | -12/+6 | |
| * | | | | | | | | | | | | | Added preview images for non-image files | hmhealey | 2015-07-29 | 2 | -18/+42 | |
| * | | | | | | | | | | | | | UI update for files | Asaad Mahmood | 2015-07-29 | 11 | -10/+6 | |
| * | | | | | | | | | | | | | Removed unused imgCount property from ViewImageModal | hmhealey | 2015-07-29 | 2 | -21/+12 | |
| * | | | | | | | | | | | | | Fixed race condition which could occur while requesting the file size for the... | hmhealey | 2015-07-29 | 2 | -11/+29 | |
| * | | | | | | | | | | | | | Removed unused custom-file CSS class that was being applied to non-image file... | hmhealey | 2015-07-29 | 2 | -9/+1 | |
| * | | | | | | | | | | | | | Fix ViewImageModals created by RHS posts so that their ids are distinct from ... | hmhealey | 2015-07-29 | 4 | -16/+15 | |
| * | | | | | | | | | | | | | Center image icons in attachment previews instead of stretching them | hmhealey | 2015-07-29 | 1 | -20/+17 | |
| * | | | | | | | | | | | | | Cleaned up references to the current post in post_right.jsx | hmhealey | 2015-07-29 | 1 | -30/+33 | |
| * | | | | | | | | | | | | | Reconcile the code to display attachment previews into a FileAttachmentList c... | hmhealey | 2015-07-29 | 4 | -234/+176 | |
| * | | | | | | | | | | | | | Add an info box next to image thumbnails which provides the name, type, and s... | hmhealey | 2015-07-29 | 3 | -18/+98 | |
| * | | | | | | | | | | | | | Allow file access apis to respond to HEAD requests | hmhealey | 2015-07-29 | 1 | -1/+1 | |
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #304 from hmhealey/mm1706 | Joram Wilander | 2015-07-31 | 1 | -7/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Changed mention highlighting code to split words on all non-word characters | hmhealey | 2015-07-30 | 1 | -7/+7 | |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #293 from rgarmsen2295/mm-1725 | Christopher Speller | 2015-07-31 | 1 | -24/+28 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Added text to inform the user a session id is not available for a login attem... | Reed Garmsen | 2015-07-30 | 1 | -24/+28 | |
* | | | | | | | | | | | | | | Merge pull request #283 from mattermost/mm-1787 | Christopher Speller | 2015-07-31 | 6 | -26/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Removing nickname parameter from FireAndForgetVerifyEmail | Christopher Speller | 2015-07-30 | 2 | -4/+3 | |
| * | | | | | | | | | | | | | | Fixing links for signup from team invite link. Enter now advances signup_user... | Christopher Speller | 2015-07-30 | 6 | -26/+27 | |
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #294 from asaadmahmoodspin/master | Joram Wilander | 2015-07-31 | 7 | -11/+18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | MM-1473 - Updating text for close buttons | Asaad Mahmood | 2015-07-31 | 5 | -5/+5 | |
| * | | | | | | | | | | | | | Merge branch 'master' of https://github.com/mattermost/platform | Asaad Mahmood | 2015-07-31 | 3 | -9/+35 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #292 from mattermost/mm-1782 | Joram Wilander | 2015-07-30 | 1 | -3/+16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | added .off() for dropdown hide event on LHS header | JoramWilander | 2015-07-30 | 1 | -0/+2 | |
| * | | | | | | | | | | | | | makes the LHS dropdown close when clicking on the LHS header | JoramWilander | 2015-07-30 | 1 | -3/+14 | |
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #295 from mattermost/it33-patch-2 | Joram Wilander | 2015-07-30 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Removing unnecessary "the" | it33 | 2015-07-30 | 1 | -2/+2 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #285 from hmhealey/mm1738 | Joram Wilander | 2015-07-30 | 1 | -4/+17 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Fixed team API to properly provide team names for the Find My Team email | hmhealey | 2015-07-29 | 1 | -4/+17 | |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | ||||||
| | | * | | | | | | | | Improving smoothness of RHS search | Asaad Mahmood | 2015-07-30 | 2 | -6/+13 | |
| |_|/ / / / / / / / |/| | | | | | | | | | ||||||
| | | | | | | | | * | Updating dockerfile for 0.6.0-rc1. Moving docker files into versioned directo... | Christopher Speller | 2015-07-31 | 14 | -8/+462 | |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #284 from nickago/MM-1768 | Joram Wilander | 2015-07-30 | 1 | -15/+15 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Changed Update to Select, removed illegal spaces, and changed double quotes t... | nickago | 2015-07-29 | 1 | -15/+15 | |
| | |_|_|/ / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #282 from nickago/MM-1642 | Christopher Speller | 2015-07-30 | 1 | -7/+12 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | ||||||
| * | | | | | | | | Stripped obfuscating information from password change error and synchronized ... | nickago | 2015-07-29 | 1 | -7/+12 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #281 from nickago/MM-1600 | Christopher Speller | 2015-07-30 | 2 | -2/+12 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | ||||||
| * | | | | | | | Added error safety and a unique message for duplicate emails | nickago | 2015-07-29 | 2 | -2/+8 | |
| * | | | | | | | Added a unique error message for bad username and simplified error outputed t... | nickago | 2015-07-29 | 2 | -2/+6 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #272 from rgarmsen2295/mm-1463 | Christopher Speller | 2015-07-30 | 114 | -6/+85865 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Made font type a field in the config file | Reed Garmsen | 2015-07-29 | 4 | -3/+6 |