Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/mattermost/platform | Asaad Mahmood | 2015-08-04 | 2 | -190/+223 |
|\ | | | | | | | | | Conflicts: web/react/components/channel_header.jsx | ||||
| * | Merge pull request #318 from rgarmsen2295/mm-1592 | Christopher Speller | 2015-08-04 | 1 | -81/+99 |
| |\ | | | | | | | MM-1592 Searching for recent mentions no longer includes all or channel if the all/channel options were toggled on | ||||
| | * | Cosmetic refactoring to be inline with the style guide | Reed Garmsen | 2015-08-02 | 1 | -84/+95 |
| | | | |||||
| | * | Searching for recent mentions no longer includes all or channel if those ↵ | Reed Garmsen | 2015-08-02 | 1 | -1/+8 |
| | | | | | | | | | | | | options were toggled in the users mention settings | ||||
| * | | Merge pull request #322 from nickago/MM-1679 | Christopher Speller | 2015-08-04 | 1 | -109/+124 |
| |\ \ | | | | | | | | | MM-1679 PM channels in sidebar now display username instead of nickname, plus semi-cosmetic refactoring | ||||
| | * | | Fixed variable naming conflict with msg and added cosmetic refactors | nickago | 2015-08-03 | 1 | -6/+6 |
| | | | | |||||
| | * | | Changed private channel list to use username and did semi-cosmetic refactoring | nickago | 2015-08-03 | 1 | -108/+123 |
| | |/ | |||||
* | | | Fixing scrolling of mention box in RHS | Asaad Mahmood | 2015-08-04 | 1 | -1/+3 |
| | | | |||||
* | | | Adding bootstrap tooltip for channel members | Asaad Mahmood | 2015-08-04 | 1 | -1/+1 |
| | | | |||||
* | | | UI Improvements | Asaad Mahmood | 2015-08-04 | 12 | -41/+99 |
|/ / | |||||
* | | Merge pull request #309 from nickago/MM-1691 | Christopher Speller | 2015-08-04 | 2 | -4/+14 |
|\ \ | |/ |/| | MM-1691/1692 Reset User settings tab on close | ||||
| * | User Settings modal resets to General tab with nothing open on close | nickago | 2015-07-31 | 2 | -4/+14 |
| | | |||||
* | | Merge pull request #312 from mattermost/mm-1784 | Corey Hulen | 2015-08-02 | 1 | -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 modal | JoramWilander | 2015-07-31 | 1 | -1/+2 |
| | | | |||||
* | | | Merge pull request #302 from hmhealey/mm1788 | Corey Hulen | 2015-08-02 | 6 | -125/+5 |
|\ \ \ | | | | | | | | | MM-1788 Removed ^replying in preparation for 0.6.0 | ||||
| * | | | Removed ^replying in preparation for 0.6.0 | hmhealey | 2015-07-30 | 6 | -125/+5 |
| | | | | |||||
* | | | | Merge pull request #301 from lfbrock/patch-1 | Corey Hulen | 2015-08-02 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | MM-1841 Corrected help text | ||||
| * | | | | MM-1841 Corrected help text | lfbrock | 2015-07-30 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #276 from mattermost/mm-1688 | Corey Hulen | 2015-08-02 | 4 | -5/+13 |
|\ \ \ \ | | | | | | | | | | | MM-1688 reset number of posts to fetch on channel switch and fresh page load | ||||
| * | | | | removed ternary operator to make if statement clearer | JoramWilander | 2015-07-30 | 1 | -1/+4 |
| | | | | | |||||
| * | | | | reset number of posts to fetch on channel switch and fresh page load | JoramWilander | 2015-07-29 | 4 | -5/+10 |
| | | | | | |||||
* | | | | | Merge pull request #274 from mattermost/mm-1497 | Corey Hulen | 2015-08-02 | 3 | -1/+19 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | MM-1497 image thumbnails now scale appropriately so there is no whitespace | ||||
| * | | | | center small thumbnails and top left larger thumbnails | JoramWilander | 2015-07-31 | 1 | -0/+11 |
| | | | | | |||||
| * | | | | removed uneccessary utils loadThumbnails function | JoramWilander | 2015-07-31 | 1 | -44/+0 |
| | | | | | |||||
| * | | | | image thumbnails now scale appropriately so there is no whitespace, also ↵ | JoramWilander | 2015-07-31 | 3 | -1/+52 |
| | | | | | | | | | | | | | | | | | | | | generalized some thumbnail loading code | ||||
* | | | | | Merge pull request #299 from nickago/MM-1734 | Christopher Speller | 2015-07-31 | 1 | -24/+22 |
|\ \ \ \ \ | | | | | | | | | | | | | MM-1734 Changed language in error message and did cosmetic refactoring | ||||
| * | | | | | Updated actual text of error message | nickago | 2015-07-31 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Changed language in error message to reflect better English and did cosmetic ↵ | nickago | 2015-07-30 | 1 | -24/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | refactoring | ||||
* | | | | | | 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 |
| | |_|_|/ | |/| | | | |||||
* | | | | | 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 | 17 | -333/+468 |
|\ \ \ \ | | | | | | | | | | | MM-1656 Updated file UI | ||||
| * | | | | 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. | ||||
* | | | | 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 |