| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #246 from rgarmsen2295/mm-1657 | Joram Wilander | 2015-07-27 | 1 | -32/+5 |
| |\ | | | | | MM-1657 Removes tag highlighting for mentions | ||||
| | * | Removed vestige textdiv code that is also no longer necessary due to ↵ | Reed Garmsen | 2015-07-24 | 1 | -21/+1 |
| | | | | | | | | | removing the mention tags | ||||
| | * | Removes the blue tag highlighting from mentions that would appear after ↵ | Reed Garmsen | 2015-07-23 | 1 | -13/+6 |
| | | | | | | | | | typing a mention | ||||
| * | | Merge pull request #245 from nickago/MM-1662 | Corey Hulen | 2015-07-27 | 1 | -3/+5 |
| |\ \ | | | | | | | MM-1662 Added support for png profile pictures | ||||
| | * | | Added support for png profile pictures | nickago | 2015-07-23 | 1 | -3/+5 |
| | | | | |||||
| * | | | Merge pull request #249 from asaadmahmoodspin/master | Joram Wilander | 2015-07-24 | 1 | -6/+5 |
| |\ \ \ | | | | | | | | | Complete signup page UI changes | ||||
| | * | | | Adding hint text for username back in | Asaad Mahmood | 2015-07-24 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Minor class changes | Asaad Mahmood | 2015-07-24 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Complete signup page UI changes | Asaad Mahmood | 2015-07-24 | 1 | -6/+4 |
| | | | | | |||||
| * | | | | Merge pull request #226 from nickago/MM-1546 | Joram Wilander | 2015-07-24 | 5 | -5/+64 |
| |\ \ \ \ | |/ / / |/| | | | MM-1546 Clear error messages on modal close and channel switch | ||||
| | * | | | Added a condition to close event listeners on modals when the component | nickago | 2015-07-23 | 4 | -27/+40 |
| | | | | | | | | | | | | | | | | | is unmounted, and set all unsaved data to be cleared from user settings | ||||
| | * | | | When closing out of a modal, unsaved data and text inside of it is erased. | nickago | 2015-07-23 | 5 | -5/+51 |
| | |/ / | |||||
| * | | | Merge pull request #242 from asaadmahmoodspin/master | Christopher Speller | 2015-07-23 | 4 | -4/+8 |
| |\ \ \ | | | | | | | | | UI Fixes | ||||
| | * | | | Placing SVGs into constants.jsx | Asaad Mahmood | 2015-07-23 | 4 | -4/+8 |
| | | | | | |||||
| | * | | | UI Fixes | Asaad Mahmood | 2015-07-23 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Merge pull request #243 from hmhealey/mm1678 | Christopher Speller | 2015-07-23 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | MM-1678 Fixed sidebar so that it can open threads containing non-image attachments | ||||
| | * | | | Fixed reference to non-existant local variable that prevented the sidebar ↵ | hmhealey | 2015-07-23 | 1 | -1/+1 |
| | |/ / | | | | | | | | | | from opening message threads containing non-image attachments | ||||
| * | | | Merge pull request #244 from rgarmsen2295/mm-1610 | Christopher Speller | 2015-07-23 | 3 | -3/+3 |
| |\ \ \ | |_|/ |/| | | MM-1610 Fixed issue with error message for uploading more than 5 files not appearing on OSX | ||||
| | * | | Fixed issue with error message for uploading more than 5 files not appearing ↵ | Reed Garmsen | 2015-07-23 | 3 | -3/+3 |
| | |/ | | | | | | | on OSX | ||||
| * | | Merge pull request #237 from mattermost/mm-1570 | Corey Hulen | 2015-07-23 | 5 | -35/+160 |
| |\ \ | |/ |/| | fixes mm-1570 adds support for using mattermost as an OAuth client | ||||
| | * | only show gitlab signup/login links if gitlab oauth is turned on | JoramWilander | 2015-07-22 | 2 | -5/+24 |
| | | | |||||
| | * | added signup link verification to oauth signup flow | JoramWilander | 2015-07-22 | 1 | -1/+1 |
| | | | |||||
| | * | merged with new team domain changes and added signup/login links for gitlab | JoramWilander | 2015-07-22 | 3 | -8/+11 |
| | | | |||||
| | * | removed change password UI for oauth accounts | JoramWilander | 2015-07-22 | 3 | -30/+49 |
| | | | |||||
| | * | inital implementation of using GitLab OAuth2 provider for signup/login | JoramWilander | 2015-07-22 | 1 | -0/+84 |
| | | | |||||
| * | | Merge pull request #194 from ralder/fix-command-box-css | Corey Hulen | 2015-07-22 | 3 | -34/+35 |
| |\ \ | | | | | | | [webui] fix command-list css | ||||
| | * | | [webui] fix command-list css | ralder | 2015-07-22 | 3 | -34/+35 |
| | | | | |||||
| * | | | Merge pull request #240 from asaadmahmoodspin/master | Corey Hulen | 2015-07-22 | 7 | -11/+15 |
| |\ \ \ | | | | | | | | | Minor UI Improvements | ||||
| | * | | | Minor UI Improvements | Asaad Mahmood | 2015-07-23 | 7 | -11/+15 |
| | |/ / | |||||
| * | | | Merge pull request #241 from rgarmsen2295/mm-1556 | Joram Wilander | 2015-07-22 | 1 | -4/+14 |
| |\ \ \ | | | | | | | | | MM-1556 Better error handling of channel descriptions that are too large | ||||
| | * | | | Channel descriptions entered that are larger than the max number of bytes ↵ | Reed Garmsen | 2015-07-22 | 1 | -4/+14 |
| | | | | | | | | | | | | | | | | | now cause an error to be printed to the client without closing the modal and losing the user's draft of the description | ||||
| * | | | | Merge pull request #228 from nickago/MM-1547 | Joram Wilander | 2015-07-22 | 2 | -7/+66 |
| |\ \ \ \ | |_|/ / |/| | | | MM-1547 Added local cache storing of drafts for comments | ||||
| | * | | | Added message persistance on closing RHS/switching to another comment | nickago | 2015-07-22 | 2 | -7/+66 |
| | | | | | | | | | | | | | | | | | | | | | thread. Similar to the center pane and channels, switching comment threads won't delete entered but unsent text/media in the RHS | ||||
| * | | | | Merge pull request #219 from nickago/scrollBug | Corey Hulen | 2015-07-22 | 1 | -0/+2 |
| |\ \ \ \ | | | | | | | | | | | Fixes RHS scrolling into whitespace on new comment open | ||||
| | * | | | | Upon changing to a new comment thread, fixes the the bug of the RHS ↵ | nickago | 2015-07-21 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | scrolling to whitespace below the pane | ||||
| * | | | | | Merge pull request #201 from hmhealey/mm1539 | Corey Hulen | 2015-07-22 | 3 | -5/+107 |
| |\ \ \ \ \ | | | | | | | | | | | | | MM-1539 Added the ability to reply to earlier message threads by starting a post with ^ | ||||
| | * | | | | | Prevent users from sending empty ^ reply messages | hmhealey | 2015-07-21 | 1 | -5/+5 |
| | | | | | | | |||||
| | * | | | | | Added handling for when the user is ^ responding to a post that gets deleted | hmhealey | 2015-07-21 | 1 | -1/+7 |
| | | | | | | | |||||
| | * | | | | | Track caretCount as part of createPost's state so that we don't ↵ | hmhealey | 2015-07-21 | 1 | -22/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | unnecessarily search for a thread to reply to when the user is typing | ||||
| | * | | | | | Trim the carets from the beginning of reply messages when they're posted | hmhealey | 2015-07-21 | 1 | -0/+5 |
| | | | | | | | |||||
| | * | | | | | Change the create_post component to track the active thread using the event ↵ | hmhealey | 2015-07-21 | 1 | -14/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | dispatcher so that it stays in sync with the post_list | ||||
| | * | | | | | Added function to reply to earlier messages by prefixing a message with carets | hmhealey | 2015-07-21 | 3 | -3/+84 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #235 from rgarmsen2295/mm-1596 | Corey Hulen | 2015-07-22 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | MM-1596 While in mobile mode notifications are no longer counted for channels set to 'quiet mode' that are not direct mentions | ||||
| | * | | | | | | While in mobile mode notifications are no longer counted for channels set to ↵ | Reed Garmsen | 2015-07-22 | 1 | -1/+1 |
| | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | 'quiet mode' that are not direct mentions. | ||||
| * | | | | | | Merge pull request #234 from asaadmahmoodspin/master | Corey Hulen | 2015-07-22 | 3 | -9/+14 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Profile pic changes in LHS Header | ||||
| | * | | | | | | Improving formatting for Channel Intro | Asaad Mahmood | 2015-07-22 | 1 | -9/+9 |
| | | | | | | | | |||||
| | * | | | | | | Adjusting scroll in RHS to not show whitespace | Asaad Mahmood | 2015-07-22 | 1 | -0/+1 |
| | | | | | | | | |||||
| | * | | | | | | Profile pic changes in LHS Header | Asaad Mahmood | 2015-07-22 | 1 | -0/+4 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | Removing profile pic in the LHS Header if the user hasn't uploaded a custom profile pic. | ||||
| * | | | | | | Merge pull request #233 from asaadmahmoodspin/mm-1616 | Corey Hulen | 2015-07-22 | 4 | -162/+228 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | Adding back Access History and Active Devices | ||||
| | * | | | | | Adding back Access History and Active Devices | Reed Garmsen | 2015-07-22 | 4 | -162/+228 |
| | | | | | | | |||||
 |
server / chat | |
| chat | spline |
| summaryrefslogtreecommitdiffstats |