summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-03-13167-3042/+5007
|\
| * Adding new global relay settings to diagnostics and default.json (#8441)Jesús Espino2018-03-122-6/+16
| * Removed mssola/user_agent library (#8417)Harrison Healey2018-03-1213-1497/+17
| * [MM-9720] Platform command to change user email address (#8422)Carlos Tadeu Panato Junior2018-03-122-0/+68
| * [MM-9725] Slack compatibility code in webhooks captures incorrect text (#8428)Carlos Tadeu Panato Junior2018-03-122-1/+59
| * using inbucket docker image tag release-1.2.0 instead of latest (#8406)Carlos Tadeu Panato Junior2018-03-122-2/+2
| * MM-8839: Adds ChannelType to compliance-related model. (#8424)Martin Kraft2018-03-094-0/+9
| * Remove query to update channel extra_update_at field on user activation/deact...Joram Wilander2018-03-096-93/+10
| * MM-9274- Sort Users in Channel by status (#8181)Stephen Kiers2018-03-0914-29/+538
| * Merge branch 'merge-4.8'Derrick Anderson2018-03-0817-42/+398
| |\
| | * Merge branch 'release-4.8' into merge-4.8JoramWilander2018-03-0817-42/+398
| |/|
| | * respect plugin manifest webapp bundle_path (#8393)Chris2018-03-072-4/+22
| | * plugin sandbox fixes (#8418)Chris2018-03-071-1/+10
| | * translations PR 20180306 (#8414)Elias Nahum2018-03-0714-37/+349
| | * register additional gob types to support arrays and dicts in post props (#8412)Chris2018-03-062-5/+40
| | * Uncomment upgrade code to 4.8 (#8409)Derrick Anderson2018-03-052-4/+4
| * | Moved team icon upgrade code to 4.9 since it didn't make it in for 4.8 (#8410)Joram Wilander2018-03-081-1/+1
| * | MM-8840: Add GlobalRelay Configuration Settings (#8304)Jonathan2018-03-083-14/+177
| * | Adding enterprise commands support (#8327)Jesús Espino2018-03-0739-559/+677
| * | respect plugin manifest webapp bundle_path (#8393)Chris2018-03-072-4/+22
| * | general cleanup (#8387)Chris2018-03-0735-665/+30
| * | Readding uasurfer library (#8420)Jesús Espino2018-03-0712-2/+2371
| * | XYZ-87: GlobalRelay DM Exports do not Include Channel Name (#8275)Jonathan2018-03-074-30/+362
| * | Add addedUser IDs to render correctly in client based on teammate name displa...Philippe GRANET2018-03-071-0/+5
| * | [PLT-7574] Update and Simplify Compatibility Check and Replace UA Dependency ...Alex Moon2018-03-062-12/+44
| * | Add preparatory upgrade code for 4.9 (#8408)Joram Wilander2018-03-052-4/+12
| * | MM-9664 Add invalidation metrics for store caches (#8340)Joram Wilander2018-03-0516-36/+130
| * | MM-8604: emit config/license websocket events (#8371)Jesse Hallam2018-03-055-10/+45
| * | fix Mozilla typo (#8395)Carlos Tadeu Panato Junior2018-03-051-1/+1
| * | remove `go Publish(...)` idiom (#8373)Chris2018-03-0212-70/+23
* | | 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-0274-1158/+2709
|\| |
| * | PLT-7567: Integration of Team Icons (#8284)Christian Hoff2018-03-0111-13/+421
| * | fix linux cap header structure (#8389)Chris2018-03-011-1/+1
| * | [PLT-8024] Support LOGIN authentication method for SMTP (#8140)Carlos Tadeu Panato Junior2018-03-012-5/+117
| * | [PLT-8186] add support for ec2 instance profile authentication (#8243)Carlos Tadeu Panato Junior2018-02-286-1/+173
| * | Simplification of a Channel Members query. (#8345)George Goldberg2018-02-281-3/+3
| * | optimize lru purging (#8381)Chris2018-02-282-103/+43
| * | Fix prerequisites checker so 1.10 > 1.9 (#8344)Fede2018-02-271-2/+2
| |/
| * Temporarily disable flaky TestSendMailUsingConfigAdvanced test (#8379)Joram Wilander2018-02-271-8/+2
| * MM-9698 Fixing Minio with server side encryption. (#8367)Christopher Speller2018-02-262-7/+39
| * add individual platform packaging targets (#8366)Chris2018-02-262-9/+7
| * Fix forward 80 to 443 to not bind on all interfaces. (#8360)Christopher Speller2018-02-231-12/+17
| * Merge branch 'merge47intomaster'Derrick Anderson2018-02-231-2/+4
| |\
| | * 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
| * | fix scheduled task race (#8355)Chris2018-02-233-208/+70
| * | MM-8593 Default APIv3 to disabled for new installs (#8353)Joram Wilander2018-02-234-1/+4
| * | Fall back to constructured URL for OAuth SSO if SiteURL not set (#8352)Joram Wilander2018-02-231-1/+6
| * | Remove global site url (#8343)Chris2018-02-2212-35/+32