summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* MM-10606: License feature flag for custom schemes. (#8804)George Goldberg2018-05-175-15/+32
* MM-10235: Make permissions reset CLI shcemes-aware. (#8773)George Goldberg2018-05-1718-0/+281
* Merge error fix.Martin Kraft2018-05-171-522/+0
* Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-1786-22384/+1539
|\
| * MM-8708 Remove api package (#8784)Joram Wilander2018-05-1687-22892/+1539
* | MM-10615: Reset teams/channels to default scheme on delete scheme. (#8811)George Goldberg2018-05-174-61/+34
* | MM-10591: Well known error for all scheme endpoints pre-migration. (#8812)George Goldberg2018-05-173-32/+63
* | MM-10234: Make CLI roles command advanced-permissions aware. (#8771)George Goldberg2018-05-172-5/+58
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-1641-2003/+2461
|\|
| * Update email notification subject line and contents for Group Messages (#8689)Ugurcan Turkdogan2018-05-153-56/+171
| * MM-10249 Adding plugin ability to intercept posts before they reach the DB. (...Christopher Speller2018-05-1513-299/+1100
| * Merge branch 'merge410rc5'Derrick Anderson2018-05-1528-1648/+1190
| |\
| | * Merge remote-tracking branch 'origin/release-4.10' into merge410rc5Derrick Anderson2018-05-1528-1648/+1190
| |/|
| | * translations PR 20180511 (#8774)Elias Nahum2018-05-1414-380/+380
| | * Updating NOTICE.txt (#8732)amyblais2018-05-141-1234/+464
| | * drop 401s from info to debug (#8778)Jesse Hallam2018-05-141-4/+8
| | * [MM-9720] fix bugs when trying to change for a in use email and check the num...Carlos Tadeu Panato Junior2018-05-112-1/+17
| | * add notification when @user, @here, @all and @channel has colon ":" at the en...Saturnino Abril2018-05-112-6/+59
| | * fix mlog-ing before initialized (#8753)Jesse Hallam2018-05-114-16/+210
| | * More potential panic fixes (#8776)Joram Wilander2018-05-111-6/+9
| | * [MM-10458] Change system response to "Could not find the channel" - bug fix (...Carlos Tadeu Panato Junior2018-05-114-1/+43
* | | Fix build failure from bad merge.George Goldberg2018-05-161-4/+0
* | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-1529-902/+1300
|\| |
| * | MM-10201: querystring for get slash commands (#8779)Jesse Hallam2018-05-142-60/+135
| * | Move SAML endpoints out of api package (#8780)Joram Wilander2018-05-145-136/+159
| * | Refactor context out of API packages (#8755)Joram Wilander2018-05-1416-607/+704
| * | MM-9739: deprecate the now unused Channels.ExtraUpdateAt (#8762)Jesse Hallam2018-05-144-81/+3
| * | Merge branch 'merge410rc2'Derrick Anderson2018-05-114-24/+300
| |\ \
| | * | add s3 test back in for masterDerrick Anderson2018-05-111-2/+2
| | * | Merge release-4.10 with masterDerrick Anderson2018-05-115-26/+302
| |/| | | | |/
| | * Comment out problematic TestS3TestConnection test (#8770)Joram Wilander2018-05-101-2/+2
| | * Attempt to fix hub nil panic (#8766)Joram Wilander2018-05-101-1/+1
| | * Prevent divide by zero if there are no hubs (#8763)Joram Wilander2018-05-101-2/+12
| | * fix test and add new (#8758)Carlos Tadeu Panato Junior2018-05-101-1/+6
| | * MM-10495 Updated user agent detection to match output of previous library (#8...Harrison Healey2018-05-093-21/+287
* | | MM-9728: Online migration for advanced permissions phase 2 (#8744)George Goldberg2018-05-1428-4/+1586
* | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-1155-213/+289
|\| |
| * | MM-10188: expect io.Reader in FileBackend.WriteFile (#8765)Jesse Hallam2018-05-1010-51/+95
| * | Add Ping Timeout Signal for WebSocket Client (#8666)Daniel Schalla2018-05-101-10/+45
| * | MM-4998 Adding LoginIdAttribute to allow LDAP users to change their login ID ...Christopher Speller2018-05-1045-152/+149
* | | Merge branch 'master' into advanced-permissions-phase-2George Goldberg2018-05-102-2/+7
|\| |
| * | fix test and add new (#8759)Carlos Tadeu Panato Junior2018-05-101-0/+12
| * | Removing bad test.Christopher Speller2018-05-091-7/+0
| * | Fixes incorrect MiB size. (#8750)Martin Kraft2018-05-091-1/+1
* | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-0920-98/+214
|\| |
| * | prep code for 5.0 (#8743)Derrick Anderson2018-05-081-0/+9
| * | Fix empty GOPATH behaviour in Makefile (#8724)Jonathan Villemaire-Krajden2018-05-071-5/+5
| |/
| * Add IncrementClusterEventType function to metrics interface (#8728)Joram Wilander2018-05-041-0/+1
| * Uncomment upgrade for 4.10 (#8727)Derrick Anderson2018-05-042-8/+8
| * Added missing i18n strings for files and email batching (#8700)Harrison Healey2018-05-042-17/+44