summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Modified advanced mail implementation to properly support multiple attachment...Jonathan2018-02-152-16/+36
* | | | | | | | | | Wait for goroutines to finish before shuting down server (#8259)Pierre de La Morinerie2018-02-141-5/+15
* | | | | | | | | | Merge branch 'release-4.7-t3merge3'Derrick Anderson2018-02-144-64/+149
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | gofmtDerrick Anderson2018-02-134-4/+4
| * | | | | | | | | Merge release-4.7 with master in side branchDerrick Anderson2018-02-137-68/+153
|/| | | | | | | | | | |/ / / / / / / /
| * | | | | | | | Merge branch 'ccbrown-rm-willnorris-proxy-support' into release-4.7Derrick Anderson2018-02-134-67/+14
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Merge branch 'release-4.7' into rm-willnorris-proxy-supportChris2018-02-1286-1349/+1358
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'release-4.7-revertmaster' into release-4.7Derrick Anderson2018-02-1284-1345/+1216
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | revert master changesDerrick Anderson2018-02-1284-1345/+1216
| |/ / / / / / /
| * | | | | | | Merge branch 'icu669' into release-4.7Derrick Anderson2018-02-122-4/+142
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'release-4.7' into icu669Derrick Anderson2018-02-1291-1234/+1527
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Fixed typo in unit testHarrison Healey2018-02-121-1/+1
| | * | | | | | | ICU-669 Handle relative links betterHarrison Healey2018-02-092-12/+19
| | * | | | | | | ICU-669 Ensured all URLs returned from OpenGraph are absoluteHarrison Healey2018-02-082-4/+135
| | | * | | | | | poke jenkinsChristopher Brown2018-02-120-0/+0
| | | * | | | | | remove willnorris/imageproxy supportChristopher Brown2018-02-124-66/+13
| | |/ / / / / / | |/| | | | | |
* | | | | | | | 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