| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fixing style guide stuff in post_list | Asaad Mahmood | 2015-08-05 | 1 | -5/+3 |
| | | |||||
| * | Removing console.log | Asaad Mahmood | 2015-08-05 | 1 | -1/+0 |
| | | |||||
| * | Fixing mentions scroll again due to merge conflict | Asaad Mahmood | 2015-08-05 | 1 | -0/+7 |
| | | |||||
| * | Merge branch 'master' of https://github.com/mattermost/platform | Asaad Mahmood | 2015-08-05 | 12 | -295/+359 |
| |\ | | | | | | | | | Conflicts: web/react/components/mention_list.jsx | ||||
| | * | Merge pull request #326 from nickago/MM-1754 | Christopher Speller | 2015-08-04 | 6 | -6/+6 |
| | |\ | | | | | | | MM-1754 Modals now close upon pressing ESC | ||||
| | | * | Added closing on ESC key press | nickago | 2015-08-04 | 6 | -6/+6 |
| | | | | |||||
| | * | | Merge pull request #321 from rgarmsen2295/mm-1611 | Christopher Speller | 2015-08-04 | 1 | -84/+96 |
| | |\ \ | | | | | | | | | MM-1611 Removes ability to cycle through the mention list by jumping top to bottom or vice versa | ||||
| | | * | | Cosmetic changes to better follow style guide | Reed Garmsen | 2015-08-03 | 1 | -75/+95 |
| | | | | | |||||
| | | * | | Removes ability for the mention list to cycle from top to bottom and vice-versa | Reed Garmsen | 2015-08-03 | 1 | -13/+5 |
| | | | | | |||||
| | * | | | Merge pull request #310 from nickago/MM-1671 | Christopher Speller | 2015-08-04 | 1 | -62/+70 |
| | |\ \ \ | | | | | | | | | | | MM-1671 Added support for enter key triggering submission and changed Close to Cancel | ||||
| | | * | | | Cosmetic Refactoring | nickago | 2015-08-04 | 1 | -59/+67 |
| | | | | | | |||||
| | | * | | | Changed 'Close' to 'Cancel' | nickago | 2015-08-04 | 1 | -2/+2 |
| | | | | | | |||||
| | | * | | | Placed button inside of form to allow for submission on strike of enter key | nickago | 2015-08-04 | 1 | -8/+8 |
| | | | |/ | | |/| | |||||
| | * | | | Merge pull request #325 from rgarmsen2295/mm-1618 | Christopher Speller | 2015-08-04 | 3 | -19/+37 |
| | |\ \ \ | | | | | | | | | | | MM-1618 Adds help text to the Get Link modal that informs user when link has been copied to clipboard | ||||
| | | * | | | Fixed help text rendering on mobile | Reed Garmsen | 2015-08-04 | 2 | -9/+10 |
| | | | | | | |||||
| | | * | | | Added help text informing the user that the team invite link has been copied ↵ | Reed Garmsen | 2015-08-03 | 3 | -18/+35 |
| | | | |/ | | |/| | | | | | | | | | when they press the 'Copy Link' button | ||||
| | * | | | Merge pull request #323 from rgarmsen2295/mm-1554 | Christopher Speller | 2015-08-04 | 1 | -119/+151 |
| | |\ \ \ | | | | | | | | | | | MM-1554 Removes the delete icon for the first entry in the 'Invite New Members' form | ||||
| | | * | | | Cosmetic refactoring to better fit style guide | Reed Garmsen | 2015-08-04 | 1 | -121/+151 |
| | | | | | | |||||
| | | * | | | The first field of the 'Invite New Member' field can no longer be cleared or ↵ | Reed Garmsen | 2015-08-03 | 1 | -0/+2 |
| | | |/ / | | | | | | | | | | | | | deleted | ||||
| * | | | | Updating channel header tooltip placement | Asaad Mahmood | 2015-08-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | 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 |
| | | |_|_|/ | |/| | | | |||||
 |
server / chat | |
| chat | spline |
| summaryrefslogtreecommitdiffstats |