Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #665 from chengweiv5/fix-coding-style | Christopher Speller | 2015-09-18 | 1 | -1/+1 |
|\ | | | | | Fix coding style: replace tab with whitespace in mattermost config | ||||
| * | Fix coding style: replace tab with whitespace in mattermost config | Chengwei Yang | 2015-09-13 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com> | ||||
* | | Implement OAuth2 service provider functionality. | JoramWilander | 2015-09-16 | 1 | -1/+2 |
| | | |||||
* | | PLT-93 cleaing up client side configs | =Corey Hulen | 2015-09-15 | 1 | -6/+4 |
|/ | |||||
* | MM-2056 fixes problem with creating team | =Corey Hulen | 2015-08-31 | 1 | -1/+1 |
| | |||||
* | Remove Google as a SSO service. | JoramWilander | 2015-08-28 | 1 | -9/+0 |
| | |||||
* | Added the ability to create a team with SSO services and added the ability ↵ | JoramWilander | 2015-08-28 | 1 | -1/+2 |
| | | | | to turn off email sign up. | ||||
* | Fixes PL-3 Restrict team creation to specific domains | =Corey Hulen | 2015-08-25 | 1 | -1/+1 |
| | |||||
* | Fixes PL-3 Restrict team creation to specific domains | =Corey Hulen | 2015-08-25 | 1 | -1/+2 |
| | |||||
* | Fixes PL-1 added ability to disable team creation | =Corey Hulen | 2015-08-25 | 1 | -3/+4 |
| | |||||
* | Add support for SMTP servers with StartTLS | Jirka Hlavacek | 2015-08-19 | 1 | -1/+2 |
| | |||||
* | turn off google SSO by default and remove test google oauth credentials | JoramWilander | 2015-08-14 | 1 | -3/+3 |
| | |||||
* | initial server implementation for using google as a single-sign-on oauth service | JoramWilander | 2015-08-14 | 1 | -0/+10 |
| | |||||
* | Merge branch 'master' into mm-1619 | =Corey Hulen | 2015-08-02 | 1 | -3/+11 |
|\ | |||||
| * | Merge pull request #273 from mattermost/mm-1355 | Corey Hulen | 2015-08-02 | 2 | -2/+18 |
| |\ | | | | | | | Fixes mm-1355 adds rate limiting apis | ||||
| | * | Fixing code review feedback | =Corey Hulen | 2015-07-30 | 2 | -2/+2 |
| | | | |||||
| | * | Fixes mm-1355 adds rate limiting apis | =Corey Hulen | 2015-07-29 | 2 | -2/+18 |
| | | | |||||
| * | | updated docker config thumbnail width/height | JoramWilander | 2015-07-31 | 1 | -2/+2 |
| | | | |||||
| * | | image thumbnails now scale appropriately so there is no whitespace, also ↵ | JoramWilander | 2015-07-31 | 1 | -2/+2 |
| | | | | | | | | | | | | generalized some thumbnail loading code | ||||
* | | | Updating dockerfile for 0.6.0-rc1. Moving docker files into versioned ↵ | Christopher Speller | 2015-07-31 | 1 | -90/+0 |
|/ / | | | | | | | directories. | ||||
* / | Made font type a field in the config file | Reed Garmsen | 2015-07-29 | 2 | -2/+4 |
|/ | |||||
* | Fixing merges for latest postgres | =Corey Hulen | 2015-07-23 | 2 | -4/+4 |
| | |||||
* | added SSOSettings to docker config file | JoramWilander | 2015-07-22 | 1 | -0/+10 |
| | |||||
* | only show gitlab signup/login links if gitlab oauth is turned on | JoramWilander | 2015-07-22 | 1 | -3/+3 |
| | |||||
* | add changes from team review | JoramWilander | 2015-07-22 | 1 | -6/+6 |
| | |||||
* | merged with new team domain changes and added signup/login links for gitlab | JoramWilander | 2015-07-22 | 1 | -2/+2 |
| | |||||
* | made oauth architecture more generalized | JoramWilander | 2015-07-22 | 1 | -4/+8 |
| | |||||
* | inital implementation of using GitLab OAuth2 provider for signup/login | JoramWilander | 2015-07-22 | 1 | -0/+6 |
| | |||||
* | change docker default storage directory to /mattermost/data | JoramWilander | 2015-07-21 | 1 | -1/+1 |
| | |||||
* | added relative data directory as default for storage and added it to gitignore | JoramWilander | 2015-07-21 | 1 | -2/+2 |
| | |||||
* | create default storage directory in Dockerfile, turn on server storage by ↵ | JoramWilander | 2015-07-21 | 1 | -2/+2 |
| | | | | default for docker config | ||||
* | turned off local server storage by default | JoramWilander | 2015-07-21 | 2 | -4/+4 |
| | |||||
* | initial implementation of local server storage for files | JoramWilander | 2015-07-21 | 2 | -2/+6 |
| | |||||
* | Changing the way we mattermost handles URLs. team.domain.com becomes ↵ | Christopher Speller | 2015-07-20 | 2 | -12/+2 |
| | | | | | | | domain.com/team. Renaming team.Name to team.DisplayName and team.Domain to team.Name. So: team.Name -> url safe name. team.DisplayName -> nice name for users | ||||
* | Merge pull request #185 from mattermost/mm-1348 | Corey Hulen | 2015-07-17 | 2 | -8/+0 |
|\ | | | | | fixes mm-1348 removing dependency on redis | ||||
| * | fixes mm-1348 removing dependency on redis | =Corey Hulen | 2015-07-14 | 2 | -8/+0 |
| | | |||||
* | | Fixes mm-1415 adding email bypass flag | =Corey Hulen | 2015-07-12 | 2 | -2/+4 |
|/ | |||||
* | Merge branch 'master' into mm-1391 | =Corey Hulen | 2015-07-05 | 1 | -1/+1 |
|\ | |||||
| * | Merge pull request #77 from mattermost/release-0.50 | Corey Hulen | 2015-06-25 | 1 | -1/+1 |
| |\ | | | | | | | Release 0.50 | ||||
| | * | updating readme | =Corey Hulen | 2015-06-25 | 1 | -1/+1 |
| | | | |||||
* | | | adding api unit tests | =Corey Hulen | 2015-06-25 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #27 from mattermost/mm-1240 | Corey Hulen | 2015-06-25 | 1 | -1/+1 |
|\ \ | |/ |/| | fixes mm-1240 adds ability to turn valet feature on | ||||
| * | revert debug config changes | JoramWilander | 2015-06-18 | 1 | -2/+2 |
| | | |||||
| * | added team store, team settings menu, and the ability to turn on valet ↵ | JoramWilander | 2015-06-18 | 1 | -2/+2 |
| | | | | | | | | feature from client | ||||
| * | move valet feature switch to DB from config | JoramWilander | 2015-06-17 | 1 | -1/+1 |
| | | |||||
| * | Fixing build | =Corey Hulen | 2015-06-16 | 1 | -1/+1 |
| | | |||||
| * | changing port back | =Corey Hulen | 2015-06-16 | 1 | -1/+1 |
| | | |||||
| * | Using config.json instead of config_docker.json for docker. Note, this will ↵ | Christopher Speller | 2015-06-16 | 2 | -90/+6 |
| | | | | | | | | break local dev builds. | ||||
| * | Modifications for sending local mail | Christopher Speller | 2015-06-16 | 2 | -3/+45 |
| | | |||||
| * | Adding Dockerfile and releated configs | Christopher Speller | 2015-06-16 | 1 | -0/+83 |
| | |