Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | 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 | |
| | | ||||||
* | | Adding cmd line options | =Corey Hulen | 2015-09-04 | 1 | -35/+52 | |
|/ | ||||||
* | MM-2056 fixes problem with creating team | =Corey Hulen | 2015-08-31 | 1 | -1/+1 | |
| | ||||||
* | Added the ability to create a team with SSO services and added the ability ↵ | JoramWilander | 2015-08-28 | 1 | -1/+21 | |
| | | | | to turn off email sign up. | |||||
* | Implemention of slack import feature. | Christopher Speller | 2015-08-19 | 1 | -1/+2 | |
| | ||||||
* | Merge pull request #385 from mattermost/mm-1623 | Christopher Speller | 2015-08-18 | 1 | -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 well | JoramWilander | 2015-08-17 | 1 | -5/+25 | |
| | | ||||||
* | | added google sign-in functionality to the client, with minor model modifications | JoramWilander | 2015-08-14 | 1 | -13/+40 | |
| | | ||||||
* | | initial server implementation for using google as a single-sign-on oauth service | JoramWilander | 2015-08-14 | 1 | -0/+6 | |
|/ | ||||||
* | Merge pull request #273 from mattermost/mm-1355 | Corey Hulen | 2015-08-02 | 1 | -1/+20 | |
|\ | | | | | Fixes mm-1355 adds rate limiting apis | |||||
| * | Fixing code review feedback | =Corey Hulen | 2015-07-30 | 1 | -1/+6 | |
| | | ||||||
| * | Fixes mm-1355 adds rate limiting apis | =Corey Hulen | 2015-07-29 | 1 | -0/+14 | |
| | | ||||||
* | | Merge pull request #305 from nickago/MM-1681 | Corey Hulen | 2015-08-02 | 1 | -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 ↵ | nickago | 2015-07-31 | 1 | -16/+19 | |
| | | | | | | | | | | | | 'static' directory | |||||
* | | | Merge pull request #303 from nickago/MM-1642 | Christopher Speller | 2015-07-31 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | MM-1642 Updated the password error | |||||
| * | | Updated error message for an incorrect password | nickago | 2015-07-30 | 1 | -1/+1 | |
| |/ |