Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1143 from mattermost/plt-803 | Corey Hulen | 2015-10-22 | 1 | -0/+10 |
|\ | | | | | PLT-803 Prevent users from resetting their password when the user is using SSO | ||||
| * | Prevent users from resetting their password when the user is using SSO | JoramWilander | 2015-10-22 | 1 | -0/+10 |
| | | |||||
* | | Fixing code review issues | =Corey Hulen | 2015-10-22 | 1 | -1/+1 |
| | | |||||
* | | Fixing group code review issues | =Corey Hulen | 2015-10-22 | 1 | -1/+1 |
| | | |||||
* | | Addressing issues from group code review | =Corey Hulen | 2015-10-22 | 1 | -20/+9 |
| | | |||||
* | | Merge branch 'master' into PLT-44 | =Corey Hulen | 2015-10-20 | 1 | -10/+10 |
|\| | |||||
| * | Changed all goroutine functions to use '...AndForget' as the standard naming ↵ | Reed Garmsen | 2015-10-19 | 1 | -10/+10 |
| | | | | | | | | system | ||||
* | | Multi-session login | =Corey Hulen | 2015-10-20 | 1 | -5/+1 |
| | | |||||
* | | Adding multi-session cookie | =Corey Hulen | 2015-10-20 | 1 | -11/+6 |
|/ | |||||
* | Removed preference migration code | hmhealey | 2015-10-15 | 1 | -1/+42 |
| | |||||
* | PLT-602 combining welcome and verify email | =Corey Hulen | 2015-10-13 | 1 | -5/+8 |
| | |||||
* | Changing SpinPunch to Mattermost in copyright | Christopher Speller | 2015-10-08 | 1 | -1/+1 |
| | |||||
* | Merge pull request #931 from rgarmsen2295/plt-112 | Christopher Speller | 2015-10-08 | 1 | -4/+28 |
|\ | | | | | PLT-112 Improves email change verification process | ||||
| * | Added new email to email change notification | Reed Garmsen | 2015-10-06 | 1 | -5/+6 |
| | | |||||
| * | Resending the verification email now sends the appropriate version of the ↵ | Reed Garmsen | 2015-10-05 | 1 | -2/+2 |
| | | | | | | | | email depending on whether it's a change or first signup | ||||
| * | Added better verification when a user changes his or her email | Reed Garmsen | 2015-10-05 | 1 | -0/+23 |
| | | |||||
* | | Adding checkout for system admin role | =Corey Hulen | 2015-10-06 | 1 | -1/+7 |
|/ | |||||
* | PLT-44 allow team switching without the need to login | =Corey Hulen | 2015-10-01 | 1 | -2/+37 |
| | |||||
* | Merge release branch 'release-1.0.0' | Christopher Speller | 2015-09-30 | 1 | -2/+2 |
|\ | |||||
| * | Fixing some locations to use the IsTeamAdmin function which properly checks ↵ | Christopher Speller | 2015-09-30 | 1 | -2/+2 |
| | | | | | | | | for system admin permissions. | ||||
* | | PLT-475 making sure session is properly removed | =Corey Hulen | 2015-09-29 | 1 | -1/+1 |
| | | |||||
* | | Merge release branch 'release-1.0.0' | Christopher Speller | 2015-09-29 | 1 | -2/+3 |
|\| | |||||
| * | Fix images in welcome email. | JoramWilander | 2015-09-28 | 1 | -2/+3 |
| | | |||||
* | | Fixing some SSO errors | Christopher Speller | 2015-09-29 | 1 | -1/+4 |
| | | |||||
* | | Properly revoke OAuth sessions when revoking all user sessions. | JoramWilander | 2015-09-28 | 1 | -4/+8 |
| | | |||||
* | | rebase | Jack | 2015-09-28 | 1 | -36/+70 |
|\| | |||||
| * | Merge pull request #793 from hmhealey/plt367 | Joram Wilander | 2015-09-25 | 1 | -0/+3 |
| |\ | | | | | | | PLT-367 Added a json response to the uploadProfileImage api call | ||||
| | * | Added a json response to the uploadProfileImage api call | hmhealey | 2015-09-24 | 1 | -0/+3 |
| | | | |||||
| * | | Added welcome email back in. | JoramWilander | 2015-09-25 | 1 | -8/+4 |
| |/ | |||||
| * | Assiging first user system_admin role | =Corey Hulen | 2015-09-23 | 1 | -0/+13 |
| | | |||||
| * | Fixing state setting | =Corey Hulen | 2015-09-23 | 1 | -2/+2 |
| | | |||||
| * | Fixing merge | =Corey Hulen | 2015-09-23 | 1 | -9/+6 |
| |\ | |||||
| * | | PLT-349 adding team mgt to admin console | =Corey Hulen | 2015-09-23 | 1 | -26/+48 |
| | | | |||||
* | | | use github.com/disintegration/imaging | Jack | 2015-09-23 | 1 | -2/+2 |
| |/ |/| | |||||
* | | Changing image settings to file settings | =Corey Hulen | 2015-09-23 | 1 | -6/+6 |
| | | |||||
* | | Merge branch 'master' into PLT-11-email | =Corey Hulen | 2015-09-23 | 1 | -3/+0 |
|\ \ | |/ |/| | |||||
| * | Implement UI theme colors. | JoramWilander | 2015-09-23 | 1 | -3/+0 |
| | | |||||
* | | Adding service settings to admin console | =Corey Hulen | 2015-09-22 | 1 | -7/+7 |
| | | |||||
* | | Adding team settings to admin console | =Corey Hulen | 2015-09-22 | 1 | -11/+5 |
| | | |||||
* | | Fixing unit tests | =Corey Hulen | 2015-09-21 | 1 | -10/+12 |
| | | |||||
* | | Adding image properties | =Corey Hulen | 2015-09-21 | 1 | -3/+3 |
| | | |||||
* | | Adding email to admin console | =Corey Hulen | 2015-09-21 | 1 | -2/+2 |
|/ | |||||
* | Updated godep workspace and freetype library so that godep save and restore ↵ | hmhealey | 2015-09-17 | 1 | -1/+1 |
| | | | | work again | ||||
* | Implement OAuth2 service provider functionality. | JoramWilander | 2015-09-16 | 1 | -20/+22 |
| | |||||
* | PLT-93 cleaing up client side configs | =Corey Hulen | 2015-09-15 | 1 | -10/+20 |
| | |||||
* | Renaming ROLE_ADMIN to ROLE_TEAM_ADMIN | =Corey Hulen | 2015-09-11 | 1 | -7/+7 |
| | |||||
* | merging | =Corey Hulen | 2015-09-10 | 1 | -4/+1 |
|\ | |||||
| * | Removed pointless attempt to verify a new user's username | hmhealey | 2015-09-09 | 1 | -4/+1 |
| | | |||||
* | | PLT-12 UI framework for admin console | =Corey Hulen | 2015-09-10 | 1 | -14/+17 |
| | | |||||
* | | Adding unit tests for cmd line | =Corey Hulen | 2015-09-04 | 1 | -1/+1 |
| | |