summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* MM-10606: License feature flag for custom schemes. (#8804)George Goldberg2018-05-175-15/+32
| | | | | | * MM-10606: Add new field to license for custom schemes. * Add feature flag to license check for Schemes.
* MM-10235: Make permissions reset CLI shcemes-aware. (#8773)George Goldberg2018-05-1718-0/+281
| | | | | | * MM-10235: Make permissions reset CLI shcemes-aware. * Add i18n strings.
* 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove api package * Remove api dependency from cmd package * Remove EnableAPIv3 setting * Update web tests * Add more websocket tests * Move some ws and oauth tests to api4 package * Move command tests into api4 package * Test fixes * Fix msg command test * Add some app file tests
* | 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
| | | | | | | | | | | | | | | | * MM-10234: Make CLI roles command advanced-permissions aware. * Fix for loop scope. * Fix style.
* | 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
| | | | | | | | | | | | | | | | | | | | | | Reordered notification strings MM-10335 Changed uppercase CHANNEL to Lowercase Channel, added @ sign before username on notifications Added @ sign in front of username in all email notifications. Capitalized Direct Message and Group Message in email notifications. Fixed the issue with long group message names. Removed executable bit
| * MM-10249 Adding plugin ability to intercept posts before they reach the DB. ↵Christopher Speller2018-05-1513-299/+1100
| | | | | | | | | | | | | | | | (#8791) * Adding plugin ability to intercept posts before they reach the DB. * s/envoked/invoked/
| * 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
| | | | | | | | | | | | | | | | | | * translations PR 20180511 * Fix bad translations
| | * Updating NOTICE.txt (#8732)amyblais2018-05-141-1234/+464
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update NOTICE.txt * Update NOTICE.txt * Update NOTICE.txt * Update NOTICE.txt * Update NOTICE.txt * Update NOTICE.txt
| | * 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 ↵Carlos Tadeu Panato Junior2018-05-112-1/+17
| | | | | | | | | | | | number of parameters (#8772)
| | * add notification when @user, @here, @all and @channel has colon ":" at the ↵Saturnino Abril2018-05-112-6/+59
| | | | | | | | | | | | end (#8760)
| | * fix mlog-ing before initialized (#8753)Jesse Hallam2018-05-114-16/+210
| | | | | | | | | | | | | | | | | | | | | Dump mlog to STDOUT before initialized, to allow for logging failures that occur due to config parsing, etc. Fix file logging to honour logger.FileJson instead of copying the logger.ConsoleJson setting.
| | * 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
| | | | | | | | | | | | | | | | | | | | | | | | (#8738) * [MM-10458] Change system response to "Could not find the channel" when trying to invite user to private channel you can't see * add another check to check if user have permission to add another in pvt channel
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * pass GET slash command payloads through query string Previously, both GET and POST requests received the payload via the body, but this was incorrect for GET requests. Now, the payloads for GET requests is sent via the query string. * reorder tests for clarity * switch command tests to use httptest servers * restore original test command endpoints
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Refactor context out of API packages * Update function names per feedback * Move webhook handlers to web and fix web tests * Move more webhook tests out of api package * Fix static handler
| * | 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 ↵Harrison Healey2018-05-093-21/+287
| | | | | | | | | | | | | | | | | | | | | | | | (#8748) * MM-10495 Updated user agent detection to match output of previous library * Fixed missing license header
* | | MM-9728: Online migration for advanced permissions phase 2 (#8744)George Goldberg2018-05-1428-4/+1586
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MM-9728: Online migration for advanced permissions phase 2 * Add unit tests for new store functions. * Move migration specific code to own file. * Add migration state function test. * Style fixes. * Add i18n strings. * Fix mocks. * Add TestMain to migrations package tests. * Fix typo. * Fix review comments. * Fix up the "Check if migration is done" check to actually work.
* | | 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
| | | | | | | | | | | | This is a reworked set of changes originally from @josephGuo to begin reducing the duplicated memory required when uploading files.
| * | Add Ping Timeout Signal for WebSocket Client (#8666)Daniel Schalla2018-05-101-10/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import Order gofmt gofmt gofmt Renamed Const to make Unit more obvious Renamed Const to make Unit more obvious #2
| * | MM-4998 Adding LoginIdAttribute to allow LDAP users to change their login ID ↵Christopher Speller2018-05-1045-152/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | without losing their account (#8756) * Adding LoginIdAttribute * Modifying LDAP to use loginIDAttribute. * Adding IDAttribute migration and AD objectGUID support. * Removing unused idea. * Fix typo.
* | | 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
| | | | | | | | | | | | | | | | * uncomment upgrade code * ping jenkins * add 4.10.0 to version.go
| * Added missing i18n strings for files and email batching (#8700)Harrison Healey2018-05-042-17/+44
| | | | | | | | | | | | * Added missing i18n strings for files and email batching * Added more fields to log messages