summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* XYZ-110: Cherrypicking changes from release-4.7 to master (#8254)Jonathan2018-02-136-32/+45
* ABC-176 Prevent changing PluginSettings.EnableUploads through the API (#8249)Joram Wilander2018-02-134-2/+39
* 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
* | | | 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
| | | * 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
|/
* 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
* 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
* ABC-153: don't use http redirects with 4xx/5xx status codes (#8178)Chris2018-02-022-10/+15
* fix image url replacement for blank urls (#8184)Chris2018-02-012-1/+7
* [PLT-8494] Add delete_team websocket event (#8167)Saturnino Abril2018-02-012-4/+9
* Update CONTRIBUTING.md (#8168)amyblais2018-02-011-29/+41
* Don't remove data dirs from vendor directory (#8173)Jesús Espino2018-01-311-1/+1
* Adding sample data to the make file (#8171)Corey Hulen2018-01-311-0/+9
* Use default configurations for user-0 in sampledata (#8174)Jesús Espino2018-01-311-4/+4
* make channel autocomplete sort case-insensitive (#8176)Chris2018-01-311-1/+1
* User based rate limiting (#8152)Christopher Speller2018-01-319-95/+355