summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into PLT-11-email=Corey Hulen2015-09-221-1/+2
|\
| * fix conflictJack2015-09-226-19/+218
| |\
| * | go fmtJack2015-09-171-1/+1
| * | content type for getFileJack2015-09-171-1/+2
* | | Adding service settings to admin console=Corey Hulen2015-09-2214-59/+46
* | | Adding team settings to admin console=Corey Hulen2015-09-2210-277/+12
* | | Fixing unit tests=Corey Hulen2015-09-214-51/+54
* | | Adding rate limiter settings to the admin console=Corey Hulen2015-09-211-1/+1
* | | Adding image properties=Corey Hulen2015-09-215-57/+57
* | | Adding email to admin console=Corey Hulen2015-09-214-9/+61
| |/ |/|
* | Merge pull request #708 from hmhealey/plt173Christopher Speller2015-09-211-11/+86
|\ \
| * | Added constants for EXIF orientationshmhealey2015-09-211-9/+31
| * | PLT-173 Changed thumbnails and previews to generate correctly for images with...hmhealey2015-09-181-11/+64
| |/
* | Renaming "Handle" to "Channel URL" or "URL"it332015-09-201-2/+2
* | Merge pull request #709 from mattermost/PLT-11Harrison Healey2015-09-182-2/+126
|\ \
| * \ merging=Corey Hulen2015-09-181-1/+1
| |\ \
| * | | PLT-11 Adding ability to save config file=Corey Hulen2015-09-172-2/+126
| | |/ | |/|
* | | Merge pull request #717 from mattermost/fix-loadtestCorey Hulen2015-09-181-3/+3
|\ \ \ | |_|/ |/| |
| * | Fix authentication for loadtests.JoramWilander2015-09-181-3/+3
| |/
* | Making changes to versioning=Corey Hulen2015-09-171-1/+1
* | Merge branch 'master' into PLT-92=Corey Hulen2015-09-177-10/+14
|\|
| * Merge pull request #704 from hmhealey/freetypeChristopher Speller2015-09-171-1/+1
| |\
| | * Updated godep workspace and freetype library so that godep save and restore w...hmhealey2015-09-171-1/+1
| * | Merge pull request #703 from mattermost/add-gofmtCorey Hulen2015-09-175-9/+9
| |\ \ | | |/ | |/|
| | * Adding gofmt to travis buildChristopher Speller2015-09-175-9/+9
| * | Fixes GIT-698 allow ability to disable team creation for SSO=Corey Hulen2015-09-161-0/+4
| |/
* / PLT-92 Adding server side versioning to the binary=Corey Hulen2015-09-161-1/+1
|/
* Merge pull request #697 from mattermost/PLT-93Christopher Speller2015-09-169-18/+18
|\
| * Fixing broken email templates=Corey Hulen2015-09-161-1/+0
| * Fixing broken email templates=Corey Hulen2015-09-161-1/+1
| * Fixing broken email templates=Corey Hulen2015-09-1610-19/+20
* | Merge pull request #696 from mattermost/PLT-23Christopher Speller2015-09-161-7/+17
|\ \
| * | PLT-23 error.html pulls files from static=Corey Hulen2015-09-161-3/+3
| * | PLT-23 error.html pulls files from static=Corey Hulen2015-09-161-5/+15
| |/
* / Implement OAuth2 service provider functionality.JoramWilander2015-09-1611-71/+408
|/
* Adding config file timestamp to X-Version header=Corey Hulen2015-09-161-1/+2
* Removing old config stuff=Corey Hulen2015-09-152-35/+0
* PLT-93 cleaing up client side configs=Corey Hulen2015-09-1524-71/+101
* Merge branch 'master' into PLT-12-log=Corey Hulen2015-09-148-17/+30
|\
| * Merge pull request #679 from mattermost/fix-file-content-typeHarrison Healey2015-09-141-0/+1
| |\
| | * Blank Content-Type for file GETs.JoramWilander2015-09-141-0/+1
| * | Merge pull request #677 from mattermost/plt-50Joram Wilander2015-09-141-1/+10
| |\ \ | | |/ | |/|
| | * Allowing underscores in channel names. Added conversion of some slack channel...Christopher Speller2015-09-141-1/+10
| * | Merge pull request #648 from mattermost/PLT-12Christopher Speller2015-09-147-61/+91
| |\ \ | | |/ | |/|
| | * Renaming ROLE_ADMIN to ROLE_TEAM_ADMIN=Corey Hulen2015-09-116-16/+16
| * | Set default Content-Type to application/json for all API requestsJoramWilander2015-09-121-0/+3
* | | PLT-12 adding log viewer=Corey Hulen2015-09-104-0/+97
| |/ |/|
* | merging=Corey Hulen2015-09-104-4/+356
|\|
| * Removed pointless attempt to verify a new user's usernamehmhealey2015-09-091-4/+1
| * Adding ability to export data from mattermostChristopher Speller2015-09-043-0/+355
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 21:23:46 +0000