| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-22 | 199 | -8872/+20286 |
| |\ | |||||
| | * | Change order of web endpoints (#8817) | Elias Nahum | 2018-05-21 | 1 | -1/+1 |
| | | | |||||
| | * | Skip cluster send when getting non-cached statuses (#8824) | Joram Wilander | 2018-05-18 | 1 | -2/+2 |
| | | | |||||
| | * | Fixing TE login. (#8826) | Christopher Speller | 2018-05-18 | 1 | -3/+5 |
| | | | |||||
| | * | Fixing CMD docs. (#8827) | Christopher Speller | 2018-05-18 | 2 | -3/+3 |
| | | | |||||
| | * | MM-9983 Requiring SiteURL to be set. (#8769) | Christopher Speller | 2018-05-18 | 6 | -18/+33 |
| | | | | | | | | | | | | | | | | | * Requiring SiteURL to be set. * Modifying to make tests pass. * Fixing test. | ||||
| | * | Upgrading server dependency. (#8807) | Christopher Speller | 2018-05-18 | 178 | -8816/+20199 |
| | | | |||||
| | * | MM-10640 Set EnableUserCreation to true by default (#8815) | Balasankar C | 2018-05-18 | 8 | -14/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Set EnableUserCreation to true by default * Fix argument type to FormatBool * Convert EnableUserCreation instances to pointer * Convert to boolean in tests also * Set value of pointer to be false * Convert remaining EnableUserCreation instances to pointer | ||||
| | * | Add config setting for API team deletion (#8800) | Joram Wilander | 2018-05-18 | 5 | -15/+24 |
| | | | |||||
| * | | Refactors migrations check. (#8814) | Martin Kraft | 2018-05-21 | 5 | -89/+39 |
| | | | |||||
| * | | Merge fix. | Martin Kraft | 2018-05-18 | 1 | -0/+0 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-18 | 41 | -264/+288 |
| |\| | |||||
| | * | fix `make run-server` (#8819) | Jesse Hallam | 2018-05-17 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | * fix `make run-server` The `PLATFORM_FILES` environment variable no longer gives `go run` the necessary context to run the mattermost binary. * clean up cmd/mattermost/cprofile*.out | ||||
| | * | Renaming platform binary to mattermost. (#8801) | Christopher Speller | 2018-05-17 | 41 | -262/+284 |
| | | | |||||
| * | | Reinstate upgrade code that mysteriously vanished during some merge. | George Goldberg | 2018-05-18 | 1 | -1/+14 |
| | | | |||||
| * | | Fix tests. | George Goldberg | 2018-05-18 | 3 | -0/+4 |
| | | | |||||
| * | | MM-10264: Adds CLI command to import and export permissions. (#8787) | Martin Kraft | 2018-05-17 | 14 | -14/+670 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MM-10264: Adds CLI command to import and export permissions. * MM-10264: Changes Scheme Name to DisplayName and adds Name slug field. * MM-10264: Changes display name max size. * MM-10264: Another merge fix. * MM-10264: Changes for more Schemes methods checking for migration. * MM-10264: More updates for Schemes migration checking. | ||||
| * | | MM-10606: License feature flag for custom schemes. (#8804) | George Goldberg | 2018-05-17 | 5 | -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 Goldberg | 2018-05-17 | 18 | -0/+281 |
| | | | | | | | | | | | | | * MM-10235: Make permissions reset CLI shcemes-aware. * Add i18n strings. | ||||
| * | | Merge error fix. | Martin Kraft | 2018-05-17 | 1 | -522/+0 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-17 | 86 | -22384/+1539 |
| |\| | |||||
| | * | MM-8708 Remove api package (#8784) | Joram Wilander | 2018-05-16 | 87 | -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 Goldberg | 2018-05-17 | 4 | -61/+34 |
| | | | |||||
| * | | MM-10591: Well known error for all scheme endpoints pre-migration. (#8812) | George Goldberg | 2018-05-17 | 3 | -32/+63 |
| | | | |||||
| * | | MM-10234: Make CLI roles command advanced-permissions aware. (#8771) | George Goldberg | 2018-05-17 | 2 | -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-2 | Martin Kraft | 2018-05-16 | 41 | -2003/+2461 |
| |\| | |||||
| | * | Update email notification subject line and contents for Group Messages (#8689) | Ugurcan Turkdogan | 2018-05-15 | 3 | -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 Speller | 2018-05-15 | 13 | -299/+1100 |
| | | | | | | | | | | | | | | | | | (#8791) * Adding plugin ability to intercept posts before they reach the DB. * s/envoked/invoked/ | ||||
| | * | Merge branch 'merge410rc5' | Derrick Anderson | 2018-05-15 | 28 | -1648/+1190 |
| | |\ | |||||
| | | * | Merge remote-tracking branch 'origin/release-4.10' into merge410rc5 | Derrick Anderson | 2018-05-15 | 28 | -1648/+1190 |
| | |/| | |||||
| | | * | translations PR 20180511 (#8774) | Elias Nahum | 2018-05-14 | 14 | -380/+380 |
| | | | | | | | | | | | | | | | | | | | * translations PR 20180511 * Fix bad translations | ||||
| | | * | Updating NOTICE.txt (#8732) | amyblais | 2018-05-14 | 1 | -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 Hallam | 2018-05-14 | 1 | -4/+8 |
| | | | | |||||
| | | * | [MM-9720] fix bugs when trying to change for a in use email and check the ↵ | Carlos Tadeu Panato Junior | 2018-05-11 | 2 | -1/+17 |
| | | | | | | | | | | | | | number of parameters (#8772) | ||||
| | | * | add notification when @user, @here, @all and @channel has colon ":" at the ↵ | Saturnino Abril | 2018-05-11 | 2 | -6/+59 |
| | | | | | | | | | | | | | end (#8760) | ||||
| | | * | fix mlog-ing before initialized (#8753) | Jesse Hallam | 2018-05-11 | 4 | -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 Wilander | 2018-05-11 | 1 | -6/+9 |
| | | | | |||||
| | | * | [MM-10458] Change system response to "Could not find the channel" - bug fix ↵ | Carlos Tadeu Panato Junior | 2018-05-11 | 4 | -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 Goldberg | 2018-05-16 | 1 | -4/+0 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-15 | 29 | -902/+1300 |
| |\| | | |||||
| | * | | MM-10201: querystring for get slash commands (#8779) | Jesse Hallam | 2018-05-14 | 2 | -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 Wilander | 2018-05-14 | 5 | -136/+159 |
| | | | | |||||
| | * | | Refactor context out of API packages (#8755) | Joram Wilander | 2018-05-14 | 16 | -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 Hallam | 2018-05-14 | 4 | -81/+3 |
| | | | | |||||
| | * | | Merge branch 'merge410rc2' | Derrick Anderson | 2018-05-11 | 4 | -24/+300 |
| | |\ \ | |||||
| | | * | | add s3 test back in for master | Derrick Anderson | 2018-05-11 | 1 | -2/+2 |
| | | | | | |||||
| | | * | | Merge release-4.10 with master | Derrick Anderson | 2018-05-11 | 5 | -26/+302 |
| | |/| | | | |/ | |||||
| | | * | Comment out problematic TestS3TestConnection test (#8770) | Joram Wilander | 2018-05-10 | 1 | -2/+2 |
| | | | | |||||
| | | * | Attempt to fix hub nil panic (#8766) | Joram Wilander | 2018-05-10 | 1 | -1/+1 |
| | | | | |||||
| | | * | Prevent divide by zero if there are no hubs (#8763) | Joram Wilander | 2018-05-10 | 1 | -2/+12 |
| | | | | |||||
 |
server / chat | |
| chat | spline |
| summaryrefslogtreecommitdiffstats |