Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 #237 from mattermost/mm-1570 | Corey Hulen | 2015-07-23 | 12 | -42/+402 |
|\ | | | | | 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 | 7 | -11/+32 |
| | | |||||
| * | add changes from team review | JoramWilander | 2015-07-22 | 1 | -3/+3 |
| | | |||||
| * | added signup link verification to oauth signup flow | JoramWilander | 2015-07-22 | 2 | -4/+54 |
| | | |||||
| * | add error for trying to sign up with the same oauth account twice | JoramWilander | 2015-07-22 | 1 | -0/+5 |
| | | |||||
| * | added error message when trying to sign up with gitlab using an email ↵ | JoramWilander | 2015-07-22 | 1 | -0/+5 |
| | | | | | | | | already used in the system | ||||
| * | merged with new team domain changes and added signup/login links for gitlab | JoramWilander | 2015-07-22 | 7 | -28/+42 |
| | | |||||
| * | made oauth architecture more generalized | JoramWilander | 2015-07-22 | 1 | -35/+73 |
| | | |||||
| * | 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 | 4 | -0/+208 |
| | | |||||
* | | Merge pull request #194 from ralder/fix-command-box-css | Corey Hulen | 2015-07-22 | 11 | -103/+101 |
|\ \ | | | | | | | [webui] fix command-list css | ||||
| * | | [webui] fix command-list css | ralder | 2015-07-22 | 11 | -103/+101 |
| | | | |||||
* | | | Merge pull request #240 from asaadmahmoodspin/master | Corey Hulen | 2015-07-22 | 12 | -22/+31 |
|\ \ \ | | | | | | | | | Minor UI Improvements | ||||
| * | | | Updating dropdown icon in LHS header | Asaad Mahmood | 2015-07-23 | 1 | -2/+2 |
| | | | | |||||
| * | | | Minor UI Improvements | Asaad Mahmood | 2015-07-23 | 12 | -20/+29 |
| |/ / | |||||
* | | | 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 | 3 | -15/+86 |
|\ \ \ \ | |_|/ / |/| | | | MM-1547 Added local cache storing of drafts for comments | ||||
| * | | | Added message persistance on closing RHS/switching to another comment | nickago | 2015-07-22 | 3 | -15/+86 |
| | | | | | | | | | | | | | | | | | | | | 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 | 6 | -5/+130 |
|\ \ \ \ \ | | | | | | | | | | | | | 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 | ||||
| * | | | | | Changed the placeholder highlight for active thread to be more subtle | hmhealey | 2015-07-21 | 1 | -2/+4 |
| | | | | | | |||||
| * | | | | | 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 | 4 | -4/+89 |
| | | | | | | |||||
| * | | | | | Added events for when the active thread (ie the message thread that a user ↵ | hmhealey | 2015-07-21 | 2 | -0/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | is responding to) changes | ||||
* | | | | | | Merge pull request #236 from mattermost/it33-patch-1 | Corey Hulen | 2015-07-22 | 1 | -3/+8 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Update to latest community URLs | ||||
| * | | | | | | Update to latest community URLs | it33 | 2015-07-22 | 1 | -3/+8 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | 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 | 5 | -12/+29 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Profile pic changes in LHS Header | ||||
| * | | | | | | Improving formatting for Channel Intro | Asaad Mahmood | 2015-07-22 | 3 | -11/+23 |
| | | | | | | | |||||
| * | | | | | | 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 | 2 | -1/+5 |
| |/ / / / / | | | | | | | | | | | | | | | | | | | 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 | 10 | -168/+350 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Adding back Access History and Active Devices | ||||
| * | | | | | Adding back Access History and Active Devices | Reed Garmsen | 2015-07-22 | 10 | -168/+350 |
| | | | | | | |||||
* | | | | | | Small patch for a null TypeError in post_list updating code | Christopher Speller | 2015-07-22 | 1 | -0/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #231 from mattermost/file-fixes | Christopher Speller | 2015-07-22 | 2 | -27/+27 |
|\ \ \ \ \ | | | | | | | | | | | | | More patches for files | ||||
| * | | | | | fix the ability to remove file previews once uploaded | JoramWilander | 2015-07-22 | 1 | -2/+3 |
| | | | | | | |||||
| * | | | | | fixed thumbnails and files in RHS | JoramWilander | 2015-07-22 | 1 | -25/+24 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #230 from mattermost/download-link-fix | Christopher Speller | 2015-07-22 | 1 | -3/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | fixed download link in image viewer | ||||
| * | | | | | fixed download link in image viewer | JoramWilander | 2015-07-21 | 1 | -3/+10 |
| | | | | | | |||||
* | | | | | | Merge pull request #224 from hmhealey/mm1625 | Christopher Speller | 2015-07-22 | 2 | -4/+11 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | MM-1625 Correct the appearance of the post menu on both desktop and mobile | ||||
| * | | | | | Changed post menu label to be ... and to make it visible at all times on ↵ | hmhealey | 2015-07-21 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | small screens (ie mobile devices) |