Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | 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 | 21 | -131/+789 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | fixes mm-1570 adds support for using mattermost as an OAuth client | |||||
| * | | | | | added store unit test for user.GetByAuth and added password length checking ↵ | JoramWilander | 2015-07-23 | 2 | -0/+25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | in api.login | |||||
| * | | | | | added SSOSettings to docker config file | JoramWilander | 2015-07-22 | 1 | -0/+10 | |
| | | | | | | ||||||
| * | | | | | add check on server to prevent password updating for users who log in ↵ | JoramWilander | 2015-07-22 | 1 | -0/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | through oauth | |||||
| * | | | | | only show gitlab signup/login links if gitlab oauth is turned on | JoramWilander | 2015-07-22 | 9 | -14/+46 | |
| | | | | | | ||||||
| * | | | | | add changes from team review | JoramWilander | 2015-07-22 | 5 | -12/+13 | |
| | | | | | | ||||||
| * | | | | | added error case for login and removed authdata + authservice unique ↵ | JoramWilander | 2015-07-22 | 2 | -10/+23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | constraint in users table | |||||
| * | | | | | added signup link verification to oauth signup flow | JoramWilander | 2015-07-22 | 3 | -49/+88 | |
| | | | | | | ||||||
| * | | | | | add error for trying to sign up with the same oauth account twice | JoramWilander | 2015-07-22 | 2 | -1/+6 | |
| | | | | | | ||||||
| * | | | | | 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 | 9 | -36/+50 | |
| | | | | | | ||||||
| * | | | | | made oauth architecture more generalized | JoramWilander | 2015-07-22 | 5 | -58/+141 | |
| | | | | | | ||||||
| * | | | | | 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 | 11 | -58/+463 | |
| | | | | | | ||||||
* | | | | | | 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 | 13 | -23/+32 | |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | 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 | 13 | -21/+30 | |
| |/ / / / / | ||||||
* | | | | | | 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 #238 from mattermost/mm-1639a | Corey Hulen | 2015-07-22 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | Adding godep support to travis | |||||
| * | | | | | | | Fixing godep restore | =Corey Hulen | 2015-07-22 | 2 | -2/+5 | |
| | | | | | | | | ||||||
| * | | | | | | | Fixing godep restore | =Corey Hulen | 2015-07-22 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | adding godep restore to travis | =Corey Hulen | 2015-07-22 | 1 | -0/+2 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge pull request #214 from hmhealey/mm1498 | Joram Wilander | 2015-07-22 | 1 | -0/+31 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | MM-1498 Provide a replacement message for email notifications for posts only containing files | |||||
| * | | | | | | | Use QueryUnescape function to convert to a human readable filename in email ↵ | hmhealey | 2015-07-21 | 1 | -1/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notifications | |||||
| * | | | | | | | Added additional check when adding a message to an email notification for a ↵ | hmhealey | 2015-07-20 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | blank post and corrected a comment | |||||
| * | | | | | | | Provide a replacement message for email notifications for posts only ↵ | hmhealey | 2015-07-20 | 1 | -4/+29 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | containing files | |||||
* | | | | | | | | Merge pull request #229 from rgarmsen2295/mm-1626 | Corey Hulen | 2015-07-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | MM-1626 Changes the subject line for emails sent regarding notifications | |||||
| * | | | | | | | | Changed the subject line for emails sent regarding mentions and other team ↵ | Reed Garmsen | 2015-07-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notifications. This is meant to prevent notification emails from different teams from combining into a single email thread | |||||
* | | | | | | | | | 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 | |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | |