summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Merge pull request #799 from mattermost/plt-31-2Harrison Healey2015-09-254-21/+8
| |\ \ \ | | |/ / | |/| |
| | * | Added welcome email back in.JoramWilander2015-09-254-21/+8
| | |/
| * | Fixing merge=Corey Hulen2015-09-241-4/+0
| |\ \
| | * | fixing issue=Corey Hulen2015-09-241-1/+0
| | * | Removing default theme no longer in use=Corey Hulen2015-09-241-3/+0
| | |/
| * / Removing old valet crud=Corey Hulen2015-09-241-47/+0
| |/
| * 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-237-87/+84
| |\
| * | PLT-349 adding team mgt to admin console=Corey Hulen2015-09-235-27/+151
* | | set transparent png background to whiteJack2015-09-241-1/+10
* | | use github.com/disintegration/imagingJack2015-09-232-48/+20
| |/ |/|
* | Changing image settings to file settings=Corey Hulen2015-09-236-83/+83
* | Merge branch 'master' into PLT-11-email=Corey Hulen2015-09-232-4/+1
|\ \ | |/ |/|
| * Merge pull request #759 from mattermost/plt-242-3Harrison Healey2015-09-231-3/+0
| |\
| | * Implement UI theme colors.JoramWilander2015-09-231-3/+0
| * | PLT-126: Change 'Private Messages' to 'Direct Messages'Chengwei Yang2015-09-231-1/+1
| |/
* | Fixing merge conflict=Corey Hulen2015-09-225-14/+283
|\|
| * Merge pull request #715 from mattermost/plt-27Joram Wilander2015-09-225-14/+283
| |\
| | * Implement incoming webhooks.JoramWilander2015-09-215-14/+283
* | | 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