summaryrefslogtreecommitdiffstats
path: root/api/user.go
Commit message (Collapse)AuthorAgeFilesLines
* Merge release branch 'release-1.0.0'Christopher Speller2015-09-301-2/+2
|\
| * Fixing some locations to use the IsTeamAdmin function which properly checks ↵Christopher Speller2015-09-301-2/+2
| | | | | | | | for system admin permissions.
* | PLT-475 making sure session is properly removed=Corey Hulen2015-09-291-1/+1
| |
* | Merge release branch 'release-1.0.0'Christopher Speller2015-09-291-2/+3
|\|
| * Fix images in welcome email.JoramWilander2015-09-281-2/+3
| |
* | Fixing some SSO errorsChristopher Speller2015-09-291-1/+4
| |
* | Properly revoke OAuth sessions when revoking all user sessions.JoramWilander2015-09-281-4/+8
| |
* | rebaseJack2015-09-281-36/+70
|\|
| * Merge pull request #793 from hmhealey/plt367Joram Wilander2015-09-251-0/+3
| |\ | | | | | | PLT-367 Added a json response to the uploadProfileImage api call
| | * Added a json response to the uploadProfileImage api callhmhealey2015-09-241-0/+3
| | |
| * | Added welcome email back in.JoramWilander2015-09-251-8/+4
| |/
| * Assiging first user system_admin role=Corey Hulen2015-09-231-0/+13
| |
| * Fixing state setting=Corey Hulen2015-09-231-2/+2
| |
| * Fixing merge=Corey Hulen2015-09-231-9/+6
| |\
| * | PLT-349 adding team mgt to admin console=Corey Hulen2015-09-231-26/+48
| | |
* | | use github.com/disintegration/imagingJack2015-09-231-2/+2
| |/ |/|
* | Changing image settings to file settings=Corey Hulen2015-09-231-6/+6
| |
* | Merge branch 'master' into PLT-11-email=Corey Hulen2015-09-231-3/+0
|\ \ | |/ |/|
| * Implement UI theme colors.JoramWilander2015-09-231-3/+0
| |
* | Adding service settings to admin console=Corey Hulen2015-09-221-7/+7
| |
* | Adding team settings to admin console=Corey Hulen2015-09-221-11/+5
| |
* | Fixing unit tests=Corey Hulen2015-09-211-10/+12
| |
* | Adding image properties=Corey Hulen2015-09-211-3/+3
| |
* | Adding email to admin console=Corey Hulen2015-09-211-2/+2
|/
* Updated godep workspace and freetype library so that godep save and restore ↵hmhealey2015-09-171-1/+1
| | | | work again
* Implement OAuth2 service provider functionality.JoramWilander2015-09-161-20/+22
|
* PLT-93 cleaing up client side configs=Corey Hulen2015-09-151-10/+20
|
* Renaming ROLE_ADMIN to ROLE_TEAM_ADMIN=Corey Hulen2015-09-111-7/+7
|
* merging=Corey Hulen2015-09-101-4/+1
|\
| * Removed pointless attempt to verify a new user's usernamehmhealey2015-09-091-4/+1
| |
* | PLT-12 UI framework for admin console=Corey Hulen2015-09-101-14/+17
| |
* | Adding unit tests for cmd line=Corey Hulen2015-09-041-1/+1
| |
* | Adding cmd line options=Corey Hulen2015-09-041-35/+52
|/
* MM-2056 fixes problem with creating team=Corey Hulen2015-08-311-1/+1
|
* Added the ability to create a team with SSO services and added the ability ↵JoramWilander2015-08-281-1/+21
| | | | to turn off email sign up.
* Implemention of slack import feature.Christopher Speller2015-08-191-1/+2
|
* Merge pull request #385 from mattermost/mm-1623Christopher Speller2015-08-181-5/+25
|\ | | | | MM-1623 when user roles are updated, the relevant session roles are updated as well
| * when user roles are updated, the relevant session roles are updated as wellJoramWilander2015-08-171-5/+25
| |
* | added google sign-in functionality to the client, with minor model modificationsJoramWilander2015-08-141-13/+40
| |
* | initial server implementation for using google as a single-sign-on oauth serviceJoramWilander2015-08-141-0/+6
|/
* Merge pull request #273 from mattermost/mm-1355Corey Hulen2015-08-021-1/+20
|\ | | | | Fixes mm-1355 adds rate limiting apis
| * Fixing code review feedback=Corey Hulen2015-07-301-1/+6
| |
| * Fixes mm-1355 adds rate limiting apis=Corey Hulen2015-07-291-0/+14
| |
* | Merge pull request #305 from nickago/MM-1681Corey Hulen2015-08-021-16/+19
|\ \ | | | | | | MM-1681 Fixed regression of static images not displaying in emails
| * | Changed all templates to use site url instead of team url for finding the ↵nickago2015-07-311-16/+19
| | | | | | | | | | | | 'static' directory
* | | Merge pull request #303 from nickago/MM-1642Christopher Speller2015-07-311-1/+1
|\ \ \ | |/ / |/| | MM-1642 Updated the password error
| * | Updated error message for an incorrect passwordnickago2015-07-301-1/+1
| |/
* | Merge pull request #283 from mattermost/mm-1787Christopher Speller2015-07-311-5/+4
|\ \ | | | | | | MM-1787 Fixing links for signup from team invite link.
| * | Removing nickname parameter from FireAndForgetVerifyEmailChristopher Speller2015-07-301-3/+2
| | |
| * | Fixing links for signup from team invite link. Enter now advances ↵Christopher Speller2015-07-301-5/+5
| |/ | | | | | | signup_user_complete screen. Signin now link now redirects properly.