Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | Merge branch 'release-4.7' into rm-willnorris-proxy-support | Chris | 2018-02-12 | 86 | -1349/+1358 | |
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | Merge branch 'release-4.7-revertmaster' into release-4.7 | Derrick Anderson | 2018-02-12 | 84 | -1345/+1216 | |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | ||||||
| | * | | | | | | | revert master changes | Derrick Anderson | 2018-02-12 | 84 | -1345/+1216 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Merge branch 'icu669' into release-4.7 | Derrick Anderson | 2018-02-12 | 2 | -4/+142 | |
| |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge branch 'release-4.7' into icu669 | Derrick Anderson | 2018-02-12 | 91 | -1234/+1527 | |
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||||
| | * | | | | | | | Fixed typo in unit test | Harrison Healey | 2018-02-12 | 1 | -1/+1 | |
| | * | | | | | | | ICU-669 Handle relative links better | Harrison Healey | 2018-02-09 | 2 | -12/+19 | |
| | * | | | | | | | ICU-669 Ensured all URLs returned from OpenGraph are absolute | Harrison Healey | 2018-02-08 | 2 | -4/+135 | |
| | | * | | | | | | poke jenkins | Christopher Brown | 2018-02-12 | 0 | -0/+0 | |
| | | * | | | | | | remove willnorris/imageproxy support | Christopher Brown | 2018-02-12 | 4 | -66/+13 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | XYZ-110: Cherrypicking changes from release-4.7 to master (#8254) | Jonathan | 2018-02-13 | 6 | -32/+45 | |
| |_|_|_|_|_|/ |/| | | | | | | ||||||
* | | | | | | | ABC-176 Prevent changing PluginSettings.EnableUploads through the API (#8249) | Joram Wilander | 2018-02-13 | 4 | -2/+39 | |
| |_|_|_|_|/ |/| | | | | | ||||||
* | | | | | | Merge branch 'release-4.7-t4merge' | Derrick Anderson | 2018-02-12 | 7 | -18/+100 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Merge remote-tracking branch 'origin/release-4.7' into release-4.7-t4merge | Derrick Anderson | 2018-02-12 | 7 | -18/+100 | |
|/| | | | | | | |/ / / / / | ||||||
| * | | | | | Merge branch 'master' into release-4.7 | Chris | 2018-02-12 | 84 | -1216/+1345 | |
| |\ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
* | | | | | | Add tests for the `platform server` command (#8231) | Pierre de La Morinerie | 2018-02-12 | 4 | -10/+89 | |
* | | | | | | ABC-228 Update GetPosts caching to work for non-60 limits (#8233) | Joram Wilander | 2018-02-09 | 2 | -7/+31 | |
* | | | | | | Add /v4/image api (#8230) | Chris | 2018-02-09 | 4 | -0/+82 | |
* | | | | | | Merge branch 'release-4.7' | Derrick Anderson | 2018-02-09 | 4 | -3/+4 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
* | | | | | | Remove license globals entirely (#8229) | Chris | 2018-02-09 | 29 | -429/+256 | |
* | | | | | | use mattermost fork of go-bindata (#8216) | Chris | 2018-02-08 | 1 | -2/+2 | |
* | | | | | | Add prepatory code for 4.8.0 (#8226) | Derrick Anderson | 2018-02-08 | 1 | -0/+9 | |
* | | | | | | fix client4 post sanitization (#8219) | Chris | 2018-02-08 | 3 | -8/+67 | |
* | | | | | | Merge branch 'release-4.7' | Derrick Anderson | 2018-02-08 | 6 | -34/+34 | |
|\ \ \ \ \ \ | ||||||
* | | | | | | | Eliminate utils.SetLicense calls (#8217) | Chris | 2018-02-07 | 14 | -665/+91 | |
* | | | | | | | ABC-132: sign error page parameters (#8197) | Chris | 2018-02-07 | 12 | -36/+226 | |
| |_|_|_|_|/ |/| | | | | | ||||||
* | | | | | | PLT-7537: Move channel CLI command posts system message to channel. (#8161) | Vordimous | 2018-02-07 | 6 | -8/+80 | |
* | | | | | | XYZ-35: Added Support for GlobalRelay Compliance Export Format | Jonathan | 2018-02-07 | 17 | -51/+413 | |
* | | | | | | allow plugins to set command hints (#8214) | Chris | 2018-02-07 | 1 | -0/+1 | |
* | | | | | | Remove fmt.Println trace on api4 tests (#8212) | Jesús Espino | 2018-02-07 | 1 | -2/+1 | |
* | | | | | | Abort on critical error during server startup (#8204) | Pierre de La Morinerie | 2018-02-07 | 9 | -14/+95 | |
| | | * | | | Added invite_id field to email invite url, along with validation of this fiel... | Jonathan | 2018-02-12 | 5 | -13/+79 | |
| | | * | | | minor addition to #8238 | Christopher Brown | 2018-02-09 | 2 | -5/+7 | |
| | | * | | | Don't proxy same-site image urls (#8238) | Chris | 2018-02-09 | 2 | -2/+16 | |
| | | * | | | Add /v4/image api (#8230) | Chris | 2018-02-09 | 4 | -0/+82 | |
| | |/ / / | ||||||
| | * | | | Merge branch 'abc-239' into release-4.7 | Derrick Anderson | 2018-02-08 | 4 | -3/+4 | |
| |/| | | | ||||||
| | * | | | Increase OAuth2 state parameter limit | JoramWilander | 2018-02-07 | 4 | -3/+4 | |
| |/ / / | ||||||
| * / / | translations PR 20180205 (#8200) | enahum | 2018-02-07 | 6 | -34/+34 | |
|/ / / | ||||||
* | | | ICU-715 Change ExperimentalGroupUnreadChannels setting to allow for default o... | Harrison Healey | 2018-02-06 | 5 | -4/+54 | |
* | | | add App.License, remove utils.IsLicensed / utils.License calls (#8203) | Chris | 2018-02-06 | 21 | -48/+56 | |
| |/ |/| | ||||||
* | | handle RateLimiter initialization errors (#8199) | Pierre de La Morinerie | 2018-02-05 | 3 | -9/+28 | |
* | | Uncomment upgrade code for 4.7 (#8201) | Joram Wilander | 2018-02-05 | 2 | -4/+5 | |
* | | ABC-173: introduce Normalize(Username|Email) (#8183) | Jesse Hallam | 2018-02-05 | 3 | -6/+38 | |
* | | Fix sampledata (fake library) bug (#8198) | Jesús Espino | 2018-02-05 | 4 | -2/+16 | |
* | | Add missing diagnostics for v4.7 (#8195) | Jason Blais | 2018-02-05 | 1 | -1/+5 | |
* | | ABC-179: check email verification last (#8172) | Jesse Hallam | 2018-02-05 | 3 | -10/+67 | |
* | | Update NOTICE.txt (#8175) | amyblais | 2018-02-05 | 1 | -43/+470 | |
* | | add ImageProxyOptions to default.json (#8193) | Chris | 2018-02-02 | 1 | -0/+1 | |
* | | Update zoom plugin to latest (#8194) | Joram Wilander | 2018-02-02 | 3 | -6/+6 | |
* | | Fix panic when invalid types used in post props (#8191) | Joram Wilander | 2018-02-02 | 1 | -6/+6 |