summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Collapse)AuthorAgeFilesLines
* rebaseJack2015-09-2812-111/+202
|\
| * Merge pull request #812 from hmhealey/plt256Corey Hulen2015-09-251-0/+14
| |\ | | | | | | PLT-256 Add headers to getFile api calls from IE/Edge to trigger file download
| | * Added headers to getFile requests from Microsoft browsers to trigger a downloadhmhealey2015-09-251-0/+14
| | |
| * | Fixing 1 more case=Corey Hulen2015-09-251-1/+7
| | |
| * | Merge pull request #802 from mattermost/plt-291Corey Hulen2015-09-252-11/+6
| |\ \ | | | | | | | | PLT-291 Fixing 404 page props
| | * | Fixing 404 page propsChristopher Speller2015-09-242-11/+6
| | | |
| * | | 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
| | | |
| * | | Merge pull request #799 from mattermost/plt-31-2Harrison Healey2015-09-254-21/+8
| |\ \ \ | | |/ / | |/| | PLT-31 Added welcome email back in.
| | * | 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
| |\ | | | | | | PLT-242 Implement custom UI theme colors.
| | * Implement UI theme colors.JoramWilander2015-09-231-3/+0
| | |
| * | PLT-126: Change 'Private Messages' to 'Direct Messages'Chengwei Yang2015-09-231-1/+1
| |/ | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>
* | Fixing merge conflict=Corey Hulen2015-09-225-14/+283
|\|
| * Merge pull request #715 from mattermost/plt-27Joram Wilander2015-09-225-14/+283
| |\ | | | | | | PLT-27 Implement incoming webhooks.
| | * 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
|\ \ \ | | | | | | | | PLT-173 Rotate images with a non-standard orientation before generating a thumbnail and preview
| * | | Added constants for EXIF orientationshmhealey2015-09-211-9/+31
| | | |
| * | | PLT-173 Changed thumbnails and previews to generate correctly for images ↵hmhealey2015-09-181-11/+64
| |/ / | | | | | | | | | with a non-standard orientation
* | / 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
|\ \ | | | | | | PLT-11 adding config for logs to UI
| * \ 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 server load tests.
| * | 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 work again
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 18:44:33 +0000