Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #303 from nickago/MM-1642 | Christopher Speller | 2015-07-31 | 1 | -1/+1 |
|\ | | | | | MM-1642 Updated the password error | ||||
| * | Updated error message for an incorrect password | nickago | 2015-07-30 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #306 from nickago/MM-1660 | Christopher Speller | 2015-07-31 | 1 | -91/+112 |
|\ \ | | | | | | | MM-1660 Added singlequotes around 'Edit' and did cosmetic refactoring | ||||
| * | | Added singlequotes around 'Edit' and did cosmetic refactoring | nickago | 2015-07-31 | 1 | -91/+112 |
| | | | |||||
* | | | 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 a… | ||||
| * | | | Revert "MM-1706 Changed mention highlighting code to split words on all ↵ | Joram Wilander | 2015-07-31 | 1 | -7/+7 |
|/ / / | | | | | | | | | | non-word characters" | ||||
* | | | Merge pull request #271 from hmhealey/mm1656 | Joram Wilander | 2015-07-31 | 18 | -335/+473 |
|\ \ \ | | | | | | | | | MM-1656 Updated file UI | ||||
| * | | | 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 ↵ | hmhealey | 2015-07-29 | 1 | -2/+11 |
| | | | | | | | | | | | | | | | | asynchronously setting state to avoid warning messages. | ||||
| * | | | Fixed FileAttachment component to not spam the server with requests when ↵ | hmhealey | 2015-07-29 | 1 | -3/+8 |
| | | | | | | | | | | | | | | | | displaying a zero byte file | ||||
| * | | | 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 ↵ | hmhealey | 2015-07-29 | 1 | -12/+6 |
| | | | | | | | | | | | | | | | | ViewImageModal on click like it does for image attachments | ||||
| * | | | 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 ↵ | hmhealey | 2015-07-29 | 2 | -11/+29 |
| | | | | | | | | | | | | | | | | the file attachment previews | ||||
| * | | | Removed unused custom-file CSS class that was being applied to non-image ↵ | hmhealey | 2015-07-29 | 2 | -9/+1 |
| | | | | | | | | | | | | | | | | file attachment previews | ||||
| * | | | Fix ViewImageModals created by RHS posts so that their ids are distinct from ↵ | hmhealey | 2015-07-29 | 4 | -16/+15 |
| | | | | | | | | | | | | | | | | those in the main window | ||||
| * | | | 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 ↵ | hmhealey | 2015-07-29 | 4 | -234/+176 |
| | | | | | | | | | | | | | | | | class to clean up duplicated code. | ||||
| * | | | Add an info box next to image thumbnails which provides the name, type, and ↵ | hmhealey | 2015-07-29 | 3 | -18/+98 |
| | | | | | | | | | | | | | | | | size of a file. | ||||
| * | | | 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 |
|\ \ \ \ | | | | | | | | | | | MM-1706 Changed mention highlighting code to split words on all non-word characters | ||||
| * | | | | 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 |
|\ \ \ \ | | | | | | | | | | | MM-1725 Added text to inform the user a session id is not available for a login attempt | ||||
| * | | | | Added text to inform the user a session id is not available for a login ↵ | Reed Garmsen | 2015-07-30 | 1 | -24/+28 |
| | | | | | | | | | | | | | | | | | | | | attempt (no session created yet) | ||||
* | | | | | Merge pull request #283 from mattermost/mm-1787 | Christopher Speller | 2015-07-31 | 6 | -26/+26 |
|\ \ \ \ \ | | | | | | | | | | | | | MM-1787 Fixing links for signup from team invite link. | ||||
| * | | | | | Removing nickname parameter from FireAndForgetVerifyEmail | Christopher Speller | 2015-07-30 | 2 | -4/+3 |
| | | | | | | |||||
| * | | | | | Fixing links for signup from team invite link. Enter now advances ↵ | Christopher Speller | 2015-07-30 | 6 | -26/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | signup_user_complete screen. Signin now link now redirects properly. | ||||
* | | | | | | Merge pull request #294 from asaadmahmoodspin/master | Joram Wilander | 2015-07-31 | 7 | -11/+18 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Improving smoothness of RHS search | ||||
| * | | | | | 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 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | MM-1782 makes the LHS dropdown close when clicking on the LHS header | ||||
| * | | | | | | 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" | ||||
| * | | | | | | | 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 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | MM-1787 Fixed team API to properly provide team names for the Find My Team email | ||||
| * | | | | | | | 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 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge pull request #284 from nickago/MM-1768 | Joram Wilander | 2015-07-30 | 1 | -15/+15 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | MM-1768 Updated Upload to Select in profile uploader and did cosmetic refactoring | ||||
| * | | | | | | Changed Update to Select, removed illegal spaces, and changed double quotes ↵ | nickago | 2015-07-29 | 1 | -15/+15 |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | to single | ||||
* | | | | | | Merge pull request #282 from nickago/MM-1642 | Christopher Speller | 2015-07-30 | 1 | -7/+12 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | MM-1642 Updated the password error message to not contain extraneous information | ||||
| * | | | | | Stripped obfuscating information from password change error and synchronized ↵ | nickago | 2015-07-29 | 1 | -7/+12 |
| |/ / / / | | | | | | | | | | | | | | | | error slots so that only one will show at once. | ||||
* | | | | | Merge pull request #281 from nickago/MM-1600 | Christopher Speller | 2015-07-30 | 2 | -2/+12 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | MM-1600 Improve quality of error returned upon a duplicate username request | ||||
| * | | | | Added error safety and a unique message for duplicate emails | nickago | 2015-07-29 | 2 | -2/+8 |
| | | | | |