summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-02-1374-666/+939
|\
| * Merge branch 'release-4.7-t4merge'Derrick Anderson2018-02-127-18/+100
| |\
| | * Merge remote-tracking branch 'origin/release-4.7' into release-4.7-t4mergeDerrick Anderson2018-02-127-18/+100
| |/|
| | * Merge branch 'master' into release-4.7Chris2018-02-1284-1216/+1345
| | |\ | | |/ | |/|
| * | Add tests for the `platform server` command (#8231)Pierre de La Morinerie2018-02-124-10/+89
| * | ABC-228 Update GetPosts caching to work for non-60 limits (#8233)Joram Wilander2018-02-092-7/+31
| * | Add /v4/image api (#8230)Chris2018-02-094-0/+82
| * | Merge branch 'release-4.7'Derrick Anderson2018-02-094-3/+4
| |\ \
| * | | Remove license globals entirely (#8229)Chris2018-02-0929-429/+256
| * | | use mattermost fork of go-bindata (#8216)Chris2018-02-081-2/+2
| * | | Add prepatory code for 4.8.0 (#8226)Derrick Anderson2018-02-081-0/+9
| * | | fix client4 post sanitization (#8219)Chris2018-02-083-8/+67
| * | | Merge branch 'release-4.7'Derrick Anderson2018-02-086-34/+34
| |\ \ \
| * | | | Eliminate utils.SetLicense calls (#8217)Chris2018-02-0714-665/+91
| * | | | ABC-132: sign error page parameters (#8197)Chris2018-02-0712-36/+226
| | | | * Added invite_id field to email invite url, along with validation of this fiel...Jonathan2018-02-125-13/+79
| | | | * minor addition to #8238Christopher Brown2018-02-092-5/+7
| | | | * Don't proxy same-site image urls (#8238)Chris2018-02-092-2/+16
| | | | * Add /v4/image api (#8230)Chris2018-02-094-0/+82
| | | |/
| | | * Merge branch 'abc-239' into release-4.7Derrick Anderson2018-02-084-3/+4
| | |/|
| | | * Increase OAuth2 state parameter limitJoramWilander2018-02-074-3/+4
| | |/
| | * translations PR 20180205 (#8200)enahum2018-02-076-34/+34
* | | Updates migration tests to reflect front-end mapping changes. (#8237)Martin Kraft2018-02-136-31/+65
* | | XYZ-73: Removes EnableOnlyAdminIntegrations uses. (#8245)Martin Kraft2018-02-122-6/+0
* | | Fix tests. (#8244)George Goldberg2018-02-123-18/+8
* | | XYZ-51: Unit tests for and changes to SetRolePermissionsFromConfig. (#8160)Martin Kraft2018-02-095-29/+667
* | | AllowEditPost and PostEditTimeLimit migration (#8208)Jesús Espino2018-02-0910-26/+86
* | | XYZ-80: Add CreateAt/UpdateAt/DeleteAt fields to roles table. (#8223)George Goldberg2018-02-082-0/+15
* | | XYZ-76: Add license check to patchRoles endpoint. (#8224)George Goldberg2018-02-084-3/+99
* | | XYZ-59: Implement redis caching layer for Role store. (#8207)George Goldberg2018-02-074-67/+148
* | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1Jesús Espino2018-02-0752-125/+699
|\| |
| * | PLT-7537: Move channel CLI command posts system message to channel. (#8161)Vordimous2018-02-076-8/+80
| * | XYZ-35: Added Support for GlobalRelay Compliance Export FormatJonathan2018-02-0717-51/+413
| * | allow plugins to set command hints (#8214)Chris2018-02-071-0/+1
| * | 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-079-14/+95
| |/
| * ICU-715 Change ExperimentalGroupUnreadChannels setting to allow for default o...Harrison Healey2018-02-065-4/+54
| * add App.License, remove utils.IsLicensed / utils.License calls (#8203)Chris2018-02-0621-48/+56
* | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-02-061622-26337/+184880
|\|
| * handle RateLimiter initialization errors (#8199)Pierre de La Morinerie2018-02-053-9/+28
| * Uncomment upgrade code for 4.7 (#8201)Joram Wilander2018-02-052-4/+5
| * ABC-173: introduce Normalize(Username|Email) (#8183)Jesse Hallam2018-02-053-6/+38
| * Fix sampledata (fake library) bug (#8198)Jesús Espino2018-02-054-2/+16
| * Add missing diagnostics for v4.7 (#8195)Jason Blais2018-02-051-1/+5
| * ABC-179: check email verification last (#8172)Jesse Hallam2018-02-053-10/+67
| * Update NOTICE.txt (#8175)amyblais2018-02-051-43/+470
| * add ImageProxyOptions to default.json (#8193)Chris2018-02-021-0/+1
| * Update zoom plugin to latest (#8194)Joram Wilander2018-02-023-6/+6
| * Fix panic when invalid types used in post props (#8191)Joram Wilander2018-02-021-6/+6
| * report server launch errors (#8189)Pierre de La Morinerie2018-02-021-7/+9