summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into mm-1420=Corey Hulen2015-07-2343-257/+922
|\
| * Merge pull request #237 from mattermost/mm-1570Corey Hulen2015-07-2321-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 ↵JoramWilander2015-07-232-0/+25
| | | | | | | | | | | | in api.login
| | * added SSOSettings to docker config fileJoramWilander2015-07-221-0/+10
| | |
| | * add check on server to prevent password updating for users who log in ↵JoramWilander2015-07-221-0/+7
| | | | | | | | | | | | through oauth
| | * only show gitlab signup/login links if gitlab oauth is turned onJoramWilander2015-07-229-14/+46
| | |
| | * add changes from team reviewJoramWilander2015-07-225-12/+13
| | |
| | * added error case for login and removed authdata + authservice unique ↵JoramWilander2015-07-222-10/+23
| | | | | | | | | | | | constraint in users table
| | * added signup link verification to oauth signup flowJoramWilander2015-07-223-49/+88
| | |
| | * add error for trying to sign up with the same oauth account twiceJoramWilander2015-07-222-1/+6
| | |
| | * added error message when trying to sign up with gitlab using an email ↵JoramWilander2015-07-221-0/+5
| | | | | | | | | | | | already used in the system
| | * merged with new team domain changes and added signup/login links for gitlabJoramWilander2015-07-229-36/+50
| | |
| | * made oauth architecture more generalizedJoramWilander2015-07-225-58/+141
| | |
| | * removed change password UI for oauth accountsJoramWilander2015-07-223-30/+49
| | |
| | * inital implementation of using GitLab OAuth2 provider for signup/loginJoramWilander2015-07-2211-58/+463
| | |
| * | Merge pull request #194 from ralder/fix-command-box-cssCorey Hulen2015-07-2211-103/+101
| |\ \ | | | | | | | | [webui] fix command-list css
| | * | [webui] fix command-list cssralder2015-07-2211-103/+101
| | | |
| * | | Merge pull request #240 from asaadmahmoodspin/masterCorey Hulen2015-07-2213-23/+32
| |\ \ \ | | | | | | | | | | Minor UI Improvements
| | * | | Updating dropdown icon in LHS headerAsaad Mahmood2015-07-231-2/+2
| | | | |
| | * | | Minor UI ImprovementsAsaad Mahmood2015-07-2313-21/+30
| | |/ /
* | | | Merge branch 'master' into mm-1420=Corey Hulen2015-07-2244-446/+1080
|\| | |
| * | | Merge pull request #241 from rgarmsen2295/mm-1556Joram Wilander2015-07-221-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 Garmsen2015-07-221-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-1547Joram Wilander2015-07-223-15/+86
| |\ \ \ \ | | | | | | | | | | | | MM-1547 Added local cache storing of drafts for comments
| | * | | | Added message persistance on closing RHS/switching to another commentnickago2015-07-223-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-1639aCorey Hulen2015-07-221-0/+5
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | Adding godep support to travis
| | * | | | Fixing godep restore=Corey Hulen2015-07-222-2/+5
| | | | | |
| | * | | | Fixing godep restore=Corey Hulen2015-07-221-1/+1
| | | | | |
| | * | | | adding godep restore to travis=Corey Hulen2015-07-221-0/+2
| | | | | |
| * | | | | Merge pull request #214 from hmhealey/mm1498Joram Wilander2015-07-221-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 ↵hmhealey2015-07-211-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | notifications
| | * | | | Added additional check when adding a message to an email notification for a ↵hmhealey2015-07-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | blank post and corrected a comment
| | * | | | Provide a replacement message for email notifications for posts only ↵hmhealey2015-07-201-4/+29
| | | | | | | | | | | | | | | | | | | | | | | | containing files
| * | | | | Merge pull request #229 from rgarmsen2295/mm-1626Corey Hulen2015-07-221-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 Garmsen2015-07-211-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/scrollBugCorey Hulen2015-07-221-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 ↵nickago2015-07-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scrolling to whitespace below the pane
| * | | | | | | Merge pull request #201 from hmhealey/mm1539Corey Hulen2015-07-226-5/+130
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | MM-1539 Added the ability to reply to earlier message threads by starting a post with ^
| | * | | | | | | Prevent users from sending empty ^ reply messageshmhealey2015-07-211-5/+5
| | | | | | | | |
| | * | | | | | | Added handling for when the user is ^ responding to a post that gets deletedhmhealey2015-07-211-1/+7
| | | | | | | | |
| | * | | | | | | Track caretCount as part of createPost's state so that we don't ↵hmhealey2015-07-211-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 subtlehmhealey2015-07-211-2/+4
| | | | | | | | |
| | * | | | | | | Trim the carets from the beginning of reply messages when they're postedhmhealey2015-07-211-0/+5
| | | | | | | | |
| | * | | | | | | Change the create_post component to track the active thread using the event ↵hmhealey2015-07-211-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 caretshmhealey2015-07-214-4/+89
| | | | | | | | |
| | * | | | | | | Added events for when the active thread (ie the message thread that a user ↵hmhealey2015-07-212-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is responding to) changes
| * | | | | | | | Merge pull request #236 from mattermost/it33-patch-1Corey Hulen2015-07-221-3/+8
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Update to latest community URLs
| | * | | | | | | | Update to latest community URLsit332015-07-221-3/+8
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Merge pull request #235 from rgarmsen2295/mm-1596Corey Hulen2015-07-221-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 Garmsen2015-07-221-1/+1
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | 'quiet mode' that are not direct mentions.
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-10 16:56:31 +0000