summaryrefslogtreecommitdiffstats
path: root/api4
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into advanced-permissions-phase-1Martin Kraft2018-03-238-7/+79
|\
| * Timezone feature (#8185)Chris Duarte2018-03-223-0/+39
| * Fix various segfaults when running `go test` manually (#8448)Jesse Hallam2018-03-213-4/+11
| * Fix paging for GET /teams and GET /teams/{id}/members endpoints (#8488)Joram Wilander2018-03-212-3/+29
* | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-03-192-30/+31
|\|
| * remove s3 region to be mandatory and fix when user call test s3 when the conf...Carlos Tadeu Panato Junior2018-03-142-13/+8
| * update email test in the driver to be able to send the config in the body (#8...Carlos Tadeu Panato Junior2018-03-131-17/+23
* | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-03-137-46/+175
|\|
| * Removed mssola/user_agent library (#8417)Harrison Healey2018-03-121-4/+3
| * MM-9274- Sort Users in Channel by status (#8181)Stephen Kiers2018-03-093-3/+170
| * general cleanup (#8387)Chris2018-03-072-28/+0
| * MM-9664 Add invalidation metrics for store caches (#8340)Joram Wilander2018-03-051-4/+3
| * MM-8604: emit config/license websocket events (#8371)Jesse Hallam2018-03-051-9/+1
* | MM-8830 Consistent Incomming/Outgoing webhooks permissions (#8335)Jesús Espino2018-03-071-8/+20
* | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-03-0210-50/+492
|\|
| * PLT-7567: Integration of Team Icons (#8284)Christian Hoff2018-03-012-0/+164
| * [PLT-8186] add support for ec2 instance profile authentication (#8243)Carlos Tadeu Panato Junior2018-02-282-0/+95
| * Merge remote-tracking branch 'origin/release-4.7' into merge47intomasterDerrick Anderson2018-02-231-2/+4
| |\
| | * Change log level of 404s to DEBUG (#8339)Joram Wilander2018-02-211-2/+4
| * | Remove global site url (#8343)Chris2018-02-221-2/+1
| * | MM-8681 Adding config settings necessary for using CloudFront. (#8307)Christopher Speller2018-02-201-0/+1
| * | MM-9556 Added ability to upload files without a multipart request (#8306)Harrison Healey2018-02-204-25/+199
| * | Added t.Helper to CheckXStatus test functions (#8305)Harrison Healey2018-02-201-21/+28
* | | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-02-192-20/+41
|\| |
| * | [PLT-539] Update incoming webhooks to accept multipart/form-data content (#7873)Carlos Tadeu Panato Junior2018-02-161-18/+38
| * | Merge release-4.7 with master in side branchDerrick Anderson2018-02-131-2/+3
| |\|
| | * Merge branch 'release-4.7' into rm-willnorris-proxy-supportChris2018-02-129-54/+371
| | |\
| | | * revert master changesDerrick Anderson2018-02-129-54/+371
| | * | remove willnorris/imageproxy supportChristopher Brown2018-02-121-2/+3
| | |/
| * / ABC-176 Prevent changing PluginSettings.EnableUploads through the API (#8249)Joram Wilander2018-02-132-2/+23
| |/
* | MM-8827: Add ADD_REACTION, REMOVE_REACTION and REMOVE_OTHERS_REACTIONS permis...Jesús Espino2018-02-192-184/+292
* | MM-9618: Don't change default role permissions for policy. (#8303)George Goldberg2018-02-191-4/+4
* | ABC-176 Prevent changing PluginSettings.EnableUploads through the API (#8249)Joram Wilander2018-02-132-2/+23
* | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-02-1313-134/+120
|\|
| * Merge branch 'master' into release-4.7Chris2018-02-129-371/+54
| |\
| | * Add /v4/image api (#8230)Chris2018-02-093-0/+79
| | * Remove license globals entirely (#8229)Chris2018-02-093-67/+6
| | * Eliminate utils.SetLicense calls (#8217)Chris2018-02-074-290/+25
| | * ABC-132: sign error page parameters (#8197)Chris2018-02-072-11/+17
| * | Added invite_id field to email invite url, along with validation of this fiel...Jonathan2018-02-121-1/+2
| * | Add /v4/image api (#8230)Chris2018-02-093-0/+79
* | | XYZ-73: Removes EnableOnlyAdminIntegrations uses. (#8245)Martin Kraft2018-02-121-3/+0
* | | Fix tests. (#8244)George Goldberg2018-02-121-8/+0
* | | AllowEditPost and PostEditTimeLimit migration (#8208)Jesús Espino2018-02-091-7/+0
* | | XYZ-76: Add license check to patchRoles endpoint. (#8224)George Goldberg2018-02-082-3/+60
* | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1Jesús Espino2018-02-073-6/+9
|\ \ \ | | |/ | |/|
| * | Remove fmt.Println trace on api4 tests (#8212)Jesús Espino2018-02-071-2/+1
| * | Abort on critical error during server startup (#8204)Pierre de La Morinerie2018-02-071-1/+5
| |/
| * add App.License, remove utils.IsLicensed / utils.License calls (#8203)Chris2018-02-062-3/+3
* | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-02-062-32/+35
|\|